Commits

commits@gajim.org

17632 discussions

gajim: Added tag gajim-0.16.3 for changeset 412182ce8274
by Gajim 31 Jul '15

31 Jul '15

changeset dff4fba5ceb7 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=dff4fba5ceb7 description: Added tag gajim-0.16.3 for changeset 412182ce8274 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 412182ce8274 -r dff4fba5ceb7 .hgtags --- a/.hgtags Fri Jul 31 14:27:15 2015 +0200 +++ b/.hgtags Fri Jul 31 14:27:30 2015 +0200 @@ -15,3 +15,4 @@ f33618265c92e3c591ebc8d4767363d5cea2cf71 gajim-0.16 33a5521fed877568ae1de04a76cc9031fdabacbf gajim-0.16.1 9b5eaf71e26776b12eac7f2e11b7d1afd3d78fe7 gajim-0.16.2 +412182ce8274ea938638b4d5b2bd373a7fe21ce7 gajim-0.16.3

1 0

gajim: prepare 0.16.3 release
by Gajim 31 Jul '15

31 Jul '15

changeset 412182ce8274 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=412182ce8274 description: prepare 0.16.3 release diffstat: ChangeLog | 6 ++++++ autogen.sh | 2 +- debian/changelog | 6 ++++++ gajim.nsi | 2 +- setup_win32.py | 2 +- src/common/defs.py | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diffs (72 lines): diff -r 0e5a60658d0c -r 412182ce8274 ChangeLog --- a/ChangeLog Wed Jul 29 22:35:51 2015 +0200 +++ b/ChangeLog Fri Jul 31 14:27:15 2015 +0200 @@ -1,3 +1,9 @@ +Gajim 0.16.3 (31 July 2015) + + * Fix reading secret file + * Fix reconnection after suspend + * Fix sending GPG-encrypted file to non-trusted key + Gajim 0.16.2 (24 July 2015) * improve Zeroconf under windows and with IPv6 diff -r 0e5a60658d0c -r 412182ce8274 autogen.sh --- a/autogen.sh Wed Jul 29 22:35:51 2015 +0200 +++ b/autogen.sh Fri Jul 31 14:27:15 2015 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16.2" + gajimversion="0.16.3" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 0e5a60658d0c -r 412182ce8274 debian/changelog --- a/debian/changelog Wed Jul 29 22:35:51 2015 +0200 +++ b/debian/changelog Fri Jul 31 14:27:15 2015 +0200 @@ -1,3 +1,9 @@ +gajim (0.16.3-1) unstable; urgency=low + + * New upstream release + + -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 31 Jul 2014 23:12:04 +0200 + gajim (0.16.2-1) unstable; urgency=low * New upstream release diff -r 0e5a60658d0c -r 412182ce8274 gajim.nsi --- a/gajim.nsi Wed Jul 29 22:35:51 2015 +0200 +++ b/gajim.nsi Fri Jul 31 14:27:15 2015 +0200 @@ -212,7 +212,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.2" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.3" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 0e5a60658d0c -r 412182ce8274 setup_win32.py --- a/setup_win32.py Wed Jul 29 22:35:51 2015 +0200 +++ b/setup_win32.py Fri Jul 31 14:27:15 2015 +0200 @@ -56,7 +56,7 @@ setup( name='Gajim', - version='0.16.2', + version='0.16.3', description='A full featured Jabber client', author='Gajim Development Team', url='http://gajim.org/', diff -r 0e5a60658d0c -r 412182ce8274 src/common/defs.py --- a/src/common/defs.py Wed Jul 29 22:35:51 2015 +0200 +++ b/src/common/defs.py Fri Jul 31 14:27:15 2015 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16.2' +version = '0.16.3' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: update chat_control glade file
by Gajim 30 Jul '15

30 Jul '15

changeset 2587bc2e1946 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2587bc2e1946 description: update chat_control glade file diffstat: data/gui/chat_control.ui | 1631 +++++++++++++++++++++++---------------------- 1 files changed, 831 insertions(+), 800 deletions(-) diffs (truncated from 1652 to 300 lines): diff -r daf068e7a261 -r 2587bc2e1946 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Thu Jul 30 23:06:09 2015 +0200 +++ b/data/gui/chat_control.ui Thu Jul 30 23:06:32 2015 +0200 @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> + <interface> -  + <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">110</property> <property name="step_increment">1</property> @@ -13,805 +14,6 @@ <property name="page_increment">10</property> <property name="page_size">10</property> </object> - <object class="GtkHBox" id="chat_control_hbox"> - <property name="can_focus">True</property> - <property name="spacing">1</property> - <child> - <object class="GtkPaned" id="paned1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkVBox" id="vbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkAlignment" id="alignment"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">3</property> - <property name="right_padding">3</property> - <child> - <object class="GtkEventBox" id="banner_eventbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkHBox" id="hbox3004"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkImage" id="banner_status_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="ypad">5</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="banner_vbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="border_width">5</property> - <child> - <object class="GtkLabel" id="banner_name_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label"><span weight="heavy" size="large">Contact name</span></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="banner_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label">label</property> - <property name="use_markup">True</property> - <property name="selectable">True</property> - <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">4</property> - <child> - <object class="GtkImage" id="mood_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon-size">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="activity_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon-size">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkImage" id="tune_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon-size">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkEventBox" id="location_eventbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="visible_window">False</property> - <child> - <object class="GtkImage" id="location_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon-size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkImage" id="audio_banner_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon-size">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkImage" id="video_banner_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon-size">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment3"> - <property name="width_request">11</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">6</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkEventBox" id="avatar_eventbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="visible_window">False</property> - <child> - <object class="GtkImage" id="avatar_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox106"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> - <property name="height_request">60</property> - <property name="can_focus">True</property> - <property name="border_width">3</property> - <property name="shadow_type">in</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkButton" id="authentication_button"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - <property name="relief">none</property> - <property name="focus_on_click">False</property> - <child> - <object class="GtkImage" id="lock_image"> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="stock">gtk-dialog-authentication</property> - <property name="icon-size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="message_scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="border_width">3</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <placeholder/> - </child> - </object>

1 0

gajim: update about dialog with nbxmpp version and make close bu...
by Gajim 30 Jul '15

30 Jul '15

changeset 189503ba245e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=189503ba245e description: update about dialog with nbxmpp version and make close button work diffstat: src/dialogs.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diffs (25 lines): diff -r e93a1877ac69 -r 189503ba245e src/dialogs.py --- a/src/dialogs.py Thu Jul 30 15:18:03 2015 +0200 +++ b/src/dialogs.py Thu Jul 30 23:05:43 2015 +0200 @@ -1298,8 +1298,10 @@ gtk_ver = '%i.%i.%i' % (Gtk.get_major_version(), Gtk.get_minor_version(), Gtk.get_micro_version()) gobject_ver = self.tuple2str(GObject.pygobject_version) - dlg.set_comments('%s\n%s %s\n%s %s' % (_('A GTK+ Jabber/XMPP client'), - _('GTK+ Version:'), gtk_ver, _('PyGobject Version:'), gobject_ver)) + nbxmpp_ver = nbxmpp.__version__ + dlg.set_comments('%s\n%s %s\n%s %s\n%s %s' % (_('A GTK+ Jabber/XMPP client'), + _('GTK+ Version:'), gtk_ver, _('PyGobject Version:'), gobject_ver, + _('python-nbxmpp Version:'), nbxmpp_ver)) dlg.set_website('http://gajim.org/') authors_file_path = self.get_path('AUTHORS') @@ -1349,7 +1351,7 @@ dlg.show_all() def on_response(self, dialog, response_id): - if response_id == Gtk.ResponseType.CANCEL: + if response_id == Gtk.ResponseType.DELETE_EVENT: dialog.destroy() def tuple2str(self, tuple_):

1 0

gajim: make shift+enter work for new_line
by Gajim 30 Jul '15

30 Jul '15

changeset daf068e7a261 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=daf068e7a261 description: make shift+enter work for new_line diffstat: src/chat_control.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 189503ba245e -r daf068e7a261 src/chat_control.py --- a/src/chat_control.py Thu Jul 30 23:05:43 2015 +0200 +++ b/src/chat_control.py Thu Jul 30 23:06:09 2015 +0200 @@ -706,6 +706,8 @@ elif event.keyval == Gdk.KEY_Return or \ event.keyval == Gdk.KEY_KP_Enter: # ENTER + if event_state & Gdk.ModifierType.SHIFT_MASK: + return True message_textview = widget message_buffer = message_textview.get_buffer() start_iter, end_iter = message_buffer.get_bounds()

1 0

gajim: fix some warnings
by Gajim 30 Jul '15

30 Jul '15

changeset e93a1877ac69 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e93a1877ac69 description: fix some warnings diffstat: data/iconsets/sun/16x16/closed.png | Bin data/iconsets/sun/16x16/opened.png | Bin src/common/socks5.py | 4 ++-- src/config.py | 18 ++++++++++-------- src/dataforms_widget.py | 3 ++- src/dialogs.py | 14 +++++++------- src/gajim_themes_window.py | 13 +++++++++---- src/secrets.py | 4 ++-- src/vcard.py | 4 ++-- 9 files changed, 34 insertions(+), 26 deletions(-) diffs (213 lines): diff -r 7220374a5291 -r e93a1877ac69 data/iconsets/sun/16x16/closed.png Binary file data/iconsets/sun/16x16/closed.png has changed diff -r 7220374a5291 -r e93a1877ac69 data/iconsets/sun/16x16/opened.png Binary file data/iconsets/sun/16x16/opened.png has changed diff -r 7220374a5291 -r e93a1877ac69 src/common/socks5.py --- a/src/common/socks5.py Thu Jul 30 15:15:38 2015 +0200 +++ b/src/common/socks5.py Thu Jul 30 15:18:03 2015 +0200 @@ -419,10 +419,10 @@ self.connected -= 1 def remove_by_mode(self, sid, mode, do_disconnect=True): - for (key, sock) in self.senders.items(): + for (key, sock) in self.senders.copy().items(): if key[0] == sid and sock.mode == mode: self.remove_sender_by_key(key) - for (key, sock) in self.readers.items(): + for (key, sock) in self.readers.copy().items(): if key[0] == sid and sock.mode == mode: self.remove_receiver_by_key(key) diff -r 7220374a5291 -r e93a1877ac69 src/config.py --- a/src/config.py Thu Jul 30 15:15:38 2015 +0200 +++ b/src/config.py Thu Jul 30 15:18:03 2015 +0200 @@ -954,22 +954,24 @@ col = gajim.config.get(c) if col: if isinstance(col_to_widget[c], list): - self.xml.get_object(col_to_widget[c][0]).set_color( - Gdk.color_parse(col)) + rgba = Gdk.RGBA() + rgba.parse(col) + self.xml.get_object(col_to_widget[c][0]).set_rgba(rgba) self.xml.get_object(col_to_widget[c][0]).set_sensitive(True) self.xml.get_object(col_to_widget[c][1]).set_active(True) else: - self.xml.get_object(col_to_widget[c]).set_color( - Gdk.color_parse(col)) + rgba = Gdk.RGBA() + rgba.parse(col) + self.xml.get_object(col_to_widget[c]).set_rgba(rgba) else: + rgba = Gdk.RGBA() + rgba.parse('#000000') if isinstance(col_to_widget[c], list): - self.xml.get_object(col_to_widget[c][0]).set_color( - Gdk.color_parse('#000000')) + self.xml.get_object(col_to_widget[c][0]).set_rgba(rgba) self.xml.get_object(col_to_widget[c][0]).set_sensitive(False) self.xml.get_object(col_to_widget[c][1]).set_active(False) else: - self.xml.get_object(col_to_widget[c]).set_color( - Gdk.color_parse('#000000')) + self.xml.get_object(col_to_widget[c]).set_rgba(rgba) def on_reset_colors_button_clicked(self, widget): col_to_widget = {'inmsgcolor': 'incoming_nick_colorbutton', diff -r 7220374a5291 -r e93a1877ac69 src/dataforms_widget.py --- a/src/dataforms_widget.py Thu Jul 30 15:15:38 2015 +0200 +++ b/src/dataforms_widget.py Thu Jul 30 15:18:03 2015 +0200 @@ -421,7 +421,8 @@ # 5 option max: show checkbutton widget = Gtk.VBox() for value, label in field.iter_options(): - check = Gtk.CheckButton(label, use_underline=False) + check = Gtk.CheckButton(label=label, + use_underline=False) check.set_active(value in field.values) check.connect('toggled', self.on_list_multi_checkbutton_toggled, field, value) diff -r 7220374a5291 -r e93a1877ac69 src/dialogs.py --- a/src/dialogs.py Thu Jul 30 15:15:38 2015 +0200 +++ b/src/dialogs.py Thu Jul 30 15:18:03 2015 +0200 @@ -1663,7 +1663,7 @@ on_response_no=self.on_response_no) if checktext: - self.checkbutton = Gtk.CheckButton(checktext) + self.checkbutton = Gtk.CheckButton(label=checktext) self.vbox.pack_start(self.checkbutton, False, True, 0) else: self.checkbutton = None @@ -1756,7 +1756,7 @@ ok_button = self.action_area.get_children()[0] # right to left ok_button.grab_focus() - self.checkbutton = Gtk.CheckButton(checktext) + self.checkbutton = Gtk.CheckButton(label=checktext) self.vbox.pack_start(self.checkbutton, False, True, 0) self.set_modal(is_modal) self.popup() @@ -1812,14 +1812,14 @@ ok_button.grab_focus() if checktext1: - self.checkbutton1 = Gtk.CheckButton(checktext1) + self.checkbutton1 = Gtk.CheckButton(label=checktext1) if tooltip1: self.checkbutton1.set_tooltip_text(tooltip1) self.vbox.pack_start(self.checkbutton1, False, True, 0) else: self.checkbutton1 = None if checktext2: - self.checkbutton2 = Gtk.CheckButton(checktext2) + self.checkbutton2 = Gtk.CheckButton(label=checktext2) if tooltip2: self.checkbutton2.set_tooltip_text(tooltip2) self.vbox.pack_start(self.checkbutton2, False, True, 0) @@ -1969,7 +1969,7 @@ self.on_response = on_response if propose_resume: - b = Gtk.Button('', Gtk.STOCK_REFRESH) + b = Gtk.Button(label='', stock=Gtk.STOCK_REFRESH) align = b.get_children()[0] hbox = align.get_children()[0] label = hbox.get_children()[1] @@ -1977,7 +1977,7 @@ label.set_use_underline(True) self.add_action_widget(b, 100) - b = Gtk.Button('', Gtk.STOCK_SAVE_AS) + b = Gtk.Button(label='', stock=Gtk.STOCK_SAVE_AS) align = b.get_children()[0] hbox = align.get_children()[0] label = hbox.get_children()[1] @@ -2086,7 +2086,7 @@ self.input_entry.select_region(0, -1) # select all if checktext: - self.checkbutton = Gtk.CheckButton(checktext) + self.checkbutton = Gtk.CheckButton(label=checktext) self.vbox.pack_start(self.checkbutton, False, True, 0) self.checkbutton.show() diff -r 7220374a5291 -r e93a1877ac69 src/gajim_themes_window.py --- a/src/gajim_themes_window.py Thu Jul 30 15:15:38 2015 +0200 +++ b/src/gajim_themes_window.py Thu Jul 30 15:18:03 2015 +0200 @@ -199,7 +199,9 @@ textcolor = gajim.config.get_per('themes', theme, option + 'textcolor') if textcolor: state = True - self.text_colorbutton.set_color(Gdk.color_parse(textcolor)) + rgba = Gdk.RGBA() + rgba.parse(textcolor) + self.text_colorbutton.set_rgba(rgba) else: state = False self.textcolor_checkbutton.set_active(state) @@ -207,8 +209,9 @@ bgcolor = gajim.config.get_per('themes', theme, option + 'bgcolor') if bgcolor: state = True - self.background_colorbutton.set_color(Gdk.color_parse( - bgcolor)) + rgba = Gdk.RGBA() + rgba.parse(bgcolor) + self.background_colorbutton.set_rgba(rgba) else: state = False self.background_checkbutton.set_active(state) @@ -232,7 +235,9 @@ 'muc_msg', 'muc_directed_msg'): color = gajim.config.get_per('themes', theme, 'state_' + chatstate + \ '_color') - self.colorbuttons[chatstate].set_color(Gdk.color_parse(color)) + rgba = Gdk.RGBA() + rgba.parse(color) + self.colorbuttons[chatstate].set_rgba(rgba) def on_textcolor_checkbutton_toggled(self, widget): state = widget.get_active() diff -r 7220374a5291 -r e93a1877ac69 src/secrets.py --- a/src/secrets.py Thu Jul 30 15:15:38 2015 +0200 +++ b/src/secrets.py Thu Jul 30 15:18:03 2015 +0200 @@ -31,7 +31,7 @@ secrets_filename = gajimpaths['SECRETS_FILE'] secrets_cache = None -class Secrets: +class Secrets(): def __init__(self, filename): self.filename = filename self.srs = {} @@ -43,7 +43,7 @@ def save(self): f = open(secrets_filename, 'wb') - pickle.dump(self, f) + pickle.dump(self, f, protocol=2) f.close() def retained_secrets(self, account, bare_jid): diff -r 7220374a5291 -r e93a1877ac69 src/vcard.py --- a/src/vcard.py Thu Jul 30 15:15:38 2015 +0200 +++ b/src/vcard.py Thu Jul 30 15:18:03 2015 +0200 @@ -197,7 +197,7 @@ def set_value(self, entry_name, value): try: if value and entry_name == 'URL_label': - widget = Gtk.LinkButton(value, value) + widget = Gtk.LinkButton(uri=value, label=value) widget.set_alignment(0, 0) widget.show() table = self.xml.get_object('personal_info_table') @@ -555,7 +555,7 @@ def set_value(self, entry_name, value): try: if value and entry_name == 'URL_label': - widget = Gtk.LinkButton(value, value) + widget = Gtk.LinkButton(uri=value, label=value) widget.set_alignment(0, 0) table = self.xml.get_object('personal_info_table') table.attach(widget, 1, 4, 3, 4, yoptions = 0)

1 0

gajim: fix launch when optional modules are not installed
by Gajim 30 Jul '15

30 Jul '15

changeset 7220374a5291 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7220374a5291 description: fix launch when optional modules are not installed diffstat: src/common/gajim.py | 2 +- src/common/passwords.py | 2 +- src/gajim.py | 10 +++++----- src/notify.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diffs (56 lines): diff -r a66587b34221 -r 7220374a5291 src/common/gajim.py --- a/src/common/gajim.py Tue Jul 28 20:32:14 2015 +0200 +++ b/src/common/gajim.py Thu Jul 30 15:15:38 2015 +0200 @@ -211,7 +211,7 @@ gi.require_version('GUPnPIgd', '1.0') from gi.repository import GUPnPIgd gupnp_igd = GUPnPIgd.SimpleIgd() -except ImportError: +except ValueError: HAVE_UPNP_IGD = False HAVE_PYCURL = True diff -r a66587b34221 -r 7220374a5291 src/common/passwords.py --- a/src/common/passwords.py Tue Jul 28 20:32:14 2015 +0200 +++ b/src/common/passwords.py Thu Jul 30 15:15:38 2015 +0200 @@ -258,7 +258,7 @@ gir = __import__('gi.repository', globals(), locals(), ['Secret'], 0) Secret = gir.Secret - except (ImportError, AttributeError): + except (ValueError, AttributeError): global GnomeKeyring try: gir = __import__('gi.repository', globals(), locals(), diff -r a66587b34221 -r 7220374a5291 src/gajim.py --- a/src/gajim.py Tue Jul 28 20:32:14 2015 +0200 +++ b/src/gajim.py Thu Jul 30 15:15:38 2015 +0200 @@ -134,11 +134,11 @@ # gajim.gui or gajim.gtk more appropriate ? log = logging.getLogger('gajim.gajim') -#import gi -#gi.require_version('Gtk', '3.0') -#gi.require_version('Gdk', '2.0') -#gi.require_version('GObject', '2.0') -#gi.require_version('Pango', '1.0') +import gi +gi.require_version('Gtk', '3.0') +gi.require_version('Gdk', '3.0') +gi.require_version('GObject', '2.0') +gi.require_version('Pango', '1.0') import getopt from common import i18n diff -r a66587b34221 -r 7220374a5291 src/notify.py --- a/src/notify.py Tue Jul 28 20:32:14 2015 +0200 +++ b/src/notify.py Thu Jul 30 15:15:38 2015 +0200 @@ -50,7 +50,7 @@ gi.require_version('Notify', '0.7') from gi.repository import Notify Notify.init('Gajim Notification') -except ImportError: +except ValueError: USER_HAS_PYNOTIFY = False def get_show_in_roster(event, account, contact, session=None):

1 0

gajim: Handle PINENTRY_LAUNCHED when signing. Fixes #8099
by Gajim 29 Jul '15

29 Jul '15

changeset 0e5a60658d0c 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=0e5a60658d0c description: Handle PINENTRY_LAUNCHED when signing. Fixes #8099 diffstat: src/common/gnupg.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 4d7826936744 -r 0e5a60658d0c src/common/gnupg.py --- a/src/common/gnupg.py Wed Jul 29 22:32:02 2015 +0200 +++ b/src/common/gnupg.py Wed Jul 29 22:35:51 2015 +0200 @@ -612,7 +612,8 @@ if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE", "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", "INV_SGNR", "NO_SGNR", "MISSING_PASSPHRASE", "NEED_PASSPHRASE_PIN", - "SC_OP_FAILURE", "SC_OP_SUCCESS", "PROGRESS"): + "SC_OP_FAILURE", "SC_OP_SUCCESS", "PROGRESS", + "PINENTRY_LAUNCHED"): pass elif key in ("KEYEXPIRED", "SIGEXPIRED"): self.status = 'key expired'

1 0

gajim: correctly detect that key is not trusted before encryptin...
by Gajim 29 Jul '15

29 Jul '15

changeset 4d7826936744 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=4d7826936744 description: correctly detect that key is not trusted before encrypting. Doc says: "gpg just prints a message to the console, but does not provide a specific error indication that the Python wrapper can use." Fixes #8040. See #8041 diffstat: src/common/gnupg.py | 5 ++++- src/common/gpg.py | 10 +++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diffs (45 lines): diff -r 2127559a62b2 -r 4d7826936744 src/common/gnupg.py --- a/src/common/gnupg.py Tue Jul 28 20:19:19 2015 +0200 +++ b/src/common/gnupg.py Wed Jul 29 22:32:02 2015 +0200 @@ -1094,7 +1094,7 @@ getattr(result, keyword)(L) return result - def list_keys(self, secret=False): + def list_keys(self, secret=False, keys=None): """ list the keys currently in the keyring >>> import shutil @@ -1116,6 +1116,9 @@ which='secret-keys' args = ["--list-%s" % which, "--fixed-list-mode", "--fingerprint", "--with-colons"] + if keys: + for key in keys: + args.append(key) p = self._open_subprocess(args) return self._get_list_output(p, 'list') diff -r 2127559a62b2 -r 4d7826936744 src/common/gpg.py --- a/src/common/gpg.py Tue Jul 28 20:19:19 2015 +0200 +++ b/src/common/gpg.py Wed Jul 29 22:32:02 2015 +0200 @@ -54,12 +54,16 @@ for key in recipients: if key not in self.always_trust: trust = False + if not trust: + # check that we'll be able to encrypt + result = super(GnuPG, self).list_keys(recipients, + keys=recipients) + for key in result: + if key['trust'] not in ('f', 'u'): + return '', 'NOT_TRUSTED' result = super(GnuPG, self).encrypt(str_, recipients, always_trust=trust, passphrase=self.passphrase) - if result.status == 'invalid recipient': - return '', 'NOT_TRUSTED' - if result.ok: error = '' else:

1 0

gajim: fix file transfer. Files can be something else that utf8
by Gajim 28 Jul '15

28 Jul '15

changeset a66587b34221 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a66587b34221 description: fix file transfer. Files can be something else that utf8 diffstat: src/common/proxy65_manager.py | 12 +++--- src/common/socks5.py | 70 +++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 45 deletions(-) diffs (255 lines): diff -r f21a251c01b5 -r a66587b34221 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Sat Jul 25 22:03:48 2015 +0200 +++ b/src/common/proxy65_manager.py Tue Jul 28 20:32:14 2015 +0200 @@ -304,14 +304,14 @@ self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) # begin negotiation. on success 'address' != 0 buff = self.receive() - if buff == '': + if buff == b'': # end connection self.pollend() return # read auth response if buff is None or len(buff) != 2: return None - version, method = struct.unpack('!BB', buff[:2].encode('utf-8')) + version, method = struct.unpack('!BB', buff[:2]) if version != 0x05 or method == 0xff: self.pollend() return @@ -349,7 +349,7 @@ self._sock.setblocking(False) self._send = self._sock.send self._recv = self._sock.recv - self.buff = '' + self.buff = b'' self.state = 1 # connected log.debug('Host connected to %s:%s' % (self.host, self.port)) self.idlequeue.plug_idle(self, True, False) @@ -424,7 +424,7 @@ self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) # begin negotiation. on success 'address' != 0 buff = self.receive() - if buff == '': + if buff == b'': # end connection self.pollend() return @@ -432,7 +432,7 @@ # read auth response if buff is None or len(buff) != 2: return None - version, method = struct.unpack('!BB', buff[:2].encode('utf-8')) + version, method = struct.unpack('!BB', buff[:2]) if version != 0x05 or method == 0xff: self.pollend() return @@ -444,7 +444,7 @@ # read connect response if buff is None or len(buff) < 2: return None - version, reply = struct.unpack('!BB', buff[:2].encode('utf-8')) + version, reply = struct.unpack('!BB', buff[:2]) if version != 0x05 or reply != 0x00: self.pollend() return diff -r f21a251c01b5 -r a66587b34221 src/common/socks5.py --- a/src/common/socks5.py Sat Jul 25 22:03:48 2015 +0200 +++ b/src/common/socks5.py Tue Jul 28 20:32:14 2015 +0200 @@ -149,8 +149,8 @@ socks5obj = Socks5SenderClient(self.idlequeue, idx, self, _sock=None,host=str(streamhost['host']), port=int(streamhost['port']),fingerprint=fp, - connected=False, file_props=file_props, - initiator=streamhost['initiator'], + connected=False, file_props=file_props, + initiator=streamhost['initiator'], target=streamhost['target']) socks5obj.streamhost = streamhost self.add_sockobj(account, socks5obj) @@ -395,7 +395,7 @@ connections with 1 """ if idx != -1: - for key in self.readers.keys(): + for key in list(self.readers.keys()): if idx in key: self.remove_receiver_by_key(key, do_disconnect=do_disconnect) @@ -452,7 +452,7 @@ self.state = 0 # not connected self.pauses = 0 self.size = 0 - self.remaining_buff = '' + self.remaining_buff = b'' self.file = None self.connected = False self.mode = '' @@ -618,15 +618,15 @@ Read small chunks of data. Call owner's disconnected() method if appropriate """ - received = '' + received = b'' try: - add = self._recv(64).decode('utf-8') + add = self._recv(64) except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, OpenSSL.SSL.WantX509LookupError) as e: log.info('SSL rehandshake request : ' + repr(e)) raise e except Exception: - add = '' + add = b'' received += add if len(add) == 0: self.disconnect() @@ -647,9 +647,9 @@ return len(raw_data) def write_next(self): - if self.remaining_buff != '': + if self.remaining_buff != b'': buff = self.remaining_buff - self.remaining_buff = '' + self.remaining_buff = b'' else: try: self.open_file_for_reading() @@ -688,7 +688,7 @@ if lenn != len(buff): self.remaining_buff = buff[lenn:] else: - self.remaining_buff = '' + self.remaining_buff = b'' self.state = 7 # continue to write in the socket if lenn == 0: return None @@ -707,7 +707,7 @@ self.file_props.error = -2 return None fd = None - if self.remaining_buff != '': + if self.remaining_buff != b'': try: fd = self.get_fd() except IOError: @@ -721,7 +721,7 @@ self.file_props.last_time self.file_props.last_time = current_time self.file_props.received_len += lenn - self.remaining_buff = '' + self.remaining_buff = b'' if self.file_props.received_len == self.file_props.size: self.rem_fd(fd) self.disconnect() @@ -736,13 +736,13 @@ self.file_props.error = -6 # file system error return 0 try: - buff = self._recv(MAX_BUFF_LEN).decode('utf-8') + buff = self._recv(MAX_BUFF_LEN) except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, OpenSSL.SSL.WantX509LookupError) as e: log.info('SSL rehandshake request :' + repr(e)) raise e except Exception: - buff = '' + buff = b'' current_time = self.idlequeue.current_time() self.file_props.elapsed_time += current_time - \ self.file_props.last_time @@ -819,9 +819,9 @@ """ auth_mechanisms = [] try: - num_auth = struct.unpack('!xB', buff[:2].encode('utf-8'))[0] + num_auth = struct.unpack('!xB', buff[:2])[0] for i in list(range(num_auth)): - mechanism, = struct.unpack('!B', buff[1 + i].encode('utf-8')) + mechanism, = struct.unpack('!B', buff[1 + i]) auth_mechanisms.append(mechanism) except Exception: return None @@ -855,25 +855,22 @@ def _parse_request_buff(self, buff): try: # don't trust on what comes from the outside - req_type, host_type, = struct.unpack('!xBxB', buff[:4].encode( - 'utf-8')) + req_type, host_type, = struct.unpack('!xBxB', buff[:4]) if host_type == 0x01: - host_arr = struct.unpack('!iiii', buff[4:8].encode('utf-8')) + host_arr = struct.unpack('!iiii', buff[4:8]) host, = '.'.join(str(s) for s in host_arr) host_len = len(host) elif host_type == 0x03: - host_len, = struct.unpack('!B', buff[4].encode('utf-8')) - host, = struct.unpack('!%ds' % host_len, buff[5:5 + host_len].\ - encode('utf-8')) + host_len, = struct.unpack('!B', buff[4]) + host, = struct.unpack('!%ds' % host_len, buff[5:5 + host_len]) portlen = len(buff[host_len + 5:]) if portlen == 1: - port, = struct.unpack('!B', buff[host_len + 5].encode('utf-8')) + port, = struct.unpack('!B', buff[host_len + 5]) elif portlen == 2: - port, = struct.unpack('!H', buff[host_len + 5:].encode('utf-8')) + port, = struct.unpack('!H', buff[host_len + 5:]) # file data, comes with auth message (Gaim bug) else: - port, = struct.unpack('!H', buff[host_len + 5: host_len + 7].\ - encode('utf-8')) + port, = struct.unpack('!H', buff[host_len + 5: host_len + 7]) self.remaining_buff = buff[host_len + 7:] except Exception: return (None, None, None) @@ -890,7 +887,7 @@ log.info("SSL rehandshake request : " + repr(e)) raise e try: - version, method = struct.unpack('!BB', buff.encode('utf-8')) + version, method = struct.unpack('!BB', buff) except Exception: version, method = None, None if version != 0x05 or method == 0xff: @@ -1197,7 +1194,7 @@ if self.state == 2: # read auth response if buff is None or len(buff) != 2: return None - version, method = struct.unpack('!BB', buff[:2].encode('utf-8')) + version, method = struct.unpack('!BB', buff[:2]) if version != 0x05 or method == 0xff: self.disconnect() elif self.state == 4: # get approve of our request @@ -1206,23 +1203,18 @@ sub_buff = buff[:4] if len(sub_buff) < 4: return None - version, address_type = struct.unpack('!BxxB', buff[:4].encode( - 'utf-8')) + version, address_type = struct.unpack('!BxxB', buff[:4]) addrlen = 0 if address_type == 0x03: - addrlen = ord(buff[4]) - address = struct.unpack('!%ds' % addrlen, buff[5:addrlen + 5].\ - encode('utf-8')) + addrlen = buff[4] + address = struct.unpack('!%ds' % addrlen, buff[5:addrlen + 5]) portlen = len(buff[addrlen + 5:]) if portlen == 1: - port, = struct.unpack('!B', buff[addrlen + 5].encode( - 'utf-8')) + port, = struct.unpack('!B', buff[addrlen + 5]) elif portlen == 2: - port, = struct.unpack('!H', buff[addrlen + 5:].encode( - 'utf-8')) + port, = struct.unpack('!H', buff[addrlen + 5:]) else: # Gaim bug :) - port, = struct.unpack('!H', buff[addrlen + 5:addrlen + 7].\ - encode('utf-8')) + port, = struct.unpack('!H', buff[addrlen + 5:addrlen + 7]) self.remaining_buff = buff[addrlen + 7:] self.state = 5 # for senders: init file_props and send '\n' if self.queue.on_success:

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