Commits

commits@gajim.org

17632 discussions

gajim: fix different background color for Chat state notificatio...
by Gajim 03 Sep '13

03 Sep '13

changeset 5eae49e90205 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=5eae49e90205 description: fix different background color for Chat state notifications entries and Emoticons entry. See #7239 diffstat: data/gui/preferences_window.ui | 39 +++++++++++++++++++++------------------ 1 файлов изменено, 21 вставок(+), 18 удалений(-) различия (70 строк): diff -r 1ebd4fcace5a -r 5eae49e90205 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Tue Sep 03 22:26:35 2013 +0400 +++ b/data/gui/preferences_window.ui Tue Sep 03 23:29:20 2013 +0400 @@ -354,24 +354,6 @@ </packing> </child> <child> - <object class="GtkEventBox" id="eventbox5"> - <property name="visible">True</property> - <property name="tooltip_text" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property> - <child> - <object class="GtkLabel" id="label381"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">1</property> - <property name="label" translatable="yes">_Emoticons:</property> - <property name="use_underline">True</property> - </object> - </child> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> <object class="GtkCheckButton" id="compact_view_checkbutton"> <property name="label" translatable="yes">Ma_ke message windows compact</property> <property name="can_focus">True</property> @@ -493,6 +475,25 @@ <property name="bottom_attach">7</property> </packing> </child> + <child> + <object class="GtkEventBox" id="eventbox5"> + <property name="visible">True</property> + <property name="tooltip_text" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property> + <property name="visible_window">False</property> + <child> + <object class="GtkLabel" id="label381"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xpad">1</property> + <property name="label" translatable="yes">_Emoticons:</property> + <property name="use_underline">True</property> + </object> + </child> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + </packing> + </child> </object> </child> </object> @@ -903,6 +904,7 @@ <object class="GtkEventBox" id="eventbox8"> <property name="visible">True</property> <property name="tooltip_text" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows.</property> + <property name="visible_window">False</property> <child> <object class="GtkLabel" id="label33"> <property name="visible">True</property> @@ -922,6 +924,7 @@ <object class="GtkEventBox" id="eventbox9"> <property name="visible">True</property> <property name="tooltip_text" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.</property> + <property name="visible_window">False</property> <child> <object class="GtkLabel" id="label34"> <property name="visible">True</property>

1 0

gajim: make adhoc warning dialog with a warning icon. Fixes #7239
by Gajim 03 Sep '13

03 Sep '13

changeset 078d34fe00e1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=078d34fe00e1 description: make adhoc warning dialog with a warning icon. Fixes #7239 diffstat: src/adhoc_commands.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 2bdb6e6fd43d -r 078d34fe00e1 src/adhoc_commands.py --- a/src/adhoc_commands.py Tue Sep 03 18:19:46 2013 +0200 +++ b/src/adhoc_commands.py Tue Sep 03 21:17:36 2013 +0200 @@ -321,8 +321,8 @@ dialog.destroy() cb() - dialog = dialogs.HigDialog(self.window, gtk.DIALOG_DESTROY_WITH_PARENT \ - | gtk.DIALOG_MODAL, gtk.BUTTONS_YES_NO, _('Cancel confirmation'), + dialog = dialogs.HigDialog(self.window, gtk.MESSAGE_WARNING, + gtk.BUTTONS_YES_NO, _('Cancel confirmation'), _('You are in process of executing command. Do you really want to ' 'cancel it?'), on_response_yes=on_yes) dialog.popup()

1 0

gajim-website: remove fuzzy tag on a string
by Gajim Website 03 Sep '13

03 Sep '13

changeset b20fbcb989ab in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=b20fbcb989ab description: remove fuzzy tag on a string diffstat: locale/de_DE/LC_MESSAGES/msg.po | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r dd5ebe8189eb -r b20fbcb989ab locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Tue Sep 03 20:03:53 2013 +0200 +++ b/locale/de_DE/LC_MESSAGES/msg.po Tue Sep 03 20:44:16 2013 +0200 @@ -675,7 +675,6 @@ msgstr "Hallo und herzlich willkommen auf der Gajim-Projektseite" #: index.php:14 -#, fuzzy msgid "" "The goal of Gajim is to provide a full featured and easy to use Jabber/XMPP " "client. Gajim works nicely with GNOME, but does not require it to run. It is "

1 0

gajim: Set 'ellipsize' to 'Value' column in ACE. Fixes #7446
by Gajim 03 Sep '13

03 Sep '13

changeset 1ebd4fcace5a in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=1ebd4fcace5a description: Set 'ellipsize' to 'Value' column in ACE. Fixes #7446 diffstat: src/advanced_configuration_window.py | 6 +++--- 1 файлов изменено, 3 вставок(+), 3 удалений(-) различия (28 строк): diff -r 43cb2c78ccef -r 1ebd4fcace5a src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Mon Sep 02 22:48:05 2013 +0400 +++ b/src/advanced_configuration_window.py Tue Sep 03 22:26:35 2013 +0400 @@ -26,6 +26,7 @@ import gtk import gtkgui_helpers import gobject +import pango from common import gajim @@ -111,14 +112,13 @@ renderer_text = gtk.CellRendererText() renderer_text.connect('edited', self.on_config_edited) + renderer_text.set_property("ellipsize", pango.ELLIPSIZE_END) col = treeview.insert_column_with_attributes(-1, _('Value'), renderer_text, text = 1) col.set_cell_data_func(renderer_text, self.cb_value_column_data) col.props.resizable = True - # set max width only for initializing the treeview. - col.set_max_width(250) - gobject.idle_add(col.set_max_width, -1) + col.set_property('expand',True) renderer_text = gtk.CellRendererText() treeview.insert_column_with_attributes(-1, _('Type'),

1 0

gajim-website: [pvtlth] updated german translation
by Gajim Website 03 Sep '13

03 Sep '13

changeset dd5ebe8189eb in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=dd5ebe8189eb description: [pvtlth] updated german translation diffstat: locale/de_DE/LC_MESSAGES/msg.po | 147 ++++++++++++++++----------------------- 1 files changed, 60 insertions(+), 87 deletions(-) diffs (truncated from 456 to 300 lines): diff -r f3443e73b790 -r dd5ebe8189eb locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Thu Aug 29 20:05:05 2013 +0200 +++ b/locale/de_DE/LC_MESSAGES/msg.po Tue Sep 03 20:03:53 2013 +0200 @@ -89,9 +89,8 @@ msgstr "Zenwalk" #: Design.php:105 -#, fuzzy msgid "AgiliaLinux" -msgstr "Archlinux" +msgstr "AgiliaLinux" #: Design.php:106 msgid "FreeBSD" @@ -190,10 +189,9 @@ msgstr " Installationsquelle" #: dev.php:27 -#, fuzzy msgid "To checkout hg do" msgstr "" -"Um die SVN Version auszuprobieren, benutzen Sie einfach folgenden Befehl:" +"Um die Mercurial-Version auszuprobieren, benutzen Sie einfach folgenden Befehl:" #: dev.php:29 msgid " You can also" @@ -252,7 +250,7 @@ #: dev.php:50 msgid " Donating: " -msgstr "" +msgstr "Spenden:" #: dev.php:62 msgid " Translations status" @@ -284,9 +282,8 @@ msgstr " Installation\n" #: docs.php:17 -#, fuzzy msgid " Tarball and Mercurial\n" -msgstr " Tarball- und Subversion-Versionen\n" +msgstr " Tarball- und Mercurial-Versionen\n" #: docs.php:19 msgid "download" @@ -304,34 +301,32 @@ msgstr " Unter GNU/Linux\n" #: docs.php:24 -#, fuzzy msgid " To run this version, you have to install some packages. \n" msgstr "" -" Um diese Version zu benutzen, müssen Sie folgende Pakete installiert " -"haben: python2.3 python2.3-gtk2 and python2.3-glade2.\n" +" Um diese Version zu benutzen, müssen Sie einige Pakete installiert " +"haben.\n" #: docs.php:25 msgid "README file" -msgstr "" +msgstr "Datei README" #: docs.php:26 -#, fuzzy, c-format +#, c-format msgid " See %s.\n" -msgstr " Subversion\n" +msgstr " Siehe %s\n" #: docs.php:29 msgid " Under Microsoft Windows\n" msgstr " Unter Microsoft Windows\n" #: docs.php:31 -#, fuzzy msgid "this page" -msgstr "Wiki-Einträge" +msgstr "diese Seite" #: docs.php:32 #, c-format msgid "See %s to install development version under windows." -msgstr "" +msgstr "Lesen Sie %s, um die Entwicklungsversion unter Windows zu installieren." #: docs.php:39 msgid " Please read" @@ -346,7 +341,7 @@ msgstr " Um zu verstehen, wie Gajim funktioniert klicken, Sie bitte" #: docs.php:48 -#, fuzzy, c-format +#, c-format msgid "" " Gajim uses a fork of the %s library to do the interface with Jabber " "network.\n" @@ -358,9 +353,9 @@ msgstr " Die aktuellste Version von Gajim ist" #: downloads.php:11 -#, fuzzy, c-format +#, c-format msgid " A %s version is in test" -msgstr " Die aktuellste Version von Gajim ist" +msgstr " Die Version %s befindet sich in der Testphase" #: downloads.php:13 msgid "If your distribution doesn't have the latest version " @@ -381,16 +376,15 @@ #: downloads.php:21 msgid " If you use Debian unstable do" msgstr "" -" Wenn Sie Debian unstable benutzen, können Sie folgenden befehl " +" Wenn Sie Debian unstable benutzen, können Sie folgenden Befehl " "verwenden, um Gajim zu installieren:" #: downloads.php:23 -#, fuzzy, c-format +#, c-format msgid " The Debian package of %s is " -msgstr " Die Tarball-Version von Gajim gibt es " +msgstr " Das Debian-Paket der Version %s gibt es " #: downloads.php:25 -#, fuzzy msgid "" " A daily package from mercurial is also built. To use it, remove gajim" msgstr "" @@ -414,9 +408,8 @@ "Paket gajim-dev-keyring aus derselben Installationsquelle. Es genügt " #: downloads.php:38 -#, fuzzy msgid " You can get the Slackware package of Gajim" -msgstr " Für ältere Versionen von Gajim klicken Sie bitte" +msgstr " Das Slackware-Paket befindet sich" #: downloads.php:46 msgid " If you use Ubuntu universe repository do" @@ -424,13 +417,12 @@ " Wenn Sie die Installationsquelle \"universe\" aktiviert haben, reicht" #: downloads.php:48 -#, fuzzy msgid " If you want newer version of Gajim, you can also use" -msgstr " Die aktuellste Version von Gajim ist" +msgstr " Wenn Sie eine neuere Version von Gajim installieren möchten, können Sie" #: downloads.php:48 msgid "this PPA" -msgstr "" +msgstr "dieses PPA benutzen" #: downloads.php:56 downloads.php:63 downloads.php:70 downloads.php:92 #: downloads.php:100 downloads.php:108 downloads.php:116 @@ -450,26 +442,24 @@ msgstr " SUSE\n" #: downloads.php:77 -#, fuzzy msgid " One click install for openSuSE" -msgstr "Ein-Klick-Installation" +msgstr "Ein-Klick-Installation für openSUSE" #: downloads.php:78 msgid " For other versions, " -msgstr "" +msgstr "Andere Versionen " #: downloads.php:78 msgid "get it here" -msgstr "Gibt es hier" +msgstr "gibt es hier" #: downloads.php:82 msgid " PLD\n" msgstr " PLD\n" #: downloads.php:85 -#, fuzzy msgid " Just " -msgstr " Einfach" +msgstr " Einfach " #: downloads.php:89 msgid " SourceMage\n" @@ -504,19 +494,17 @@ msgstr " Es gibt eine " #: downloads.php:147 downloads.php:150 -#, fuzzy msgid "Gajim installer" msgstr "Gajim-Installationsdatei" #: downloads.php:150 -#, fuzzy msgid " Here is a" msgstr " Es gibt eine " #: downloads.php:151 #, c-format msgid "for %s version " -msgstr "" +msgstr "für Version %s" #: downloads.php:158 msgid " Source\n" @@ -538,20 +526,19 @@ #: downloads.php:161 msgid "see the <tt>README</tt>" -msgstr "" +msgstr "<tt>README</tt>" #: downloads.php:162 -#, fuzzy, c-format +#, c-format msgid " The tarball version of %s is " -msgstr " Die Tarball-Version von Gajim gibt es " +msgstr " Die Tarball-Version von %s gibt es " #: downloads.php:164 -#, fuzzy msgid "" "If you want to use the last unstable development version, then you should " "checkout the mercurial repository.\n" msgstr "" -"Wenn Sie die neuste Entwicklungsversion von Gajim ausprobieren wollen, " +"Wenn Sie die neueste Entwicklungsversion von Gajim ausprobieren wollen, " "sollten Sie die SVN-Version benutzen (siehe unten). Beachten Sie jedoch, " "dass diese instabil sein kann und nicht offiziell unterstützt wird!\n" @@ -561,9 +548,8 @@ msgstr " Struktur\n" #: downloads.php:173 -#, fuzzy msgid " The mercurial repository is available at this address: " -msgstr " Der Subversion-Server ist unter folgender Adresse erreichbar: " +msgstr " Die Mercurial-Quellen sind unter folgender Adresse erreichbar: " #: downloads.php:173 msgid "and viewable" @@ -575,13 +561,12 @@ " Um den Gajim-Quellcode herunter zu laden, müssen Sie folgendes tun:\n" #: downloads.php:179 -#, fuzzy msgid "" " You first have to install mercurial (apt-get install mercurial " "under Debian)\n" msgstr "" -" Als erstes müssen Sie Subversion installieren (z.B. mit dem Befehl " -"apt-get install subversion unter Debian).\n" +" Als erstes müssen Sie Mercurial installieren (z.B. mit dem Befehl " +"apt-get install mercurial unter Debian).\n" #: downloads.php:181 msgid " Then in a console, enter the following commands:\n" @@ -612,14 +597,13 @@ msgstr "und anschließend" #: downloads.php:200 -#, fuzzy msgid "" " Once you have the repository, you can update it periodically so it " "matches the latest version from the main repository with the following " "command:\n" msgstr "" " Wenn Sie die Installationsquelle einmal eingerichtet haben, können Sie " -"sie periodisch updaten, um sie mit der neusten Version auf dem Server " +"sie periodisch aktualisieren, um sie mit der neusten Version auf dem Server " "abzugleichen. Benutzen Sie dazu folgenden Befehl:\n" #: downloads.php:209 @@ -627,25 +611,23 @@ msgstr " Unter Windows\n" #: downloads.php:211 -#, fuzzy msgid "" " You first have to install mercurial for windows. In order to do that, " "download the binary" msgstr "" -" Als erstes müssen Sie Subversion für Windows installieren. Laden Sie sich " -"dazu die Binärdateien herunter; diese gibt es" +" Als erstes müssen Sie Mercurial für Windows installieren. Laden Sie sich " +"dazu folgendes Programm herunter; Sie finden es" #: downloads.php:213 -#, fuzzy msgid "" " Once mercurial is installed, the commands are the same with those under " "GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " "them in an MS-DOS command line and you're done." msgstr "" -" Wenn Subversion nun installiert ist, sind die Befehle die gleichen wie " +" Wenn Mercurial nun installiert ist, sind die Befehle die gleichen wie " "unter GNU/Linux. Der einzige Unterschied ist, dass Sie statt der Datei "

1 0

gajim: [lumirayz and mrDoctorWho] Ignore /me when determining di...
by Gajim 03 Sep '13

03 Sep '13

changeset 2bdb6e6fd43d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2bdb6e6fd43d description: [lumirayz and mrDoctorWho] Ignore /me when determining direction_mark. Fixes #7414 diffstat: src/conversation_textview.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diffs (33 lines): diff -r e0a276431111 -r 2bdb6e6fd43d src/conversation_textview.py --- a/src/conversation_textview.py Mon Sep 02 22:45:13 2013 +0400 +++ b/src/conversation_textview.py Tue Sep 03 18:19:46 2013 +0200 @@ -1289,14 +1289,17 @@ # We don't have tim for outgoing messages... tim = time.localtime() current_print_time = gajim.config.get('print_time') - direction_mark = i18n.paragraph_direction_mark(unicode(text)) + if text.startswith('/me '): + direction_mark = i18n.paragraph_direction_mark(unicode(text[3:])) + else: + direction_mark = i18n.paragraph_direction_mark(unicode(text)) # don't apply direction mark if it's status message if kind == 'status': direction_mark = i18n.direction_mark if current_print_time == 'always' and kind != 'info' and not simple: timestamp_str = self.get_time_to_show(tim, direction_mark) timestamp = time.strftime(timestamp_str, tim) - timestamp = direction_mark + timestamp + timestamp = direction_mark + timestamp + direction_mark buffer_.insert_with_tags_by_name(end_iter, timestamp, *other_tags_for_time) elif current_print_time == 'sometimes' and kind != 'info' and not simple: @@ -1427,8 +1430,7 @@ before_str = helpers.from_one_line(before_str) after_str = gajim.config.get('after_nickname') after_str = helpers.from_one_line(after_str) - format_ = direction_mark + before_str + name + direction_mark + \ - after_str + ' ' + format_ = before_str + name + direction_mark + after_str + ' ' buffer_.insert_with_tags_by_name(end_iter, format_, *name_tags) def print_subject(self, subject, iter_=None):

1 0

gajim: [Michał olber] Polish translations upgraded
by Gajim 02 Sep '13

02 Sep '13

changeset 43cb2c78ccef in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=43cb2c78ccef description: [Michał olber] Polish translations upgraded diffstat: po/pl.po | 24973 +++++++++++++++++++++++++++++------------------------------- 1 файлов изменено, 12274 вставок(+), 12699 удалений(-) различия (урезанные с 24977 до 300 строк): diff -r 498a31d36147 -r 43cb2c78ccef po/pl.po --- a/po/pl.po Sun Sep 01 21:22:10 2013 +0200 +++ b/po/pl.po Mon Sep 02 22:48:05 2013 +0400 @@ -1,12699 +1,12274 @@ -# Polish translations for gajim package -# Polska wersja językowa pakietu gajim -# Copyright (C) 2005 THE gajim'S COPYRIGHT HOLDER -# This file is distributed under the same license as the gajim package. -# Automatically generated, 2005. -# -# -msgid "" -msgstr "" -"Project-Id-Version: gajim 2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-29 15:27+0200\n" -"PO-Revision-Date: 2010-01-01 20:42+0100\n" -"Last-Translator: Jacek Sowiński <mruwek(a)mruwek.pl>\n" -"Language-Team: Polish <dominik(a)kozaczko.info, translation-team-pl@lists." -"sourceforge.net>\n" -"Language: pl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: POLAND\n" - -#: ../data/gui/account_context_menu.ui.h:1 -#: ../data/gui/zeroconf_context_menu.ui.h:1 -msgid "_Status" -msgstr "_Status" - -#: ../data/gui/account_context_menu.ui.h:2 -msgid "_Personal Events" -msgstr "_Zdarzenia" - -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 -msgid "_Start Chat..." -msgstr "_Rozpocznij rozmowę" - -#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 -msgid "Join _Group Chat..." -msgstr "Dołącz do _pokoju" - -#: ../data/gui/account_context_menu.ui.h:5 -msgid "_Add Contact..." -msgstr "_Dodaj kontakt..." - -#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7 -msgid "_Discover Services" -msgstr "_Wyszukuj usługi" - -#: ../data/gui/account_context_menu.ui.h:7 -msgid "_Execute Command..." -msgstr "_Wykonaj komendę" - -#: ../data/gui/account_context_menu.ui.h:8 -msgid "_Open Gmail Inbox" -msgstr "_Otwórz skrzynkę Gmail" - -#: ../data/gui/account_context_menu.ui.h:9 -msgid "_Modify Account" -msgstr "_Modyfikuj konto" - -#: ../data/gui/account_creation_wizard_window.ui.h:1 -msgid "Gajim: Account Creation Wizard" -msgstr "Gajim: Kreator Konta" - -#: ../data/gui/account_creation_wizard_window.ui.h:2 -msgid "" -"You need to have an account in order to connect\n" -"to the Jabber network." -msgstr "" -"Musisz posiadać konto aby połączyć się\n" -" z siecią Jabber." - -#: ../data/gui/account_creation_wizard_window.ui.h:4 -msgid "I already have an account I want to _use" -msgstr "_Mam już konto i chcę z niego korzystać" - -#: ../data/gui/account_creation_wizard_window.ui.h:5 -msgid "I want to _register for a new account" -msgstr "Chcę za_rejestrować nowe konto Jabbera" - -#: ../data/gui/account_creation_wizard_window.ui.h:6 -msgid "Please choose one of the options below:" -msgstr "Wybierz jedną z poniższych opcji:" - -#: ../data/gui/account_creation_wizard_window.ui.h:7 -msgid "Please fill in the data for your existing account" -msgstr "Uzupełnij proszę dane swojego konta" - -#: ../data/gui/account_creation_wizard_window.ui.h:8 -#: ../data/gui/accounts_window.ui.h:22 -#: ../data/gui/manage_bookmarks_window.ui.h:2 -msgid "_Password:" -msgstr "_Hasło:" - -#: ../data/gui/account_creation_wizard_window.ui.h:9 -#: ../data/gui/accounts_window.ui.h:20 -msgid "Save pass_word" -msgstr "Zapisz _hasło" - -#: ../data/gui/account_creation_wizard_window.ui.h:10 -#: ../data/gui/accounts_window.ui.h:21 -msgid "If checked, Gajim will remember the password for this account" -msgstr "Włączenie tej opcji spowoduje zapamiętanie hasła dla tego konta" - -#: ../data/gui/account_creation_wizard_window.ui.h:11 -#: ../data/gui/accounts_window.ui.h:23 -msgid "_Jabber ID:" -msgstr "_Jabber ID:" - -#: ../data/gui/account_creation_wizard_window.ui.h:12 -msgid "Anon_ymous authentication" -msgstr "Anonimowa autentykacja" - -#: ../data/gui/account_creation_wizard_window.ui.h:13 -msgid "Please select a server" -msgstr "Wybierz serwer" - -#: ../data/gui/account_creation_wizard_window.ui.h:14 -#: ../data/gui/manage_bookmarks_window.ui.h:3 -msgid "_Server:" -msgstr "_Serwer:" - -#: ../data/gui/account_creation_wizard_window.ui.h:15 -msgid "Prox_y:" -msgstr "Prox_y:" - -#: ../data/gui/account_creation_wizard_window.ui.h:16 -msgid "Manage..." -msgstr "Zarządzaj..." - -#: ../data/gui/account_creation_wizard_window.ui.h:17 -msgid "Use custom hostname/port" -msgstr "Użyj własnej nazwy hosta/portu" - -#: ../data/gui/account_creation_wizard_window.ui.h:18 -msgid "_Hostname:" -msgstr "_Nazwa hosta: " - -#: ../data/gui/account_creation_wizard_window.ui.h:19 -msgid "_Port:" -msgstr "_Port:" - -#: ../data/gui/account_creation_wizard_window.ui.h:20 -#: ../data/gui/roster_window.ui.h:8 -msgid "_Advanced" -msgstr "_Zaawansowane" - -#: ../data/gui/account_creation_wizard_window.ui.h:21 -msgid "" -"Add this certificate to the list of trusted certificates.\n" -"SHA1 fingerprint of the certificate:\n" -msgstr "" -"Dodaj ten certyfikat do listy zaufanych.\n" -"Odcisk klucza SHA1 tego certyfikatu:\n" - -#: ../data/gui/account_creation_wizard_window.ui.h:24 -msgid "" -"Connecting to server\n" -"\n" -"Please wait..." -msgstr "" -"Łączenie z serwerem\n" -"\n" -"proszę czekać..." - -#: ../data/gui/account_creation_wizard_window.ui.h:27 -msgid "Connect when I press Finish" -msgstr "Połącz po wciśnięciu przycisku Zakończ" - -#: ../data/gui/account_creation_wizard_window.ui.h:28 -msgid "Set my profile when I connect" -msgstr "Ustaw profil po połączeniu" - -#: ../data/gui/account_creation_wizard_window.ui.h:29 -msgid "_Finish" -msgstr "_Zakończ" - -#: ../data/gui/account_creation_wizard_window.ui.h:30 -#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272 -#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742 -#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420 -#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791 -#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 -#: ../src/dialogs.py:536 ../src/roster_window.py:3147 -#: ../src/roster_window.py:3153 ../src/roster_window.py:3158 -msgid "None" -msgstr "Żaden" - -#: ../data/gui/accounts_window.ui.h:2 -msgid "Accounts" -msgstr "Konta" - -#. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524 -#: ../src/dialogs.py:3570 -msgid "Add" -msgstr "Dodaj" - -#. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528 -#: ../src/dialogs.py:3625 -msgid "Delete" -msgstr "Usuń" - -#. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792 -msgid "Re_name" -msgstr "_Zmień nazwę" - -#. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3 -msgid "_Enable" -msgstr "_Włącz" - -#: ../data/gui/accounts_window.ui.h:7 -msgid "Anonymous authentication" -msgstr "Używaj autoryzacji serwera proxy" - -#: ../data/gui/accounts_window.ui.h:8 -msgid "" -"Resource is sent to the Jabber server in order to separate the same JID in " -"two or more parts depending on the number of the clients connected in the " -"same server with the same account. So you might be connected in the same " -"account with resource 'Home' and 'Work' at the same time. The resource which " -"has the highest priority will get the events. (see below)" -msgstr "" -"Informację wysłano do serwera w celu rozdzielenia tego samego JID na dwie " -"lub więcej części, w zależności od liczby klientów połączonych z serwerem z " -"tego samego konta. Możesz być połączony z z tym samym kontem z informacjami " -"'Dom' i 'Praca' w tym samym czasie. Klient o najwyższym będzie odbierał " -"wiadomości (patrz niżej)" - -#. No configured account -#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1 -#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168 -#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339 -#: ../src/notify.py:389 ../src/notify.py:405 -msgid "Gajim" -msgstr "Gajim" - -#: ../data/gui/accounts_window.ui.h:10 -#, fuzzy -msgid "Synchronize contacts" -msgstr "Synchronizuj kontakty" - -#: ../data/gui/accounts_window.ui.h:11 -msgid "Click to request authorization to all contacts of another account" -msgstr "" -"Kliknij aby poprosić o autoryzację od wszystkich kontaktów z innego konta" - -#: ../data/gui/accounts_window.ui.h:12 -msgid "Chan_ge Password" -msgstr "Z_mień hasło" - -#: ../data/gui/accounts_window.ui.h:13 -msgid "Click to change account's password" -msgstr "Kliknij, aby zmienić hasło dla konta" - -#: ../data/gui/accounts_window.ui.h:14 -msgid "Administration operations" -msgstr "Operacje administracyjne" - -#: ../data/gui/accounts_window.ui.h:15 -msgid "" -"Priority is used in Jabber to determine who gets the events from the jabber " -"server when two or more clients are connected using the same account; The " -"client with the highest priority gets the events" -msgstr "" -"Priorytet służy do określenia, który program ma odbierać wiadomości z " -"serwera gdy dwa klienty (lub więcej) są połączone z tym samym kontem. Ten " -"który ma wyższy priorytet, będzie odbierał wiadomości" - -#: ../data/gui/accounts_window.ui.h:16 -msgid "A_djust to status" -msgstr "D_ostosuj do statusu" - -#: ../data/gui/accounts_window.ui.h:17 -msgid "Priority will change automatically according to your status." -msgstr "Priorytet ulegnie zmianie automatycznie, stosownie do twojego statusu." - -#: ../data/gui/accounts_window.ui.h:18 -msgid "Priori_ty:" -msgstr "Priory_tet:" - -#: ../data/gui/accounts_window.ui.h:19 -msgid "Resour_ce:" -msgstr "Za_sób: " - -#: ../data/gui/accounts_window.ui.h:24 -msgid "_Client Cert File:" -msgstr "Plik _certyfikatu klienta" - -#: ../data/gui/accounts_window.ui.h:25

1 0

gajim: insensitive more menuitems when we're offline. Fixes #7082
by Gajim 02 Sep '13

02 Sep '13

changeset 498a31d36147 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=498a31d36147 description: insensitive more menuitems when we're offline. Fixes #7082 diffstat: src/roster_window.py | 13 ++++++++++++- 1 файлов изменено, 12 вставок(+), 1 удалений(-) различия (45 строк): diff -r 0d1564199353 -r 498a31d36147 src/roster_window.py --- a/src/roster_window.py Sat Aug 31 21:30:36 2013 +0400 +++ b/src/roster_window.py Sun Sep 01 21:22:10 2013 +0200 @@ -5784,6 +5784,11 @@ send_custom_status_menuitem.set_sensitive(False) send_group_message_item.set_sensitive(False) + if gajim.connections[account].connected < 2: + send_group_message_item.set_sensitive(False) + invite_menuitem.set_sensitive(False) + send_custom_status_menuitem.set_sensitive(False) + if not group in helpers.special_groups: item = gtk.SeparatorMenuItem() # separator menu.append(item) @@ -5983,8 +5988,10 @@ icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU) item.set_image(icon) item.connect('activate', - self.on_send_single_message_menuitem_activate, account, contact) + self.on_send_single_message_menuitem_activate, account, contact) menu.append(item) + if gajim.account_is_disconnected(account): + item.set_sensitive(False) blocked = False if helpers.jid_is_blocked(account, jid): @@ -6021,6 +6028,8 @@ status_menuitem.set_image(icon) status_menuitems.append(status_menuitem) menu.append(send_custom_status_menuitem) + if gajim.account_is_disconnected(account): + send_custom_status_menuitem.set_sensitive(False) item = gtk.SeparatorMenuItem() # separator menu.append(item) @@ -6098,6 +6107,8 @@ information_menuitem.set_image(icon) menu.append(information_menuitem) information_menuitem.connect('activate', self.on_info, contact, account) + if gajim.account_is_disconnected(account): + information_menuitem.set_sensitive(False) event_button = gtkgui_helpers.get_possible_button_event(event)

1 0

gajim: [Michał olber] Polish translations upgraded
by Gajim 02 Sep '13

02 Sep '13

changeset e0a276431111 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e0a276431111 description: [Michał olber] Polish translations upgraded diffstat: po/pl.po | 24027 +++++++++++++++++++++++++++++++----------------------------- 1 файлов изменено, 12274 вставок(+), 11753 удалений(-) различия (урезанные с 24031 до 300 строк): diff -r f273204f8581 -r e0a276431111 po/pl.po --- a/po/pl.po Sun Sep 01 21:22:10 2013 +0200 +++ b/po/pl.po Mon Sep 02 22:45:13 2013 +0400 @@ -1,11753 +1,12274 @@ -# Polish translations for gajim package -# Polska wersja językowa pakietu gajim -# Copyright (C) 2005 THE gajim'S COPYRIGHT HOLDER -# This file is distributed under the same license as the gajim package. -# Automatically generated, 2005. -# -# -#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228 -#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255 -#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262 -#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264 -msgid "" -msgstr "" -"Project-Id-Version: gajim 2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-01 23:26+0100\n" -"PO-Revision-Date: 2010-01-01 20:42+0100\n" -"Last-Translator: Jacek Sowiński <mruwek(a)mruwek.pl>\n" -"Language-Team: Polish <dominik(a)kozaczko.info, translation-team-pl@lists." -"sourceforge.net>\n" -"Language: pl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: POLAND\n" - -#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 -msgid "Join _Group Chat..." -msgstr "Dołącz do _pokoju" - -#: ../data/gui/account_context_menu.ui.h:2 -msgid "_Add Contact..." -msgstr "_Dodaj kontakt..." - -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18 -msgid "_Discover Services" -msgstr "_Wyszukuj usługi" - -#: ../data/gui/account_context_menu.ui.h:4 -msgid "_Execute Command..." -msgstr "_Wykonaj komendę" - -#: ../data/gui/account_context_menu.ui.h:5 -msgid "_Modify Account" -msgstr "_Modyfikuj konto" - -#: ../data/gui/account_context_menu.ui.h:6 -msgid "_Open Gmail Inbox" -msgstr "_Otwórz skrzynkę Gmail" - -#: ../data/gui/account_context_menu.ui.h:7 -msgid "_Personal Events" -msgstr "_Zdarzenia" - -#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24 -msgid "_Start Chat..." -msgstr "_Rozpocznij rozmowę" - -#: ../data/gui/account_context_menu.ui.h:9 -#: ../data/gui/zeroconf_context_menu.ui.h:2 -msgid "_Status" -msgstr "_Status" - -#: ../data/gui/account_creation_wizard_window.ui.h:1 -msgid "" -"Connecting to server\n" -"\n" -"Please wait..." -msgstr "" -"Łączenie z serwerem\n" -"\n" -"proszę czekać..." - -#: ../data/gui/account_creation_wizard_window.ui.h:4 -msgid "Please choose one of the options below:" -msgstr "Wybierz jedną z poniższych opcji:" - -#: ../data/gui/account_creation_wizard_window.ui.h:5 -msgid "Please fill in the data for your existing account" -msgstr "Uzupełnij proszę dane swojego konta" - -#: ../data/gui/account_creation_wizard_window.ui.h:6 -msgid "Please select a server" -msgstr "Wybierz serwer" - -#: ../data/gui/account_creation_wizard_window.ui.h:7 -msgid "" -"Add this certificate to the list of trusted certificates.\n" -"SHA1 fingerprint of the certificate:\n" -msgstr "" -"Dodaj ten certyfikat do listy zaufanych.\n" -"Odcisk klucza SHA1 tego certyfikatu:\n" - -#: ../data/gui/account_creation_wizard_window.ui.h:10 -msgid "Anon_ymous authentication" -msgstr "Anonimowa autentykacja" - -#: ../data/gui/account_creation_wizard_window.ui.h:11 -msgid "Connect when I press Finish" -msgstr "Połącz po wciśnięciu przycisku Zakończ" - -#: ../data/gui/account_creation_wizard_window.ui.h:12 -msgid "Gajim: Account Creation Wizard" -msgstr "Gajim: Kreator Konta" - -#: ../data/gui/account_creation_wizard_window.ui.h:13 -msgid "I already have an account I want to _use" -msgstr "_Mam już konto i chcę z niego korzystać" - -#: ../data/gui/account_creation_wizard_window.ui.h:14 -msgid "I want to _register for a new account" -msgstr "Chcę za_rejestrować nowe konto Jabbera" - -#: ../data/gui/account_creation_wizard_window.ui.h:15 -#: ../data/gui/accounts_window.ui.h:28 -msgid "If checked, Gajim will remember the password for this account" -msgstr "Włączenie tej opcji spowoduje zapamiętanie hasła dla tego konta" - -#: ../data/gui/account_creation_wizard_window.ui.h:16 -msgid "Manage..." -msgstr "Zarządzaj..." - -#: ../data/gui/account_creation_wizard_window.ui.h:17 -#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694 -#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344 -#: ../src/config.py:2357 ../src/config.py:3614 ../src/config.py:3689 -#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:517 -#: ../src/dialogs.py:530 ../src/roster_window.py:3006 -#: ../src/roster_window.py:3012 ../src/roster_window.py:3017 -msgid "None" -msgstr "Żaden" - -#: ../data/gui/account_creation_wizard_window.ui.h:18 -msgid "Prox_y:" -msgstr "Prox_y:" - -#: ../data/gui/account_creation_wizard_window.ui.h:19 -#: ../data/gui/accounts_window.ui.h:48 -msgid "Save pass_word" -msgstr "Zapisz _hasło" - -#: ../data/gui/account_creation_wizard_window.ui.h:20 -msgid "Set my profile when I connect" -msgstr "Ustaw profil po połączeniu" - -#: ../data/gui/account_creation_wizard_window.ui.h:21 -msgid "Use custom hostname/port" -msgstr "Użyj własnej nazwy hosta/portu" - -#: ../data/gui/account_creation_wizard_window.ui.h:22 -msgid "" -"You need to have an account in order to connect\n" -"to the Jabber network." -msgstr "" -"Musisz posiadać konto aby połączyć się\n" -" z siecią Jabber." - -#: ../data/gui/account_creation_wizard_window.ui.h:24 -#: ../data/gui/roster_window.ui.h:16 -msgid "_Advanced" -msgstr "_Zaawansowane" - -#: ../data/gui/account_creation_wizard_window.ui.h:25 -msgid "_Finish" -msgstr "_Zakończ" - -#: ../data/gui/account_creation_wizard_window.ui.h:26 -msgid "_Hostname:" -msgstr "_Nazwa hosta: " - -#: ../data/gui/account_creation_wizard_window.ui.h:27 -#: ../data/gui/accounts_window.ui.h:62 -msgid "_Jabber ID:" -msgstr "_Jabber ID:" - -#: ../data/gui/account_creation_wizard_window.ui.h:28 -#: ../data/gui/accounts_window.ui.h:64 -msgid "_Password:" -msgstr "_Hasło:" - -#: ../data/gui/account_creation_wizard_window.ui.h:29 -msgid "_Port:" -msgstr "_Port:" - -#: ../data/gui/account_creation_wizard_window.ui.h:30 -msgid "_Server:" -msgstr "_Serwer:" - -#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13 -msgid "Miscellaneous" -msgstr "Różne" - -#: ../data/gui/accounts_window.ui.h:2 -msgid "OpenPGP" -msgstr "OpenPGP" - -#: ../data/gui/accounts_window.ui.h:3 -msgid "Personal Information" -msgstr "Informacje o sobie" - -#: ../data/gui/accounts_window.ui.h:4 -msgid "Proxy" -msgstr "Proxy" - -#: ../data/gui/accounts_window.ui.h:5 -msgid "A_djust to status" -msgstr "D_ostosuj do statusu" - -#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1 -msgid "Account" -msgstr "Konto" - -#: ../data/gui/accounts_window.ui.h:7 -msgid "Accounts" -msgstr "Konta" - -#: ../data/gui/accounts_window.ui.h:8 -msgid "Administration operations" -msgstr "Operacje administracyjne" - -#: ../data/gui/accounts_window.ui.h:9 -msgid "Anonymous authentication" -msgstr "Używaj autoryzacji serwera proxy" - -#: ../data/gui/accounts_window.ui.h:10 -msgid "Auto-reconnect when connection is lost" -msgstr "Automatyczne połącz po zerwaniu połączenia" - -#: ../data/gui/accounts_window.ui.h:11 -msgid "Browse..." -msgstr "Prze_glądaj..." - -#: ../data/gui/accounts_window.ui.h:12 -msgid "C_onnect on Gajim startup" -msgstr "P_ołącz przy starcie programu" - -#: ../data/gui/accounts_window.ui.h:13 -msgid "Chan_ge Password" -msgstr "Z_mień hasło" - -#: ../data/gui/accounts_window.ui.h:14 -msgid "" -"Check this so Gajim will ask you before sending your password over an " -"insecure connection." -msgstr "" -"Po uaktywnieniu tej opcji Gajim zapyta przed wysłaniem hasła przez " -"nieszyfrowane połączenie." - -#: ../data/gui/accounts_window.ui.h:15 -#, fuzzy -msgid "Choose Client Cert" -msgstr "Wybierz plik do wysłania..." - -#: ../data/gui/accounts_window.ui.h:16 -msgid "Choose _Key..." -msgstr "Wybierz _klucz..." - -#: ../data/gui/accounts_window.ui.h:17 -msgid "Click to change account's password" -msgstr "Kliknij, aby zmienić hasło dla konta" - -#: ../data/gui/accounts_window.ui.h:18 -msgid "Click to request authorization to all contacts of another account" -msgstr "" -"Kliknij aby poprosić o autoryzację od wszystkich kontaktów z innego konta" - -#: ../data/gui/accounts_window.ui.h:19 -msgid "Client certificate" -msgstr "Certyfikat klienta" - -#: ../data/gui/accounts_window.ui.h:20 -msgid "Co_nnect on Gajim startup" -msgstr "P_ołącz przy starcie programu" - -#: ../data/gui/accounts_window.ui.h:21 -msgid "Connection" -msgstr "Połączenie" - -#: ../data/gui/accounts_window.ui.h:22 -#: ../data/gui/zeroconf_information_window.ui.h:2 -msgid "E-Mail:" -msgstr "Adres e-mail:" - -#: ../data/gui/accounts_window.ui.h:23 -#: ../data/gui/zeroconf_information_window.ui.h:3 -msgid "First Name:" -msgstr "Imię:" - -#. No configured account -#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1160 ../src/common/helpers.py:1172 -#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600

1 0

gajim-plugins: sends request, replies with offer
by Gajim Plugins 02 Sep '13

02 Sep '13

changeset b024c3868083 in /home/hg/repos/gajim-plugins author: Jefry Lagrange <jefry.reyes(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=b024c3868083 description: sends request, replies with offer diffstat: file_sharing/fshare.py | 11 ++++++----- file_sharing/fshare_protocol.py | 35 +++++------------------------------ file_sharing/tests/TestProtocol.py | 16 +++++----------- 3 files changed, 16 insertions(+), 46 deletions(-) diffs (175 lines): diff -r 4a3d1e985d27 -r b024c3868083 file_sharing/fshare.py --- a/file_sharing/fshare.py Sat Aug 31 20:52:19 2013 -0400 +++ b/file_sharing/fshare.py Sun Sep 01 22:33:43 2013 -0400 @@ -14,7 +14,7 @@ import fshare_protocol from common import ged from common import caps_cache -from common import xmpp +from common import nbxmpp from plugins.gui import GajimPluginConfigDialog @@ -34,7 +34,7 @@ accounts = gajim.contacts.get_accounts() for account in gajim.contacts.get_accounts(): FileSharePlugin.prohandler[account] = \ - fshare_protocol.Protocol(account, self) + fshare_protocol.ProtocolDispatcher(account, self) self.events_handlers = { 'raw-iq-received': (ged.CORE, self._nec_raw_iq) } @@ -79,12 +79,13 @@ gajim.connections[a].status) def _nec_raw_iq(self, obj): - if obj.stanza.getTag('match', + if obj.stanza.getTag('query', namespace=fshare_protocol.NS_FILE_SHARING) and self.activated: account = obj.conn.name pro = FileSharePlugin.prohandler[account] - pro.handler(obj.stanza) - raise xmpp.NodeProcessed + peerjid = obj.stanza.getFrom() + pro.handler(obj.stanza, str(peerjid)) + raise nbxmpp.NodeProcessed def __get_contact_menu(self, contact, account): raise NotImplementedError diff -r 4a3d1e985d27 -r b024c3868083 file_sharing/fshare_protocol.py --- a/file_sharing/fshare_protocol.py Sat Aug 31 20:52:19 2013 -0400 +++ b/file_sharing/fshare_protocol.py Sun Sep 01 22:33:43 2013 -0400 @@ -8,7 +8,7 @@ print "Import Error: Ignore if we are testing" # Namespace for file sharing -NS_FILE_SHARING = 'urn:xmpp:fis' +NS_FILE_SHARING = 'urn:xmpp:fis:0' class Protocol(): @@ -42,9 +42,8 @@ formatted.append(r) return formatted - def request(self, contact, stanzaID, path=None): + def request(self, contact, path=None): iq = nbxmpp.Iq(typ='get', to=contact, frm=self.ourjid) - iq.setID(stanzaID) query = iq.setQuery() query.setNamespace(NS_FILE_SHARING) if path: @@ -108,17 +107,17 @@ def handler(self, stanza, fjid): - # handles incoming match stanza + # handles incoming stanza # TODO: Stanza checking if stanza.getType() == 'get': - self.on_request(stanza, fjid) + offer = self.on_request(stanza, fjid) + self.conn.connection.send(offer) elif stanza.getType() == 'result': return self.on_offer(stanza, fjid) else: # TODO: reply with malformed stanza error pass - def on_toplevel_request(self, stanza, jid): roots = self.plugin.database.get_toplevel_dirs(self.account, jid) items = [] @@ -179,30 +178,6 @@ return offered - def get_jid_without_resource(jid): return jid.split('/')[0] -def get_files_info(stanza): - # Crawls the stanza in search for file and dir structure. - files = [] - dirs = [] - children = stanza.getTag('match').getTag('offer').getChildren() - for c in children: - if c.getName() == 'file': - f = {'name' : \ - c.getTag('name').getData()[1:] if c.getTag('name') else '', - 'size' : c.getTag('size').getData() if c.getTag('size') else '', - 'date' : c.getTag('date').getData() if c.getTag('date') else '', - 'desc' : c.getTag('desc').getData() if c.getTag('desc') else '', - # TODO: handle different hash algo - 'hash' : c.getTag('hash').getData() if c.getTag('hash') else '', - } - files.append(f) - else: - dirname = c.getTag('name') - if dirname is None: - return None - dirs.append(dirname.getData()[1:]) - return (files, dirs) - diff -r 4a3d1e985d27 -r b024c3868083 file_sharing/tests/TestProtocol.py --- a/file_sharing/tests/TestProtocol.py Sat Aug 31 20:52:19 2013 -0400 +++ b/file_sharing/tests/TestProtocol.py Sun Sep 01 22:33:43 2013 -0400 @@ -15,9 +15,8 @@ self.protocol = fshare_protocol.Protocol('test(a)gajim.org/test') def test_request(self): - iq = self.protocol.request('peer(a)gajim.org/test', '1234', 'documents/test2.txt') + iq = self.protocol.request('peer(a)gajim.org/test', 'documents/test2.txt') self.assertEqual(iq.getType(), 'get') - self.assertNotEqual(iq.getID(), None) self.assertEqual(iq.getQuery().getName(), 'query') self.assertEqual(iq.getQuery().getNamespace(), fshare_protocol.NS_FILE_SHARING) self.assertEqual(iq.getQuery().getAttr('node'), 'documents/test2.txt') @@ -96,7 +95,7 @@ self.account, plugin) def test_handler(self): - iq = self.protocol.request('peer(a)gajim.org/test', '1234', + iq = self.protocol.request('peer(a)gajim.org/test', 'documents/test2.txt') #offer = self.dispatcher.on_offer request = self.dispatcher.on_request @@ -121,12 +120,10 @@ self.assertEqual(len(offered_files), 2) def test_on_dir_request(self): - iq = self.protocol.request('peer(a)gajim.org/test', '1234', - 'documents') + iq = self.protocol.request('peer(a)gajim.org/test', 'documents') response = self.dispatcher.on_dir_request(iq, 'peer(a)gajim.org/test', 'peer(a)gajim.org', 'documents') self.assertEqual(response.getType(), 'result') - self.assertNotEqual(response.getID(), None) self.assertEqual(response.getQuery().getName(), 'query') self.assertEqual(response.getQuery().getNamespace(), fshare_protocol.NS_FILE_SHARING) self.assertEqual(response.getQuery().getAttr('node'), 'documents') @@ -134,11 +131,9 @@ self.assertEqual(len(node.getChildren()), 2) def test_on_request(self): - iq = self.protocol.request('peer(a)gajim.org/test', '1234', - 'documents/file1.txt') + iq = self.protocol.request('peer(a)gajim.org/test','documents/file1.txt') response = self.dispatcher.on_request(iq, 'peer(a)gajim.org/test') self.assertEqual(response.getType(), 'result') - self.assertNotEqual(response.getID(), None) self.assertEqual(response.getQuery().getName(), 'query') self.assertEqual(response.getQuery().getNamespace(), fshare_protocol.NS_FILE_SHARING) self.assertEqual(response.getQuery().getAttr('node'), 'documents/file1.txt') @@ -146,10 +141,9 @@ self.assertEqual(len(node.getChildren()), 1) def test_on_toplevel_request(self): - iq = self.protocol.request('peer(a)gajim.org/test', '1234') + iq = self.protocol.request('peer(a)gajim.org/test') response = self.dispatcher.on_toplevel_request(iq, 'peer(a)gajim.org') self.assertEqual(response.getType(), 'result') - self.assertNotEqual(response.getID(), None) self.assertEqual(response.getQuery().getName(), 'query') self.assertEqual(response.getQuery().getNamespace(), fshare_protocol.NS_FILE_SHARING) node = response.getQuery()

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits