Commits

commits@gajim.org

17632 discussions

gajim: add 24x24 icons. Take them from 32x32 if they don't exist...
by Yann Leboulanger 31 Aug '12

31 Aug '12

changeset 0ded48e58747 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0ded48e58747 description: add 24x24 icons. Take them from 32x32 if they don't exist in the iconset. Fixes #7225 diffstat: src/gtkgui_helpers.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diffs (23 lines): diff -r 04cebaf21e27 -r 0ded48e58747 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Thu Aug 30 23:57:20 2012 -0400 +++ b/src/gtkgui_helpers.py Fri Aug 31 09:54:32 2012 +0200 @@ -1045,6 +1045,19 @@ path = os.path.join(helpers.get_iconset_path(iconset), '32x32') gajim.interface.jabber_state_images['32'] = load_iconset(path) + path = os.path.join(helpers.get_iconset_path(iconset), '24x24') + if (os.path.exists(path)): + gajim.interface.jabber_state_images['24'] = load_iconset(path) + else: + gajim.interface.jabber_state_images['24'] = {} + # Resize 32x32 icons to 24x24 + for each in gajim.interface.jabber_state_images['32']: + img = gtk.Image() + pix = gajim.interface.jabber_state_images['32'][each].get_pixbuf() + scaled_pix = pix.scale_simple(24, 24, gtk.gdk.INTERP_BILINEAR) + img.set_from_pixbuf(scaled_pix) + gajim.interface.jabber_state_images['24'][each] = img + path = os.path.join(helpers.get_iconset_path(iconset), '16x16') gajim.interface.jabber_state_images['16'] = load_iconset(path)

1 0

gajim: dont alert the user if we get a request for a file
by Jefry Lagrange 31 Aug '12

31 Aug '12

changeset 04cebaf21e27 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=04cebaf21e27 description: dont alert the user if we get a request for a file diffstat: src/gui_interface.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (25 lines): diff -r fae61de0a291 -r 04cebaf21e27 src/gui_interface.py --- a/src/gui_interface.py Thu Aug 30 23:09:23 2012 -0400 +++ b/src/gui_interface.py Thu Aug 30 23:57:20 2012 -0400 @@ -912,15 +912,18 @@ account=account, keyID=keyID) gajim.contacts.add_contact(account, contact) self.roster.add_contact(obj.jid, account) + if obj.file_props.session_type == 'jingle': + request = obj.stanza.getTag('jingle').getTag('content')\ + .getTag('description').getTag('request') + if request: + # If we get a request instead + return contact = gajim.contacts.get_first_contact_from_jid(account, obj.jid) - if helpers.allow_popup_window(account): self.instances['file_transfers'].show_file_request(account, contact, obj.file_props) return - self.add_event(account, obj.jid, 'file-request', obj.file_props) - if helpers.allow_showing_notification(account): path = gtkgui_helpers.get_icon_path('gajim-ft_request', 48) txt = _('%s wants to send you a file.') % gajim.get_name_from_jid(

1 0

gajim: refactoring
by Jefry Lagrange 31 Aug '12

31 Aug '12

changeset fae61de0a291 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fae61de0a291 description: refactoring diffstat: src/common/connection_handlers_events.py | 31 ++++++++++--------------------- src/common/jingle_session.py | 5 +++-- 2 files changed, 13 insertions(+), 23 deletions(-) diffs (87 lines): diff -r ca551b3a2237 -r fae61de0a291 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Aug 30 23:46:19 2012 +0200 +++ b/src/common/connection_handlers_events.py Thu Aug 30 23:09:23 2012 -0400 @@ -1986,23 +1986,11 @@ self.file_props.transport_sid = self.FT_content.transport.sid self.FT_content.file_props = self.file_props self.FT_content.transport.set_file_props(self.file_props) - if self.file_props.streamhosts: - self.file_props.streamhosts.extend( + self.file_props.streamhosts.extend( self.FT_content.transport.remote_candidates) - else: - self.file_props.streamhosts = \ - self.FT_content.transport.remote_candidates for host in self.file_props.streamhosts: host['initiator'] = self.FT_content.session.initiator host['target'] = self.FT_content.session.responder - else: - si = self.stanza.getTag('si') - self.file_props = FilesProp.getNewFileProp(self.conn.name, - unicode(si.getAttr('id')) - ) - self.file_props.sender = self.fjid - self.file_props.request_id = self.id_ - if self.jingle_content: self.file_props.session_type = 'jingle' self.file_props.stream_methods = xmpp.NS_BYTESTREAM desc = self.jingle_content.getTag('description') @@ -2024,8 +2012,11 @@ self.file_props.hash_ = val if name == 'date': self.file_props.date = val - else: + si = self.stanza.getTag('si') + self.file_props = FilesProp.getNewFileProp(self.conn.name, + unicode(si.getAttr('id')) + ) profile = si.getAttr('profile') if profile != xmpp.NS_FILE: self.conn.send_file_rejection(self.file_props, code='400', @@ -2056,18 +2047,16 @@ self.file_props.name = val if name == 'size': self.file_props.size = val + mime_type = si.getAttr('mime-type') + if mime_type is not None: + self.file_props.mime_type = mime_type + self.file_props.sender = self.fjid + self.file_props.request_id = self.id_ file_desc_tag = file_tag.getTag('desc') if file_desc_tag is not None: self.file_props.desc = file_desc_tag.getData() - - if not self.jingle_content: - mime_type = si.getAttr('mime-type') - if mime_type is not None: - self.file_props.mime_type = mime_type - self.file_props.receiver = self.conn._ft_get_our_jid() self.file_props.transfered_size = [] - return True class FileRequestErrorEvent(nec.NetworkIncomingEvent): diff -r ca551b3a2237 -r fae61de0a291 src/common/jingle_session.py --- a/src/common/jingle_session.py Thu Aug 30 23:46:19 2012 +0200 +++ b/src/common/jingle_session.py Thu Aug 30 23:09:23 2012 -0400 @@ -335,8 +335,8 @@ action = 'iq-result' callables = self.callbacks[action] try: - for callable in callables: - callable(stanza=stanza, jingle=jingle, error=error, action=action) + for call in callables: + call(stanza=stanza, jingle=jingle, error=error, action=action) except xmpp.NodeProcessed: pass except TieBreak: @@ -528,6 +528,7 @@ ' is requesting a ' + \ 'file that we dont have') self.decline_session() + raise xmpp.NodeProcessed # If there's no content we understand... if not contents: # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate

1 0

gajim: fix fallback to IBB
by Yann Leboulanger 30 Aug '12

30 Aug '12

changeset ca551b3a2237 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ca551b3a2237 description: fix fallback to IBB diffstat: src/common/jingle_ftstates.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 98b7d72727b2 -r ca551b3a2237 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Thu Aug 30 23:45:35 2012 +0200 +++ b/src/common/jingle_ftstates.py Thu Aug 30 23:46:19 2012 +0200 @@ -139,7 +139,7 @@ def __start_IBB_transfer(self, con): fp = open(self.jft.file_props.file_name, 'r') - con.OpenStream( self.jft.transport.sid, self.jft.session.peerjid, fp, + con.OpenStream( self.jft.file_props.sid, self.jft.session.peerjid, fp, blocksize=4096) def __start_SOCK5_transfer(self):

1 0

gajim: don't forget to send candidate-error when we get only a l...
by Yann Leboulanger 30 Aug '12

30 Aug '12

changeset 98b7d72727b2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=98b7d72727b2 description: don't forget to send candidate-error when we get only a local IP diffstat: src/common/socks5.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (25 lines): diff -r 8e78dbd95821 -r 98b7d72727b2 src/common/socks5.py --- a/src/common/socks5.py Thu Aug 30 22:44:26 2012 +0200 +++ b/src/common/socks5.py Thu Aug 30 23:45:35 2012 +0200 @@ -118,14 +118,18 @@ file_props = FilesProp.getFileProp(account, sid) file_props.failure_cb = on_failure con = gajim.connections[account] - if not file_props.streamhosts: - on_failure(file_props.sid) - # add streamhosts to the queue + streamhosts_to_test = [] + # Remove local IPs to not connect to ourself for streamhost in file_props.streamhosts: if streamhost['host'] == '127.0.0.1' or \ streamhost['host'] == '::1' or \ streamhost['host'] == con.peerhost[0]: continue + streamhosts_to_test.append(streamhost) + if not streamhosts_to_test: + on_failure(file_props.sid) + # add streamhosts to the queue + for streamhost in streamhosts_to_test: if 'type' in streamhost and streamhost['type'] == 'proxy': fp = None else:

1 0

gajim: fix cleaning finished FT
by Yann Leboulanger 30 Aug '12

30 Aug '12

changeset 8e78dbd95821 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8e78dbd95821 description: fix cleaning finished FT diffstat: src/filetransfers_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e6ceaace4cc2 -r 8e78dbd95821 src/filetransfers_window.py --- a/src/filetransfers_window.py Thu Aug 30 11:09:39 2012 +0200 +++ b/src/filetransfers_window.py Thu Aug 30 22:44:26 2012 +0200 @@ -575,7 +575,7 @@ for ev_type in ('file-error', 'file-completed', 'file-request-error', 'file-send-error', 'file-stopped'): for event in gajim.events.get_events(account, jid, [ev_type]): - if event.parameters['sid'] == file_props.sid: + if event.parameters.sid == file_props.sid: gajim.events.remove_events(account, jid, event) gajim.interface.roster.draw_contact(jid, account) gajim.interface.roster.show_title()

1 0

gajim-website: [Darlan] updated hebrew translation
by Yann Leboulanger 30 Aug '12

30 Aug '12

changeset 1dbfb7487870 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=1dbfb7487870 description: [Darlan] updated hebrew translation diffstat: locale/he_IL/LC_MESSAGES/msg.po | 234 ++++++++++++++++----------------------- 1 files changed, 94 insertions(+), 140 deletions(-) diffs (truncated from 496 to 300 lines): diff -r f166bb7d31ba -r 1dbfb7487870 locale/he_IL/LC_MESSAGES/msg.po --- a/locale/he_IL/LC_MESSAGES/msg.po Wed Aug 29 10:29:28 2012 +0200 +++ b/locale/he_IL/LC_MESSAGES/msg.po Thu Aug 30 17:58:26 2012 +0200 @@ -8,8 +8,8 @@ "Project-Id-Version: gajim-website\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-08-29 09:56+0200\n" -"PO-Revision-Date: 2012-07-16 14:54+0200\n" -"Last-Translator: Darlan <xmpp:israeli@failar.nu>\n" +"PO-Revision-Date: 2012-08-30 14:55+0200\n" +"Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut <genghiskhan(a)gmx.ca>\n" "Language: he\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ #: Design.php:90 msgid "Development" -msgstr " פיתוח" +msgstr "פיתוח" # דביאן #: Design.php:94 @@ -96,7 +96,7 @@ # אגיליה לינוקס #: Design.php:105 msgid "AgiliaLinux" -msgstr "AgiliaLinux‏" +msgstr "AgiliaLinux‫" # בס״ד חופשי #: Design.php:106 @@ -105,7 +105,7 @@ #: Design.php:107 msgid "Autopackage" -msgstr "חבילה האוטומטית" +msgstr "חבילה אוטומטית" # installation wizard # אשף התקנה עבור @@ -150,14 +150,12 @@ # I chnged Jabber ID to JID in accord to my translation of 0.15 # והתממש #: Design.php:197 -msgid "" -" Site optimized for W3C Standards and realized with vim editor under GNU/" -"Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" -msgstr "" -" האתר מיועל עבור תקני W3C והוגשם בעזרת עורך התמלילים vim תחת GNU/Linux על " -"ידי ‏Asterix (‏Jabber ID: asterix@jabber.lagaule.org‏)\n" +msgid " Site optimized for W3C Standards and realized with vim editor under GNU/Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" +msgstr " האתר מיועל עבור תקני W3C והוגשם בעזרת עורך התמלילים vim תחת GNU/Linux על ידי ‏Asterix (‏Jabber ID: asterix@jabber.lagaule.org‏)\n" -#: dev.php:5 downloads.php:5 screenshots.php:7 +#: dev.php:5 +#: downloads.php:5 +#: screenshots.php:7 msgid "Gajim, a Jabber client" msgstr "Gajim, לקוח ג'אבּר" @@ -179,7 +177,7 @@ #: dev.php:19 msgid " You may also want to subscribe to our mailing list (low-traffic): " -msgstr " ייתכן וברצונך להירשם אל רשימת התפוצה שלנו (תנועה-נמוכה): " +msgstr " ייתכן וברצונך להירשם אל רשימת התפוצה שלנו (תעבורה-נמוכה): " #: dev.php:19 msgid "or by visiting" @@ -189,8 +187,14 @@ msgid " List archives are available " msgstr " רשימת ארכיונים זמינה " -#: dev.php:20 docs.php:39 docs.php:45 downloads.php:38 downloads.php:162 -#: downloads.php:174 downloads.php:212 downloads.php:232 +#: dev.php:20 +#: docs.php:39 +#: docs.php:45 +#: downloads.php:38 +#: downloads.php:162 +#: downloads.php:174 +#: downloads.php:212 +#: downloads.php:232 msgid "here" msgstr "כאן" @@ -233,12 +237,8 @@ msgstr " ביכולתך לעזור לנו לעשות את Gajim טוב יותר על ידי:\n" #: dev.php:41 -msgid "" -" Coding: contact us on our mailing list or in our room gajim@conference." -"gajim.org \n" -msgstr "" -" קידוד (Coding): צרו עמנו קשר ברשימת התפוצה או בחדרנו gajim@conference." -"gajim.org \n" +msgid " Coding: contact us on our mailing list or in our room gajim(a)conference.gajim.org \n" +msgstr " קידוד (Coding): צרו עמנו קשר ברשימת התפוצה או בחדרנו gajim(a)conference.gajim.org \n" #: dev.php:44 msgid " Submitting a translation: see" @@ -256,7 +256,7 @@ # על כך #: dev.php:47 msgid "report it" -msgstr "לדווח זאת" +msgstr "לדווח על זאת" #: dev.php:50 msgid " Donating: " @@ -281,7 +281,7 @@ #: dev.php:100 msgid "these people" -msgstr "לאנשים אלו" +msgstr "לאנשים האלו" #: docs.php:11 msgid " Installation\n" @@ -301,7 +301,8 @@ msgstr " כדי להשיג את אחת מגרסאות אלו, ניתן לעבור אל עמוד ה%s.\n" # גנו\לינוקס -#: docs.php:22 downloads.php:177 +#: docs.php:22 +#: downloads.php:177 msgid " Under GNU/Linux\n" msgstr " תחת GNU/Linux\n" @@ -346,12 +347,8 @@ # פיצול #: docs.php:48 #, c-format -msgid "" -" Gajim uses a fork of the %s library to do the interface with Jabber " -"network.\n" -msgstr "" -" Gajim עושה שימוש בהסתעפות של ספריית של %s כדי לקיים את הגישור עם רשת " -"התקשורת Jabber.\n" +msgid " Gajim uses a fork of the %s library to do the interface with Jabber network.\n" +msgstr " Gajim עושה שימוש בהסתעפות של ספריית של %s כדי לקיים את הגישור עם רשת התקשורת Jabber.\n" #: downloads.php:10 msgid " Latest version of Gajim is" @@ -378,10 +375,8 @@ msgstr " במידה והינך עושה שימוש במערכת Debian unstable יש להריץ את הפקודה" #: downloads.php:25 -msgid "" -" A daily package from mercurial is also built. To use it, remove gajim" -msgstr "" -" בנוסף, גם חבילה יומית מן מרקורי בנויה. כדי לעשות בה שימוש, הסירו את gajim‏" +msgid " A daily package from mercurial is also built. To use it, remove gajim" +msgstr " בנוסף, גם חבילה יומית מן מאגר המרקורי בנויה. כדי לעשות בה שימוש, הסירו את gajim‏" #: downloads.php:25 msgid "add this line to your" @@ -392,12 +387,8 @@ msgstr "והתקינו את באמצעות" #: downloads.php:30 -msgid "" -"You can get the GPG key of this package by installing gajim-dev-keyring " -"package from the same repository. Just do" -msgstr "" -"ניתן להשיג את מפתח ה־GPG של חבילה זו על ידי התקנת חבילת gajim-dev-keyring מן " -"אותו המאגר. יש להריץ את הפקודה" +msgid "You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository. Just do" +msgstr "ניתן להשיג את מפתח ה־GPG של חבילה זו על ידי התקנת חבילת gajim-dev-keyring מן אותו המאגר. יש להריץ את הפקודה" #: downloads.php:38 msgid " You can get the Slackware package of Gajim" @@ -416,8 +407,13 @@ msgid "this PPA" msgstr "במאגר PPA זה" -#: downloads.php:56 downloads.php:63 downloads.php:70 downloads.php:93 -#: downloads.php:101 downloads.php:109 downloads.php:117 +#: downloads.php:56 +#: downloads.php:63 +#: downloads.php:70 +#: downloads.php:93 +#: downloads.php:101 +#: downloads.php:109 +#: downloads.php:117 msgid " Just" msgstr " פקודה:" @@ -475,11 +471,11 @@ #: downloads.php:131 msgid " Autopackage\n" -msgstr " חבילה האוטומטית\n" +msgstr " חבילה אוטומטית\n" #: downloads.php:134 msgid "Soon available here." -msgstr "זמין בקרוב כאן." +msgstr "תהיה זמינה בקרוב כאן." #: downloads.php:144 msgid " Windows installer\n" @@ -515,36 +511,30 @@ msgstr "קראו את הקובץ <tt>README</tt>" #: downloads.php:165 -msgid "" -"If you want to use the last unstable development version, then you should " -"checkout the mercurial repository.\n" -msgstr "" -"אם יש ברצונך לעשות שימוש בגרסת הפיתוח הבלתי יציבה האחרונה, אז עליך לבדוק את " -"מאגר המרקורי.\n" +msgid "If you want to use the last unstable development version, then you should checkout the mercurial repository.\n" +msgstr "אם יש ברצונך לעשות שימוש בגרסת הפיתוח הבלתי יציבה האחרונה, אז עליך לבדוק את מאגר המרקורי.\n" #: downloads.php:171 msgid " Mercurial\n" msgstr " מרקורי\n" +# מאגר המרקורי זמין #: downloads.php:174 msgid " The mercurial repository is available at this address: " -msgstr " מאגר המרקורי זמין בכתובת זו: " +msgstr " מאגר Mercurial (להלן: מרקורי) זמין בכתובת זו: " +# ושניתן להציגו #: downloads.php:174 msgid "and viewable" -msgstr "ושניתן להציגו" +msgstr "וניתן להצגה" #: downloads.php:179 msgid " In order to download Gajim sources, here is what you have to do:\n" msgstr " כדי להוריד את המקורות של Gajim, הנה מה שעליך לעשות:\n" #: downloads.php:180 -msgid "" -" You first have to install mercurial (apt-get install mercurial " -"under Debian)\n" -msgstr "" -" ראשית עליך להתקין את היישום מרקורי (apt-get install mercurial " -"תחת Debian)\n" +msgid " You first have to install mercurial (apt-get install mercurial under Debian)\n" +msgstr " ראשית עליך להתקין את היישום מרקורי (apt-get install mercurial תחת Debian)\n" #: downloads.php:182 msgid " Then in a console, enter the following commands:\n" @@ -572,42 +562,24 @@ # מרגע שהמאגר #: downloads.php:201 -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 "" -" ברגע שהמאגר מצוי ברשותך, ביכולתך לעדכנו באופן מחזורי כך שהוא יתאים את " -"הגרסה האחרונה מן המאגר הראשי באמצעות הפקודות הבאות:\n" +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 " ברגע שהמאגר מצוי ברשותך, ביכולתך לעדכנו באופן מחזורי כך שהוא יתאים את הגרסה האחרונה מן המאגר הראשי באמצעות הפקודות הבאות:\n" #: downloads.php:210 msgid " Under Windows\n" msgstr " תחת Windows\n" #: downloads.php:212 -msgid "" -" You first have to install mercurial for windows. In order to do that, " -"download the binary" -msgstr "" -" ראשית עליך להתקין מרקורי עבור windows. כדי לעשות כן, יש להוריד את הבינארי" +msgid " You first have to install mercurial for windows. In order to do that, download the binary" +msgstr " ראשית עליך להתקין מרקורי עבור windows. כדי לעשות כן, יש להוריד את הבינארי" #: downloads.php:214 -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 "" -" ברגע שמרקורי מותקן, הפקודות זהות עם אלו שתחת GNU/Linux. ההבדל היחיד הוא " -"שבמקום להריץ את launch.sh צריך להריץ את launch.bat. הזינו אותן בשורת הפקודה " -"של MS-DOS ואתם בסדר גמור." +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 " ברגע שמרקורי מותקן, הפקודות זהות עם אלו שתחת GNU/Linux. ההבדל היחיד הוא שבמקום להריץ את launch.sh צריך להריץ את launch.bat. הזינו אותן בשורת הפקודה של MS-DOS ואתם בסדר גמור." #: downloads.php:216 -msgid "" -" To run Gajim, you need external libraries. You can find a tutorial on the " -"way to install them" -msgstr "" -" בכדי להפעיל את Gajim, יש צורך בסיפריות חיצוניות. ניתן למצוא מדריך בדרכך " -"להתקינן" +msgid " To run Gajim, you need external libraries. You can find a tutorial on the way to install them" +msgstr " בכדי להפעיל את Gajim, יש צורך בסיפריות חיצוניות. ניתן למצוא מדריך בדרכך להתקינן" #: downloads.php:216 msgid "On the Wiki" @@ -619,12 +591,8 @@

1 0

gajim: for the receiver: start to linten only when we accept con...
by Yann Leboulanger 30 Aug '12

30 Aug '12

changeset e6ceaace4cc2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e6ceaace4cc2 description: for the receiver: start to linten only when we accept connection. Stop listening when we get a candidate-error or a candidate-used of type proxy. diffstat: src/common/jingle_ft.py | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diffs (48 lines): diff -r d058d3f4d3b8 -r e6ceaace4cc2 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Aug 29 20:31:27 2012 -0400 +++ b/src/common/jingle_ft.py Thu Aug 30 11:09:39 2012 +0200 @@ -117,7 +117,6 @@ gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, conn=self.session.connection, stanza=stanza, jingle_content=content, FT_content=self)) - self._listen_host() def __on_session_initiate_sent(self, stanza, content, error, action): pass @@ -213,6 +212,8 @@ def __on_transport_info(self, stanza, content, error, action): log.info("__on_transport_info") if content.getTag('transport').getTag('candidate-error'): + if not gajim.socks5queue.listener.connections: + gajim.socks5queue.listener.disconnect() self.nominated_cand['peer-cand'] = False if self.state == STATE_CAND_SENT: if not self.nominated_cand['our-cand'] and \ @@ -230,6 +231,18 @@ args = {'candError' : True} self.__state_changed(STATE_CAND_RECEIVED, args) return + if content.getTag('transport').getTag('candidate-used'): + streamhost_cid = content.getTag('transport').getTag( + 'candidate-used').getAttr('cid') + streamhost_used = None + for cand in self.transport.candidates: + if cand['candidate_id'] == streamhost_cid: + streamhost_used = cand + break + if streamhost_used == None or streamhost_used['type'] == 'proxy': + if not gajim.socks5queue.listener.connections: + gajim.socks5queue.listener.disconnect() + pass if content.getTag('transport').getTag('activated'): self.state = STATE_TRANSFERING @@ -270,6 +283,8 @@ if self.transport.type_ == TransportType.IBB: # No action required, just set the state to transfering self.state = STATE_TRANSFERING + else: + self._listen_host() def on_connect(self, streamhost): """

1 0

gajim: decline request of an unknown file
by Jefry Lagrange 30 Aug '12

30 Aug '12

changeset d058d3f4d3b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d058d3f4d3b8 description: decline request of an unknown file diffstat: src/common/jingle_content.py | 14 ++++++++------ src/common/jingle_session.py | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diffs (39 lines): diff -r 762487eaca6a -r d058d3f4d3b8 src/common/jingle_content.py --- a/src/common/jingle_content.py Wed Aug 29 15:06:04 2012 -0400 +++ b/src/common/jingle_content.py Wed Aug 29 20:31:27 2012 -0400 @@ -190,12 +190,12 @@ self.file_props.hash_: h = self._calcHash() file_tag.addChild(node=h) - file_info = {'name' : self.file_props.name, - 'hash' : self.file_props.hash_, - 'size' : self.file_props.size, - 'date' : self.file_props.date - } - self.session.connection.set_files_info(file_info) + file_info = {'name' : self.file_props.name, + 'hash' : self.file_props.hash_, + 'size' : self.file_props.size, + 'date' : self.file_props.date + } + self.session.connection.set_files_info(file_info) desc = file_tag.setTag('desc') if self.file_props.desc: desc.setData(self.file_props.desc) @@ -214,3 +214,5 @@ def destroy(self): self.callbacks = None del self.session.contents[(self.creator, self.name)] + + diff -r 762487eaca6a -r d058d3f4d3b8 src/common/jingle_session.py --- a/src/common/jingle_session.py Wed Aug 29 15:06:04 2012 -0400 +++ b/src/common/jingle_session.py Wed Aug 29 20:31:27 2012 -0400 @@ -527,6 +527,7 @@ log.warning('The peer ' + self.peerjid + \ ' is requesting a ' + \ 'file that we dont have') + self.decline_session() # If there's no content we understand... if not contents: # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate

1 0

gajim: set and retrieve information about the files transfered
by Jefry Lagrange 29 Aug '12

29 Aug '12

changeset 762487eaca6a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=762487eaca6a description: set and retrieve information about the files transfered diffstat: src/common/file_props.py | 1 + src/common/jingle.py | 15 +++++++++++++++ src/common/jingle_content.py | 15 ++++++++------- src/common/jingle_ft.py | 7 +++++++ src/common/jingle_session.py | 16 ++++++++++++++++ 5 files changed, 47 insertions(+), 7 deletions(-) diffs (137 lines): diff -r 9b79ad04d314 -r 762487eaca6a src/common/file_props.py --- a/src/common/file_props.py Wed Aug 29 16:12:30 2012 +0200 +++ b/src/common/file_props.py Wed Aug 29 15:06:04 2012 -0400 @@ -116,6 +116,7 @@ # full file path self.file_name = None self.name = None + self.date = None self.desc = None self.offset = None self.sender = None diff -r 9b79ad04d314 -r 762487eaca6a src/common/jingle.py --- a/src/common/jingle.py Wed Aug 29 16:12:30 2012 +0200 +++ b/src/common/jingle.py Wed Aug 29 15:06:04 2012 -0400 @@ -55,6 +55,7 @@ # dictionary: (jid, iq stanza id) => JingleSession object, # one time callbacks self.__iq_responses = {} + self.files = [] def delete_jingle_session(self, sid): """ @@ -192,6 +193,20 @@ else: return sessions + def set_files_info(self, file_): + # Saves information about the files we have transfered in case they need + # to be requested again. + self.files.append(file_) + + def get_files_info(self, hash_=None, name=None): + if hash_: + for f in self.files: + if f['hash'] == hash_: + return f + elif name: + for f in self.files: + if f['name'] == name: + return f def get_jingle_session(self, jid, sid=None, media=None): if sid: diff -r 9b79ad04d314 -r 762487eaca6a src/common/jingle_content.py --- a/src/common/jingle_content.py Wed Aug 29 16:12:30 2012 +0200 +++ b/src/common/jingle_content.py Wed Aug 29 15:06:04 2012 -0400 @@ -165,12 +165,10 @@ def _fill_content(self, content): description_node = xmpp.simplexml.Node( tag=xmpp.NS_JINGLE_FILE_TRANSFER + ' description') - if self.session.werequest: simode = xmpp.simplexml.Node(tag='request') else: simode = xmpp.simplexml.Node(tag='offer') - file_tag = simode.setTag('file', namespace=xmpp.NS_FILE) if self.file_props.name: node = xmpp.simplexml.Node(tag='name') @@ -188,15 +186,20 @@ else: # if the file is less than 10 mb, then it is small # lets calculate it right away - if int(self.file_props.size) < 10000000: + if int(self.file_props.size) < 10000000 and not \ + self.file_props.hash_: h = self._calcHash() file_tag.addChild(node=h) + file_info = {'name' : self.file_props.name, + 'hash' : self.file_props.hash_, + 'size' : self.file_props.size, + 'date' : self.file_props.date + } + self.session.connection.set_files_info(file_info) desc = file_tag.setTag('desc') if self.file_props.desc: desc.setData(self.file_props.desc) - description_node.addChild(node=simode) - if self.use_security: security = xmpp.simplexml.Node( tag=xmpp.NS_JINGLE_XTLS + ' security') @@ -206,10 +209,8 @@ method.setAttr('name', m) security.addChild(node=method) content.addChild(node=security) - content.addChild(node=description_node) - def destroy(self): self.callbacks = None del self.session.contents[(self.creator, self.name)] diff -r 9b79ad04d314 -r 762487eaca6a src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Aug 29 16:12:30 2012 +0200 +++ b/src/common/jingle_ft.py Wed Aug 29 15:06:04 2012 -0400 @@ -128,6 +128,13 @@ payload=[self._calcHash()])]) checksum.setNamespace(xmpp.NS_JINGLE_FILE_TRANSFER) self.session.__session_info(checksum ) + file_info = {'name' : self.file_props.name, + 'hash' : self.file_props.hash_, + 'size' : self.file_props.size, + 'date' : self.file_props.date + } + self.session.connection.set_files_info(file_info) + def _calcHash(self): # Caculates the hash and returns a xep-300 hash stanza diff -r 9b79ad04d314 -r 762487eaca6a src/common/jingle_session.py --- a/src/common/jingle_session.py Wed Aug 29 16:12:30 2012 +0200 +++ b/src/common/jingle_session.py Wed Aug 29 15:06:04 2012 -0400 @@ -511,6 +511,22 @@ self.__ack(stanza, jingle, error, action) self._session_terminate(reason) raise xmpp.NodeProcessed + else: + # Stop if we don't have the requested file + request = \ + jingle.getTag('content').getTag('description').getTag('request') + if request: + h = request.getTag('file').getTag('hash') + n = request.getTag('file').getTag('name') + if h: + file_info = self.connection.get_files_info(hash_=h) + elif n: + file_info = self.connection.get_files_info(name=n) + if not file_info: + # Send 404 error? + log.warning('The peer ' + self.peerjid + \ + ' is requesting a ' + \ + 'file that we dont have') # If there's no content we understand... if not contents: # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate

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