Commits December 2013

commits@gajim.org

2 participants
151 discussions

gajim: [fedor] improve Jingle XTLS security. Fixes #7544
by Gajim 30 Dec '13

30 Dec '13

changeset 3d8a34eb9927 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=3d8a34eb9927 description: [fedor] improve Jingle XTLS security. Fixes #7544 diffstat: src/common/jingle_xtls.py | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diffs (61 lines): diff -r 2a5f51990344 -r 3d8a34eb9927 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Sun Nov 03 17:57:12 2013 +0100 +++ b/src/common/jingle_xtls.py Tue Nov 05 11:21:56 2013 +0100 @@ -92,7 +92,10 @@ """ constructs and returns the context objects """ - ctx = SSL.Context(SSL.TLSv1_METHOD) + ctx = SSL.Context(SSL.SSLv23_METHOD) + flags = (SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3 | SSL.OP_SINGLE_DH_USE) + ctx.set_options(flags) + ctx.set_cipher_list('HIGH:!aNULL:!eNULL') if fingerprint == 'server': # for testing purposes only ctx.set_verify(SSL.VERIFY_NONE|SSL.VERIFY_FAIL_IF_NO_PEER_CERT, @@ -174,12 +177,12 @@ pkey.generate_key(type, bits) return pkey -def createCertRequest(pkey, digest="md5", **name): +def createCertRequest(pkey, digest="sha1", **name): """ Create a certificate request. Arguments: pkey - The key to associate with the request - digest - Digestion method to use for signing, default is md5 + digest - Digestion method to use for signing, default is sha1 **name - The name of the subject of the request, possible arguments are: C - Country name @@ -201,7 +204,7 @@ req.sign(pkey, digest) return req -def createCertificate(req, issuerCert, issuerKey, serial, notBefore, notAfter, digest="md5"): +def createCertificate(req, issuerCert, issuerKey, serial, notBefore, notAfter, digest="sha1"): """ Generate a certificate given a certificate request. @@ -213,7 +216,7 @@ starts being valid notAfter - Timestamp (relative to now) when the certificate stops being valid - digest - Digest method to use for signing, default is md5 + digest - Digest method to use for signing, default is sha1 Returns: The signed certificate in an X509 object """ cert = crypto.X509() @@ -233,10 +236,11 @@ and '.cert' extensions CN : common name """ - key = createKeyPair(TYPE_RSA, 1024) + key = createKeyPair(TYPE_RSA, 4096) req = createCertRequest(key, CN=CN) cert = createCertificate(req, req, key, 0, 0, 60*60*24*365*5) # five years with open(filepath + '.pkey', 'wb') as f: + os.chmod(filepath + '.pkey', 0600) f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, key)) with open(filepath + '.cert', 'wb') as f: f.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert))

1 0

gajim: [Darlan]Set layout_style of buttons Add (gtk-add) Remove ...
by Gajim 30 Dec '13

30 Dec '13

changeset b3d09c82a3e2 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=b3d09c82a3e2 description: [Darlan]Set layout_style of buttons Add (gtk-add) Remove (gtk-remove) to center. Fixes #7491 diffstat: data/gui/manage_bookmarks_window.ui | 1 + data/gui/manage_proxies_window.ui | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diffs (22 lines): diff -r 3d8a34eb9927 -r b3d09c82a3e2 data/gui/manage_bookmarks_window.ui --- a/data/gui/manage_bookmarks_window.ui Tue Nov 05 11:21:56 2013 +0100 +++ b/data/gui/manage_bookmarks_window.ui Tue Nov 05 14:46:48 2013 +0400 @@ -51,6 +51,7 @@ <object class="GtkHButtonBox" id="hbuttonbox25"> <property name="visible">True</property> <property name="spacing">6</property> + <property name="layout_style">center</property> <child> <object class="GtkButton" id="add_bookmark_button"> <property name="label">gtk-add</property> diff -r 3d8a34eb9927 -r b3d09c82a3e2 data/gui/manage_proxies_window.ui --- a/data/gui/manage_proxies_window.ui Tue Nov 05 11:21:56 2013 +0100 +++ b/data/gui/manage_proxies_window.ui Tue Nov 05 14:46:48 2013 +0400 @@ -64,6 +64,7 @@ <object class="GtkHButtonBox" id="hbuttonbox21"> <property name="visible">True</property> <property name="spacing">6</property> + <property name="layout_style">center</property> <child> <object class="GtkButton" id="add_proxy_button"> <property name="label">gtk-add</property>

1 0

gajim: [Darlan]Set layout_style of buttons Add (gtk-add) Remove ...
by Gajim 30 Dec '13

30 Dec '13

changeset c4c80ac4a1a1 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=c4c80ac4a1a1 description: [Darlan]Set layout_style of buttons Add (gtk-add) Remove (gtk-remove) to center. See #7491 diffstat: data/gui/gajim_themes_window.ui | 53 ++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 26 deletions(-) diffs (217 lines): diff -r b3d09c82a3e2 -r c4c80ac4a1a1 data/gui/gajim_themes_window.ui --- a/data/gui/gajim_themes_window.ui Tue Nov 05 14:46:48 2013 +0400 +++ b/data/gui/gajim_themes_window.ui Tue Nov 05 15:04:49 2013 +0400 @@ -65,6 +65,7 @@ <object class="GtkHButtonBox" id="hbuttonbox27"> <property name="visible">True</property> <property name="spacing">6</property> + <property name="layout_style">center</property> <child> <object class="GtkButton" id="add_button"> <property name="label">gtk-add</property> @@ -149,7 +150,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -166,7 +167,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -183,7 +184,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -198,7 +199,7 @@ <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -212,8 +213,8 @@ <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -229,8 +230,8 @@ <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -248,7 +249,7 @@ <property name="right_attach">3</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -270,8 +271,8 @@ <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -293,8 +294,8 @@ <property name="right_attach">3</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -349,7 +350,7 @@ <property name="top_attach">4</property> <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -365,7 +366,7 @@ <property name="top_attach">4</property> <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -381,7 +382,7 @@ <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -394,7 +395,7 @@ <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -407,7 +408,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -423,7 +424,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -436,7 +437,7 @@ <packing> <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -449,7 +450,7 @@ <property name="top_attach">5</property> <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -465,7 +466,7 @@ <property name="top_attach">5</property> <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -479,7 +480,7 @@ <property name="top_attach">7</property> <property name="bottom_attach">8</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -495,7 +496,7 @@ <property name="top_attach">7</property> <property name="bottom_attach">8</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -521,7 +522,7 @@ <property name="top_attach">8</property> <property name="bottom_attach">9</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -537,7 +538,7 @@ <property name="top_attach">8</property> <property name="bottom_attach">9</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child>

1 0

gajim: don't crash when we rename local account that is activate...
by Gajim 30 Dec '13

30 Dec '13

changeset 4f9bf54c9b87 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4f9bf54c9b87 description: don't crash when we rename local account that is activated but zeroconf not available. Fixes #7511 diffstat: src/config.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 5cb728527b4d -r 4f9bf54c9b87 src/config.py --- a/src/config.py Wed Oct 30 21:33:31 2013 +0100 +++ b/src/config.py Thu Oct 31 10:15:55 2013 +0100 @@ -2060,7 +2060,8 @@ def on_rename_button_clicked(self, widget): if not self.current_account: return - active = gajim.config.get_per('accounts', self.current_account, 'active') + active = gajim.config.get_per('accounts', self.current_account, + 'active') and self.current_account in gajim.connections if active and gajim.connections[self.current_account].connected != 0: dialogs.ErrorDialog( _('You are currently connected to the server'),

1 0

gajim: file_props is no more a dict. Fixes #7518
by Gajim 30 Dec '13

30 Dec '13

changeset e2d37829ac24 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e2d37829ac24 description: file_props is no more a dict. Fixes #7518 diffstat: src/chat_control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 4f9bf54c9b87 -r e2d37829ac24 src/chat_control.py --- a/src/chat_control.py Thu Oct 31 10:15:55 2013 +0100 +++ b/src/chat_control.py Thu Oct 31 10:32:39 2013 +0100 @@ -3420,9 +3420,9 @@ self._got_file_completed(event.parameters) elif event.type_ in ('file-error', 'file-stopped'): msg_err = '' - if event.parameters['error'] == -1: + if event.parameters.error == -1: msg_err = _('Remote contact stopped transfer') - elif event.parameters['error'] == -6: + elif event.parameters.error == -6: msg_err = _('Error opening file') self._got_file_error(event.parameters, event.type_, _('File transfer stopped'), msg_err)

1 0

gajim: show transport menu in chat control banner if the chat wi...
by Gajim 30 Dec '13

30 Dec '13

changeset c6d57053d0a7 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=c6d57053d0a7 description: show transport menu in chat control banner if the chat window is with a transport. Fixes #7520 diffstat: src/chat_control.py | 6 +- src/gui_menu_builder.py | 136 ++++++++++++++++++++++++++++++++++++++++++++++++ src/roster_window.py | 134 +---------------------------------------------- 3 files changed, 142 insertions(+), 134 deletions(-) diffs (truncated from 305 to 300 lines): diff -r e2d37829ac24 -r c6d57053d0a7 src/chat_control.py --- a/src/chat_control.py Thu Oct 31 10:32:39 2013 +0100 +++ b/src/chat_control.py Thu Oct 31 15:14:06 2013 +0100 @@ -2690,7 +2690,11 @@ tranasports) and file_transfer_menuitem and hide()/show() for add_to_roster_menuitem """ - menu = gui_menu_builder.get_contact_menu(self.contact, self.account, + if gajim.jid_is_transport(self.contact.jid): + menu = gui_menu_builder.get_transport_menu(self.contact, + self.account) + else: + menu = gui_menu_builder.get_contact_menu(self.contact, self.account, use_multiple_contacts=False, show_start_chat=False, show_encryption=True, control=self, show_buttonbar_items=not hide_buttonbar_items) diff -r e2d37829ac24 -r c6d57053d0a7 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Thu Oct 31 10:32:39 2013 +0100 +++ b/src/gui_menu_builder.py Thu Oct 31 15:14:06 2013 +0100 @@ -509,3 +509,139 @@ contact_context_menu.connect('selection-done', gtkgui_helpers.destroy_widget) contact_context_menu.show_all() return contact_context_menu + +def get_transport_menu(contact, account): + roster = gajim.interface.roster + jid = contact.jid + + menu = Gtk.Menu() + + # Send single message + item = Gtk.ImageMenuItem.new_with_mnemonic(_('Send Single _Message...')) + icon = Gtk.Image.new_from_stock(Gtk.STOCK_NEW, Gtk.IconSize.MENU) + item.set_image(icon) + item.connect('activate', roster.on_send_single_message_menuitem_activate, + account, contact) + menu.append(item) + if gajim.account_is_disconnected(account): + item.set_sensitive(False) + + blocked = False + if helpers.jid_is_blocked(account, jid): + blocked = True + + # Send Custom Status + send_custom_status_menuitem = Gtk.ImageMenuItem.new_with_mnemonic( + _('Send Cus_tom Status')) + # add a special img for this menuitem + if blocked: + send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon( + 'offline')) + send_custom_status_menuitem.set_sensitive(False) + else: + if account in gajim.interface.status_sent_to_users and \ + jid in gajim.interface.status_sent_to_users[account]: + send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon( + gajim.interface.status_sent_to_users[account][jid])) + else: + icon = Gtk.Imag.new_from_stock(Gtk.STOCK_NETWORK, + Gtk.IconSize.MENU) + send_custom_status_menuitem.set_image(icon) + status_menuitems = Gtk.Menu() + send_custom_status_menuitem.set_submenu(status_menuitems) + iconset = gajim.config.get('iconset') + path = os.path.join(helpers.get_iconset_path(iconset), '16x16') + for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): + # icon MUST be different instance for every item + state_images = gtkgui_helpers.load_iconset(path) + status_menuitem = Gtk.ImageMenuItem(helpers.get_uf_show(s)) + status_menuitem.connect('activate', roster.on_send_custom_status, + [(contact, account)], s) + icon = state_images[s] + status_menuitem.set_image(icon) + status_menuitems.append(status_menuitem) + menu.append(send_custom_status_menuitem) + if gajim.account_is_disconnected(account): + send_custom_status_menuitem.set_sensitive(False) + + item = Gtk.SeparatorMenuItem.new() # separator + menu.append(item) + + # Execute Command + item = Gtk.ImageMenuItem.new_with_mnemonic(_('E_xecute Command...')) + icon = Gtk.Image.new_from_stock(Gtk.STOCK_EXECUTE, Gtk.IconSize.MENU) + item.set_image(icon) + menu.append(item) + item.connect('activate', roster.on_execute_command, contact, account, + contact.resource) + if gajim.account_is_disconnected(account): + item.set_sensitive(False) + + # Manage Transport submenu + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Manage Transport')) + icon = Gtk.Image.new_from_stock(Gtk.STOCK_PROPERTIES, Gtk.IconSize.MENU) + item.set_image(icon) + manage_transport_submenu = Gtk.Menu() + item.set_submenu(manage_transport_submenu) + menu.append(item) + + # Modify Transport + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Modify Transport')) + icon = Gtk.Image.new_from_stock(Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU) + item.set_image(icon) + manage_transport_submenu.append(item) + item.connect('activate', roster.on_edit_agent, contact, account) + if gajim.account_is_disconnected(account): + item.set_sensitive(False) + + # Rename + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Rename...')) + # add a special img for rename menuitem + gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input') + manage_transport_submenu.append(item) + item.connect('activate', roster.on_rename, 'agent', jid, account) + if gajim.account_is_disconnected(account): + item.set_sensitive(False) + + item = Gtk.SeparatorMenuItem.new() # separator + manage_transport_submenu.append(item) + + # Block + if blocked: + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Unblock')) + item.connect('activate', roster.on_unblock, [(contact, account)]) + else: + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Block')) + item.connect('activate', roster.on_block, [(contact, account)]) + + icon = Gtk.Image.new_from_stock(Gtk.STOCK_STOP, Gtk.IconSize.MENU) + item.set_image(icon) + manage_transport_submenu.append(item) + if gajim.account_is_disconnected(account): + item.set_sensitive(False) + + # Remove + item = Gtk.ImageMenuItem.new_with_mnemonic(_('Remo_ve')) + icon = Gtk.Image.new_from_stock(Gtk.STOCK_REMOVE, Gtk.IconSize.MENU) + item.set_image(icon) + manage_transport_submenu.append(item) + item.connect('activate', roster.on_remove_agent, [(contact, account)]) + if gajim.account_is_disconnected(account): + item.set_sensitive(False) + + item = Gtk.SeparatorMenuItem.new() # separator + menu.append(item) + + # Information + information_menuitem = Gtk.ImageMenuItem.new_with_mnemonic( + _('_Information')) + icon = Gtk.Image.new_from_stock(Gtk.STOCK_INFO, Gtk.IconSize.MENU) + information_menuitem.set_image(icon) + menu.append(information_menuitem) + information_menuitem.connect('activate', roster.on_info, contact, account) + if gajim.account_is_disconnected(account): + information_menuitem.set_sensitive(False) + + menu.connect('selection-done', gtkgui_helpers.destroy_widget) + menu.show_all() + return menu diff -r e2d37829ac24 -r c6d57053d0a7 src/roster_window.py --- a/src/roster_window.py Thu Oct 31 10:32:39 2013 +0100 +++ b/src/roster_window.py Thu Oct 31 15:14:06 2013 +0100 @@ -6021,141 +6021,9 @@ path = model.get_path(titer) account = model[titer][C_ACCOUNT] contact = gajim.contacts.get_contact_with_highest_priority(account, jid) - menu = Gtk.Menu() - - # Send single message - item = Gtk.ImageMenuItem.new_with_mnemonic(_('Send Single Message...')) - icon = Gtk.Image.new_from_stock(Gtk.STOCK_NEW, Gtk.IconSize.MENU) - item.set_image(icon) - item.connect('activate', - self.on_send_single_message_menuitem_activate, account, contact) - menu.append(item) - if gajim.account_is_disconnected(account): - item.set_sensitive(False) - - blocked = False - if helpers.jid_is_blocked(account, jid): - blocked = True - - # Send Custom Status - send_custom_status_menuitem = Gtk.ImageMenuItem.new_with_mnemonic( - _('Send Cus_tom Status')) - # add a special img for this menuitem - if blocked: - send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon( - 'offline')) - send_custom_status_menuitem.set_sensitive(False) - else: - if account in gajim.interface.status_sent_to_users and \ - jid in gajim.interface.status_sent_to_users[account]: - send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon( - gajim.interface.status_sent_to_users[account][jid])) - else: - icon = Gtk.Image.new_from_stock(Gtk.STOCK_NETWORK, - Gtk.IconSize.MENU) - send_custom_status_menuitem.set_image(icon) - status_menuitems = Gtk.Menu() - send_custom_status_menuitem.set_submenu(status_menuitems) - iconset = gajim.config.get('iconset') - path = os.path.join(helpers.get_iconset_path(iconset), '16x16') - for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): - # icon MUST be different instance for every item - state_images = gtkgui_helpers.load_iconset(path) - status_menuitem = Gtk.ImageMenuItem(helpers.get_uf_show(s)) - status_menuitem.connect('activate', self.on_send_custom_status, - [(contact, account)], s) - icon = state_images[s] - status_menuitem.set_image(icon) - status_menuitems.append(status_menuitem) - menu.append(send_custom_status_menuitem) - if gajim.account_is_disconnected(account): - send_custom_status_menuitem.set_sensitive(False) - - item = Gtk.SeparatorMenuItem.new() # separator - menu.append(item) - - # Execute Command - item = Gtk.ImageMenuItem.new_with_mnemonic(_('E_xecute Command...')) - icon = Gtk.Image.new_from_stock(Gtk.STOCK_EXECUTE, Gtk.IconSize.MENU) - item.set_image(icon) - menu.append(item) - item.connect('activate', self.on_execute_command, contact, account, - contact.resource) - if gajim.account_is_disconnected(account): - item.set_sensitive(False) - - # Manage Transport submenu - item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Manage Transport')) - icon = Gtk.Image.new_from_stock(Gtk.STOCK_PROPERTIES, - Gtk.IconSize.MENU) - item.set_image(icon) - manage_transport_submenu = Gtk.Menu() - item.set_submenu(manage_transport_submenu) - menu.append(item) - - # Modify Transport - item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Modify Transport')) - icon = Gtk.Image.new_from_stock(Gtk.STOCK_PREFERENCES, - Gtk.IconSize.MENU) - item.set_image(icon) - manage_transport_submenu.append(item) - item.connect('activate', self.on_edit_agent, contact, account) - if gajim.account_is_disconnected(account): - item.set_sensitive(False) - - # Rename - item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Rename...')) - # add a special img for rename menuitem - gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input') - manage_transport_submenu.append(item) - item.connect('activate', self.on_rename, 'agent', jid, account) - if gajim.account_is_disconnected(account): - item.set_sensitive(False) - - item = Gtk.SeparatorMenuItem.new() # separator - manage_transport_submenu.append(item) - - # Block - if blocked: - item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Unblock')) - item.connect('activate', self.on_unblock, [(contact, account)]) - else: - item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Block')) - item.connect('activate', self.on_block, [(contact, account)]) - - icon = Gtk.Image.new_from_stock(Gtk.STOCK_STOP, Gtk.IconSize.MENU) - item.set_image(icon) - manage_transport_submenu.append(item) - if gajim.account_is_disconnected(account): - item.set_sensitive(False) - - # Remove - item = Gtk.ImageMenuItem.new_with_mnemonic(_('Remo_ve')) - icon = Gtk.Image.new_from_stock(Gtk.STOCK_REMOVE, Gtk.IconSize.MENU) - item.set_image(icon) - manage_transport_submenu.append(item) - item.connect('activate', self.on_remove_agent, [(contact, account)]) - if gajim.account_is_disconnected(account): - item.set_sensitive(False) - - item = Gtk.SeparatorMenuItem.new() # separator - menu.append(item) - - # Information - information_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_( - '_Information')) - icon = Gtk.Image.new_from_stock(Gtk.STOCK_INFO, Gtk.IconSize.MENU) - information_menuitem.set_image(icon) - menu.append(information_menuitem) - information_menuitem.connect('activate', self.on_info, contact, account) - if gajim.account_is_disconnected(account): - information_menuitem.set_sensitive(False) - + menu = gui_menu_builder.get_transport_menu(contact, account) event_button = gtkgui_helpers.get_possible_button_event(event) - menu.attach_to_widget(self.tree, None)

1 0

gajim: fix inviting several contacts to a room. And don't allow ...
by Gajim 30 Dec '13

30 Dec '13

changeset a2516237161c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=a2516237161c description: fix inviting several contacts to a room. And don't allow to invite transports. Fixes 7527 diffstat: src/gui_menu_builder.py | 12 +++++++++++- src/roster_window.py | 17 ++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diffs (50 lines): diff -r c6d57053d0a7 -r a2516237161c src/gui_menu_builder.py --- a/src/gui_menu_builder.py Thu Oct 31 15:14:06 2013 +0100 +++ b/src/gui_menu_builder.py Fri Nov 01 12:08:05 2013 +0100 @@ -109,8 +109,18 @@ resource = None invite_to_new_room_menuitem.connect('activate', roster.on_invite_to_new_room, list_, resource) + elif len(list_) > 1: + list2 = [] + for (c, a) in list_: + if c.supports(NS_MUC): + list2.append((c, a)) + if len(list2) > 0: + invite_to_new_room_menuitem.connect('activate', + roster.on_invite_to_new_room, list2, None) + else: + invite_menuitem.set_sensitive(False) else: - invite_menuitem.set_sensitive(True) + invite_menuitem.set_sensitive(False) # transform None in 'jabber' c_t = contacts_transport or 'jabber' muc_jid = {} diff -r c6d57053d0a7 -r a2516237161c src/roster_window.py --- a/src/roster_window.py Thu Oct 31 15:14:06 2013 +0100 +++ b/src/roster_window.py Fri Nov 01 12:08:05 2013 +0100 @@ -5782,13 +5782,16 @@ self.on_send_single_message_menuitem_activate, account, list_) # Invite to - invite_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_('In_vite to')) - muc_icon = gtkgui_helpers.load_icon('muc_active') - if muc_icon: - invite_menuitem.set_image(muc_icon) - - gui_menu_builder.build_invite_submenu(invite_menuitem, list_online) - menu.append(invite_menuitem) + if group != _('Transports'): + invite_menuitem = Gtk.ImageMenuItem.new_with_mnemonic( + _('In_vite to')) + muc_icon = gtkgui_helpers.load_icon('muc_active') + if muc_icon: + invite_menuitem.set_image(muc_icon) + + gui_menu_builder.build_invite_submenu(invite_menuitem, + list_online) + menu.append(invite_menuitem) # Send Custom Status send_custom_status_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(

1 0

gajim: correctly show nickname when we restore previous conversa...
by Gajim 30 Dec '13

30 Dec '13

changeset f852ecb5a37a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=f852ecb5a37a description: correctly show nickname when we restore previous conversation lines with chat_merge_consecutive_nickname enabled. Fixes #7534 diffstat: src/chat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r a2516237161c -r f852ecb5a37a src/chat_control.py --- a/src/chat_control.py Fri Nov 01 12:08:05 2013 +0100 +++ b/src/chat_control.py Fri Nov 01 19:10:49 2013 +0100 @@ -3023,6 +3023,7 @@ 'remove it (all history will be lost).') % common.logger.LOG_DB_PATH) rows = [] local_old_kind = None + self.conv_textview.just_cleared = True for row in rows: # row[0] time, row[1] has kind, row[2] the message if not row[2]: # message is empty, we don't print it continue

1 0

gajim: fix getting correct old message type when restoring last ...
by Gajim 30 Dec '13

30 Dec '13

changeset 328d9fefd742 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=328d9fefd742 description: fix getting correct old message type when restoring last conversation. Fixes #7534 diffstat: src/chat_control.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (22 lines): diff -r f852ecb5a37a -r 328d9fefd742 src/chat_control.py --- a/src/chat_control.py Fri Nov 01 19:10:49 2013 +0100 +++ b/src/chat_control.py Fri Nov 01 20:00:28 2013 +0100 @@ -3048,14 +3048,14 @@ xhtml = None if row[2].startswith('<body '): xhtml = row[2] + ChatControlBase.print_conversation_line(self, row[2], kind, name, + tim, small_attr, small_attr + ['restored_message'], + small_attr + ['restored_message'], False, + old_kind=local_old_kind, xhtml=xhtml) if row[2].startswith('/me ') or row[2].startswith('/me\n'): local_old_kind = None else: local_old_kind = kind - ChatControlBase.print_conversation_line(self, row[2], kind, name, - tim, small_attr, small_attr + ['restored_message'], - small_attr + ['restored_message'], False, - old_kind=local_old_kind, xhtml=xhtml) if len(rows): self.conv_textview.print_empty_line()

1 0

gajim: fix position of tooltip when tooltip is too high for the ...
by Gajim 30 Dec '13

30 Dec '13

changeset 26839042128c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=26839042128c description: fix position of tooltip when tooltip is too high for the screen. Fixes #7490 diffstat: src/tooltips.py | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diffs (38 lines): diff -r 1380b5a58dbb -r 26839042128c src/tooltips.py --- a/src/tooltips.py Wed Oct 30 13:13:00 2013 +0100 +++ b/src/tooltips.py Wed Oct 30 13:44:19 2013 +0100 @@ -115,6 +115,22 @@ def on_size_allocate(self, widget, rect): half_width = rect.width / 2 + 1 + if self.preferred_position[1] + rect.height > self.screen.get_height(): + # flip tooltip up + self.preferred_position[1] -= rect.height + self.widget_height + 8 + if self.preferred_position[1] < 0: + self.preferred_position[1] = self.screen.get_height() - \ + rect.height - 2 + + if self.preferred_position[0] + rect.width + 7 < \ + self.screen.get_width(): + self.preferred_position[0] = self.preferred_position[0] + 7 + else: + self.preferred_position[0] = self.preferred_position[0] - \ + rect.width - 7 + self.win.move(self.preferred_position[0], + self.preferred_position[1]) + return if self.preferred_position[0] < half_width: self.preferred_position[0] = 0 elif self.preferred_position[0] + rect.width > \ @@ -122,11 +138,6 @@ self.preferred_position[0] = self.screen.get_width() - rect.width elif not self.check_last_time: self.preferred_position[0] -= half_width - if self.preferred_position[1] + rect.height > self.screen.get_height(): - # flip tooltip up - self.preferred_position[1] -= rect.height + self.widget_height + 8 - if self.preferred_position[1] < 0: - self.preferred_position[1] = 0 self.win.move(self.preferred_position[0], self.preferred_position[1]) def show_tooltip(self, data, widget_height, widget_y_position):

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
16
Older →

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 December 2013