Commits March 2014

commits@gajim.org

3 participants
103 discussions

python-nbxmpp: BOSH doesn't support channel binding.
by Fedor Brunner 31 Mar '14

31 Mar '14

changeset fa6cb8f12391 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=fa6cb8f12391 description: BOSH doesn't support channel binding. BOSH (XEP-0124) uses short lived HTTPS connections for encryption. Channel binding requires long lived TLS connection, therefor doesn't work with XMPP over BOSH. Fixes #22 diffstat: nbxmpp/client_nb.py | 7 ++++--- nbxmpp/tls_nb.py | 7 +++++-- nbxmpp/transports_nb.py | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diffs (45 lines): diff -r cb67945d0438 -r fa6cb8f12391 nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Sat Mar 29 18:28:28 2014 +0100 +++ b/nbxmpp/client_nb.py Mon Mar 31 16:54:20 2014 +0200 @@ -496,9 +496,10 @@ self._channel_binding = None if self.connected in ('ssl', 'tls'): try: - self._channel_binding = self.Connection.NonBlockingTLS.get_channel_binding() - # TLS handshake is finished so channel binding data muss exist - assert (self._channel_binding != None) + if self.protocol_type != 'BOSH': + self._channel_binding = self.Connection.NonBlockingTLS.get_channel_binding() + # TLS handshake is finished so channel binding data muss exist + assert (self._channel_binding != None) except NotImplementedError: pass if auth_mechs == None: diff -r cb67945d0438 -r fa6cb8f12391 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sat Mar 29 18:28:28 2014 +0100 +++ b/nbxmpp/tls_nb.py Mon Mar 31 16:54:20 2014 +0200 @@ -491,7 +491,10 @@ Get channel binding data. RFC 5929 """ sslObj = self._owner._sslObj - try: - return sslObj.get_channel_binding() + try: + if USE_PYOPENSSL: + return sslObj.get_finished() + else: + return sslObj.get_channel_binding() except AttributeError: raise NotImplementedError diff -r cb67945d0438 -r fa6cb8f12391 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Mar 29 18:28:28 2014 +0100 +++ b/nbxmpp/transports_nb.py Mon Mar 31 16:54:20 2014 +0200 @@ -546,7 +546,7 @@ return None self.sendbuff = self.sendqueue.pop(0) try: - send_count = self._send(self.sendbuff) + send_count = self._send(self.sendbuff.encode("utf-8")) if send_count: sent_data = self.sendbuff[:send_count] self.sendbuff = self.sendbuff[send_count:]

1 0

gajim: keep treeview consistent when connecting. Fixes #7434
by Gajim 30 Mar '14

30 Mar '14

changeset 3e88b9a62b75 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3e88b9a62b75 description: keep treeview consistent when connecting. Fixes #7434 diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 697d10622571 -r 3e88b9a62b75 src/roster_window.py --- a/src/roster_window.py Fri Mar 28 21:29:42 2014 +0100 +++ b/src/roster_window.py Fri Mar 28 21:30:57 2014 +0100 @@ -2642,7 +2642,7 @@ def _nec_roster_received(self, obj): if obj.received_from_server: self.fill_contacts_and_groups_dicts(obj.roster, obj.conn.name) - self.add_account_contacts(obj.conn.name) + self.add_account_contacts(obj.conn.name, improve_speed=False) self.fire_up_unread_messages_events(obj.conn.name) else: if gajim.config.get('remember_opened_chat_controls'):

1 0

gajim: rename some icons so we don't need to check in code if in...
by Gajim 30 Mar '14

30 Mar '14

changeset 3a8133f1fe2e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3a8133f1fe2e description: rename some icons so we don't need to check in code if installed iconset has it. Fixes #7445 diffstat: icons/hicolor/16x16/actions/document-send.png | Bin icons/hicolor/16x16/actions/gajim-upload.png | Bin icons/hicolor/16x16/status/applications-internet.png | Bin icons/hicolor/16x16/status/gajim-earth.png | Bin src/chat_control.py | 2 -- src/groupchat_control.py | 2 -- src/gui_interface.py | 2 -- src/gui_menu_builder.py | 2 -- 8 files changed, 0 insertions(+), 8 deletions(-) diffs (56 lines): diff -r 3e88b9a62b75 -r 3a8133f1fe2e icons/hicolor/16x16/actions/document-send.png Binary file icons/hicolor/16x16/actions/document-send.png has changed diff -r 3e88b9a62b75 -r 3a8133f1fe2e icons/hicolor/16x16/actions/gajim-upload.png Binary file icons/hicolor/16x16/actions/gajim-upload.png has changed diff -r 3e88b9a62b75 -r 3a8133f1fe2e icons/hicolor/16x16/status/applications-internet.png Binary file icons/hicolor/16x16/status/applications-internet.png has changed diff -r 3e88b9a62b75 -r 3a8133f1fe2e icons/hicolor/16x16/status/gajim-earth.png Binary file icons/hicolor/16x16/status/gajim-earth.png has changed diff -r 3e88b9a62b75 -r 3a8133f1fe2e src/chat_control.py --- a/src/chat_control.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/chat_control.py Fri Mar 28 21:48:15 2014 +0100 @@ -1535,8 +1535,6 @@ self._send_file_button = self.xml.get_object('send_file_button') # add a special img for send file button pixbuf = gtkgui_helpers.get_icon_pixmap('document-send', quiet=True) - if not pixbuf: - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-upload') img = Gtk.Image.new_from_pixbuf(pixbuf) self._send_file_button.set_image(img) id_ = self._send_file_button.connect('clicked', diff -r 3e88b9a62b75 -r 3a8133f1fe2e src/groupchat_control.py --- a/src/groupchat_control.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/groupchat_control.py Fri Mar 28 21:48:15 2014 +0100 @@ -2597,8 +2597,6 @@ item = xml.get_object('send_file_menuitem') # add a special img for send file menuitem pixbuf = gtkgui_helpers.get_icon_pixmap('document-send', quiet=True) - if not pixbuf: - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-upload') img = Gtk.Image.new_from_pixbuf(pixbuf) item.set_image(img) diff -r 3e88b9a62b75 -r 3a8133f1fe2e src/gui_interface.py --- a/src/gui_interface.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/gui_interface.py Fri Mar 28 21:48:15 2014 +0100 @@ -2636,8 +2636,6 @@ elif isinstance(pep_obj, pep.UserLocationPEP): icon = gtkgui_helpers.get_icon_pixmap('applications-internet', quiet=True) - if not icon: - icon = gtkgui_helpers.get_icon_pixmap('gajim-earth') return icon def create_ipython_window(self): diff -r 3e88b9a62b75 -r 3a8133f1fe2e src/gui_menu_builder.py --- a/src/gui_menu_builder.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/gui_menu_builder.py Fri Mar 28 21:48:15 2014 +0100 @@ -260,8 +260,6 @@ # add a special img for send file menuitem pixbuf = gtkgui_helpers.get_icon_pixmap('document-send', quiet=True) - if not pixbuf: - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-upload') img = Gtk.Image.new_from_pixbuf(pixbuf) send_file_menuitem.set_image(img)

1 0

gajim: minimize groupchats before closing message window
by Gajim 30 Mar '14

30 Mar '14

changeset c4a01c109add in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c4a01c109add description: minimize groupchats before closing message window diffstat: src/message_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 3a8133f1fe2e -r c4a01c109add src/message_window.py --- a/src/message_window.py Fri Mar 28 21:48:15 2014 +0100 +++ b/src/message_window.py Sat Mar 29 17:52:22 2014 +0100 @@ -218,6 +218,9 @@ win.destroy() if not gajim.config.get('confirm_close_multiple_tabs'): + for ctrl in self.controls(): + if ctrl.minimizable(): + ctrl.minimize() # destroy window return False dialogs.YesNoDialog(

1 0

gajim: rename gajim-security_high / low to security-high / low. ...
by Gajim 30 Mar '14

30 Mar '14

changeset 77cb0856ddf0 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=77cb0856ddf0 description: rename gajim-security_high / low to security-high / low. see #7445 diffstat: icons/hicolor/16x16/status/gajim-security_high.png | Bin icons/hicolor/16x16/status/gajim-security_low.png | Bin icons/hicolor/16x16/status/security-high.png | Bin icons/hicolor/16x16/status/security-low.png | Bin icons/hicolor/32x32/actions/gajim-security_high.png | Bin icons/hicolor/32x32/actions/gajim-security_low.png | Bin icons/hicolor/32x32/status/security-high.png | Bin icons/hicolor/32x32/status/security-low.png | Bin src/chat_control.py | 4 ++-- src/dialogs.py | 12 ++++++------ 10 files changed, 8 insertions(+), 8 deletions(-) diffs (85 lines): diff -r c4a01c109add -r 77cb0856ddf0 icons/hicolor/16x16/status/gajim-security_high.png Binary file icons/hicolor/16x16/status/gajim-security_high.png has changed diff -r c4a01c109add -r 77cb0856ddf0 icons/hicolor/16x16/status/gajim-security_low.png Binary file icons/hicolor/16x16/status/gajim-security_low.png has changed diff -r c4a01c109add -r 77cb0856ddf0 icons/hicolor/16x16/status/security-high.png Binary file icons/hicolor/16x16/status/security-high.png has changed diff -r c4a01c109add -r 77cb0856ddf0 icons/hicolor/16x16/status/security-low.png Binary file icons/hicolor/16x16/status/security-low.png has changed diff -r c4a01c109add -r 77cb0856ddf0 icons/hicolor/32x32/actions/gajim-security_high.png Binary file icons/hicolor/32x32/actions/gajim-security_high.png has changed diff -r c4a01c109add -r 77cb0856ddf0 icons/hicolor/32x32/actions/gajim-security_low.png Binary file icons/hicolor/32x32/actions/gajim-security_low.png has changed diff -r c4a01c109add -r 77cb0856ddf0 icons/hicolor/32x32/status/security-high.png Binary file icons/hicolor/32x32/status/security-high.png has changed diff -r c4a01c109add -r 77cb0856ddf0 icons/hicolor/32x32/status/security-low.png Binary file icons/hicolor/32x32/status/security-low.png has changed diff -r c4a01c109add -r 77cb0856ddf0 src/chat_control.py --- a/src/chat_control.py Sat Mar 29 17:52:22 2014 +0100 +++ b/src/chat_control.py Sat Mar 29 18:18:04 2014 +0100 @@ -2348,11 +2348,11 @@ if authenticated: #About encrypted chat session authenticated_string = _('and authenticated') - img_path = gtkgui_helpers.get_icon_path('gajim-security_high') + img_path = gtkgui_helpers.get_icon_path('security-high') else: #About encrypted chat session authenticated_string = _('and NOT authenticated') - img_path = gtkgui_helpers.get_icon_path('gajim-security_low') + img_path = gtkgui_helpers.get_icon_path('security-low') self.lock_image.set_from_file(img_path) #status will become 'is' or 'is not', authentificaed will become diff -r c4a01c109add -r 77cb0856ddf0 src/dialogs.py --- a/src/dialogs.py Sat Mar 29 17:52:22 2014 +0100 +++ b/src/dialogs.py Sat Mar 29 18:18:04 2014 +0100 @@ -5172,7 +5172,7 @@ if self.session.verified_identity: labeltext += '\n\n' + _('''You have already verified this contact's identity.''') - security_image = 'gajim-security_high' + security_image = 'security-high' if self.session.control: self.session.control._show_lock_image(True, 'E2E', True, self.session.is_loggable(), True) @@ -5189,7 +5189,7 @@ self.session.control._show_lock_image(True, 'E2E', True, self.session.is_loggable(), False) labeltext += '\n\n' + _('''To be certain that only the expected person can read your messages or send you messages, you need to verify their identity by clicking the button below.''') - security_image = 'gajim-security_low' + security_image = 'security-low' verification_status = _('''Contact's identity NOT verified''') self.window.set_title(verification_status) @@ -5246,13 +5246,13 @@ verification_status = _('''Contact's identity NOT verified''') info = _('The contact\'s key (%s) does not match the key ' 'assigned in Gajim.') % keyID[:8] - image = 'gajim-security_low' + image = 'security-low' elif not keyID: # No key assigned nor a key is used by remote contact verification_status = _('No OpenPGP key assigned') info = _('No OpenPGP key is assigned to this contact. So you cannot' ' encrypt messages.') - image = 'gajim-security_low' + image = 'security-low' else: error = gajim.connections[account].gpg.encrypt('test', [keyID])[1] if error: @@ -5260,12 +5260,12 @@ info = _('OpenPGP key is assigned to this contact, but you ' 'do not trust his key, so message cannot be ' 'encrypted. Use your OpenPGP client to trust this key.') - image = 'gajim-security_low' + image = 'security-low' else: verification_status = _('''Contact's identity verified''') info = _('OpenPGP Key is assigned to this contact, and you ' 'trust his key, so messages will be encrypted.') - image = 'gajim-security_high' + image = 'security-high' status_label.set_markup('%s' % \ verification_status)

1 0

gajim: change icon of certificate Dialog. see #7445
by Gajim 30 Mar '14

30 Mar '14

changeset 8140a766fe30 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8140a766fe30 description: change icon of certificate Dialog. see #7445 diffstat: icons/hicolor/32x32/mimetypes/application-certificate.png | Bin src/dialogs.py | 6 ++++++ 2 files changed, 6 insertions(+), 0 deletions(-) diffs (18 lines): diff -r 77cb0856ddf0 -r 8140a766fe30 icons/hicolor/32x32/mimetypes/application-certificate.png Binary file icons/hicolor/32x32/mimetypes/application-certificate.png has changed diff -r 77cb0856ddf0 -r 8140a766fe30 src/dialogs.py --- a/src/dialogs.py Sat Mar 29 18:18:04 2014 +0100 +++ b/src/dialogs.py Sat Mar 29 18:27:48 2014 +0100 @@ -5468,6 +5468,12 @@ 'io': cert.get_notBefore(), 'eo': cert.get_notAfter(), 'sha1': cert.digest('sha1'), 'sha256': cert.digest('sha256')}) + pix = gtkgui_helpers.get_icon_pixmap('application-certificate', size=32, + quiet=True) + if pix: + img = Gtk.Image.new_from_pixbuf(pix) + img.show_all() + self.set_image(img) self.set_transient_for(parent) self.set_title(_('Certificate for account %s') % account)

1 0

gajim: update contact instance in chat window when we talk to an...
by Gajim 30 Mar '14

30 Mar '14

changeset 697d10622571 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=697d10622571 description: update contact instance in chat window when we talk to another resource. Fixes #7700 diffstat: src/common/connection.py | 5 +++-- src/session.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diffs (26 lines): diff -r 5517e2bb884f -r 697d10622571 src/common/connection.py --- a/src/common/connection.py Sun Mar 30 11:45:29 2014 +0200 +++ b/src/common/connection.py Fri Mar 28 21:29:42 2014 +0100 @@ -463,8 +463,9 @@ msg_iq = iqs else: msg_iq.setTo(fjid) - if resource: - contact = gajim.contacts.get_contact(self.name, jid, resource) + r_ = resource or gajim.get_resource_from_jid(fjid) + if r_: + contact = gajim.contacts.get_contact(self.name, jid, r_) else: contact = gajim.contacts.get_contact_with_highest_priority( self.name, jid) diff -r 5517e2bb884f -r 697d10622571 src/session.py --- a/src/session.py Sun Mar 30 11:45:29 2014 +0200 +++ b/src/session.py Fri Mar 28 21:29:42 2014 +0100 @@ -160,6 +160,7 @@ if ctrl: self.control = ctrl self.control.set_session(self) + self.control.contact = contact if not pm: self.roster_message2(obj)

1 0

gajim: fix preference window expand properties
by Gajim 30 Mar '14

30 Mar '14

changeset 2d63b8c238c0 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2d63b8c238c0 description: fix preference window expand properties diffstat: data/gui/preferences_window.ui | 93 +++++++++++++++++++++++++---------------- 1 files changed, 57 insertions(+), 36 deletions(-) diffs (truncated from 392 to 300 lines): diff -r 608d9baae029 -r 2d63b8c238c0 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Thu Mar 27 21:18:26 2014 +0100 +++ b/data/gui/preferences_window.ui Sun Mar 30 11:42:10 2014 +0200 @@ -158,24 +158,6 @@ </row> </data> </object> - <object class="GtkListStore" id="status_message_liststore"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> - </columns> - </object> <object class="GtkWindow" id="preferences_window"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -390,6 +372,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -401,6 +384,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -421,6 +405,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -439,6 +424,7 @@ <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -458,6 +444,7 @@ <property name="top_attach">4</property> <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -476,6 +463,7 @@ <property name="top_attach">5</property> <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -497,6 +485,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -513,6 +502,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -534,6 +524,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -550,6 +541,7 @@ <property name="right_attach">2</property> <property name="top_attach">6</property> <property name="bottom_attach">7</property> + <property name="y_options">GTK_FILL</property> </packing> </child> </object> @@ -1092,9 +1084,6 @@ <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">2</property> @@ -1619,6 +1608,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -1637,6 +1627,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -1666,7 +1657,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -1939,6 +1930,7 @@ <property name="top_attach">4</property> <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -2249,7 +2241,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> @@ -2333,6 +2325,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -2346,6 +2339,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> </object> @@ -2363,7 +2357,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -2399,6 +2393,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -2412,6 +2407,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -2451,6 +2447,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -2464,6 +2461,7 @@ <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -2507,6 +2505,7 @@ <property name="right_attach">2</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> + <property name="y_options">GTK_FILL</property> </packing> </child> </object> @@ -2524,7 +2523,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -2573,6 +2572,7 @@ <property name="left_attach">3</property> <property name="right_attach">4</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -2620,14 +2620,11 @@ </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">5</property> @@ -2682,7 +2679,7 @@ </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -2806,7 +2803,7 @@ </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -2826,7 +2823,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -2866,6 +2863,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -2883,6 +2881,7 @@ <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="y_options">GTK_FILL</property> </packing> </child>

1 0

gajim: don't try to create certificates if PyOpenSSL is not avai...
by Gajim 30 Mar '14

30 Mar '14

changeset 5517e2bb884f in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5517e2bb884f description: don't try to create certificates if PyOpenSSL is not available diffstat: src/common/check_paths.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 2d63b8c238c0 -r 5517e2bb884f src/common/check_paths.py --- a/src/common/check_paths.py Sun Mar 30 11:42:10 2014 +0200 +++ b/src/common/check_paths.py Sun Mar 30 11:45:29 2014 +0200 @@ -352,8 +352,8 @@ create_path(LOCAL_XTLS_CERTS) cert_name = os.path.join(LOCAL_XTLS_CERTS, jingle_xtls.SELF_SIGNED_CERTIFICATE) - if not (os.path.exists(cert_name + '.cert') and os.path.exists( - cert_name + '.pkey')): + if gajim.HAVE_PYOPENSSL and not (os.path.exists(cert_name + '.cert') and \ + os.path.exists(cert_name + '.pkey')): jingle_xtls.make_certs(cert_name, 'gajim')

1 0

gajim: correctly find gnupg module
by Gajim 30 Mar '14

30 Mar '14

changeset 608d9baae029 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=608d9baae029 description: correctly find gnupg module diffstat: src/common/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3cd8c331000b -r 608d9baae029 src/common/gajim.py --- a/src/common/gajim.py Thu Mar 27 13:21:28 2014 +0100 +++ b/src/common/gajim.py Thu Mar 27 21:18:26 2014 +0100 @@ -159,7 +159,7 @@ HAVE_GPG = True try: - __import__('gnupg', globals(), locals(), [], 0) + __import__('common.gnupg', globals(), locals(), [], 0) except ImportError: HAVE_GPG = False else:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2014