Commits August 2013

commits@gajim.org

3 participants
325 discussions

gajim: Replacing some of the icons. Fixes #7445
by Gajim 29 Aug '13

29 Aug '13

changeset 3142a67a5f5a in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=3142a67a5f5a description: Replacing some of the icons. Fixes #7445 diffstat: src/chat_control.py | 7 ++++--- src/conversation_textview.py | 19 ++++++++++++++----- src/groupchat_control.py | 7 ++++--- src/gtkgui_helpers.py | 12 ++++++++---- src/gui_menu_builder.py | 7 ++++--- 5 files changed, 34 insertions(+), 18 deletions(-) diffs (113 lines): diff -r 1907db5f8cde -r 3142a67a5f5a src/chat_control.py --- a/src/chat_control.py Wed Aug 28 20:27:10 2013 +0200 +++ b/src/chat_control.py Wed Aug 28 18:33:27 2013 +0400 @@ -1533,9 +1533,10 @@ self._send_file_button = self.xml.get_object('send_file_button') # add a special img for send file button - path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') - img = Gtk.Image() - img.set_from_file(path_to_upload_img) + 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', self._on_send_file_menuitem_activate) diff -r 1907db5f8cde -r 3142a67a5f5a src/conversation_textview.py --- a/src/conversation_textview.py Wed Aug 28 20:27:10 2013 +0200 +++ b/src/conversation_textview.py Wed Aug 28 18:33:27 2013 +0400 @@ -175,12 +175,21 @@ FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap( 'gajim-muc_separator') - XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-receipt_missing') - XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-receipt_received') + XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no', + quiet=True) + if not XEP0184_WARNING_PIXBUF: + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'gajim-receipt_missing') + XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes', + quiet=True) + if not XEP0184_RECEIVED_PIXBUF: + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'gajim-receipt_received') MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-message_corrected') + 'gtk-spell-check', quiet=True) + if not MESSAGE_CORRECTED_PIXBUF: + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'gajim-message_corrected') # smooth scroll constants MAX_SCROLL_TIME = 0.4 # seconds diff -r 1907db5f8cde -r 3142a67a5f5a src/groupchat_control.py --- a/src/groupchat_control.py Wed Aug 28 20:27:10 2013 +0200 +++ b/src/groupchat_control.py Wed Aug 28 18:33:27 2013 +0400 @@ -2553,9 +2553,10 @@ item = xml.get_object('send_file_menuitem') # add a special img for send file menuitem - path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') - img = Gtk.Image() - img.set_from_file(path_to_upload_img) + 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) if not c.resource: diff -r 1907db5f8cde -r 3142a67a5f5a src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Wed Aug 28 20:27:10 2013 +0200 +++ b/src/gtkgui_helpers.py Wed Aug 28 18:33:27 2013 +0400 @@ -46,11 +46,12 @@ gtk_icon_theme = Gtk.IconTheme.get_default() gtk_icon_theme.append_search_path(gajim.ICONS_DIR) -def get_icon_pixmap(icon_name, size=16): +def get_icon_pixmap(icon_name, size=16, quiet=False): try: return gtk_icon_theme.load_icon(icon_name, size, 0) except GObject.GError as e: - log.error('Unable to load icon %s: %s' % (icon_name, str(e))) + if not quiet: + log.error('Unable to load icon %s: %s' % (icon_name, str(e))) def get_icon_path(icon_name, size=16): try: @@ -988,8 +989,11 @@ else: return load_activity_icon('unknown').get_pixbuf() elif isinstance(pep_class, pep.UserLocationPEP): - path = get_icon_path('gajim-earth') - return GdkPixbuf.Pixbuf.new_from_file(path) + icon = gtkgui_helpers.get_icon_pixmap('applications-internet', + quiet=True) + if not icon: + icon = gtkgui_helpers.get_icon_pixmap('gajim-earth') + return icon return None def load_icons_meta(): diff -r 1907db5f8cde -r 3142a67a5f5a src/gui_menu_builder.py --- a/src/gui_menu_builder.py Wed Aug 28 20:27:10 2013 +0200 +++ b/src/gui_menu_builder.py Wed Aug 28 18:33:27 2013 +0400 @@ -206,9 +206,10 @@ items_to_hide = [] # add a special img for send file menuitem - path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') - img = Gtk.Image() - img.set_from_file(path_to_upload_img) + 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) if not our_jid:

1 0

gajim: force max width to 250px only when initializing the treev...
by Gajim 29 Aug '13

29 Aug '13

changeset 9f09e59ba1f4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=9f09e59ba1f4 description: force max width to 250px only when initializing the treeview. Fixes #7446 diffstat: src/advanced_configuration_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 3142a67a5f5a -r 9f09e59ba1f4 src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Wed Aug 28 18:33:27 2013 +0400 +++ b/src/advanced_configuration_window.py Thu Aug 29 13:14:22 2013 +0200 @@ -117,7 +117,9 @@ col.set_cell_data_func(renderer_text, self.cb_value_column_data) col.props.resizable = True + # set max width only for initializing the treeview. col.set_max_width(250) + gobject.idle_add(col.set_max_width, -1) renderer_text = Gtk.CellRendererText() col = Gtk.TreeViewColumn(_('Type'), renderer_text, text = 2)

1 0

gajim: Replacing some of the icons. Fixes #7445
by Gajim 29 Aug '13

29 Aug '13

changeset d2d03f318540 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=d2d03f318540 description: Replacing some of the icons. Fixes #7445 diffstat: src/chat_control.py | 7 ++++--- src/conversation_textview.py | 19 ++++++++++++++----- src/groupchat_control.py | 7 ++++--- src/gtkgui_helpers.py | 5 +++-- src/gui_interface.py | 7 +++++-- src/gui_menu_builder.py | 7 ++++--- 6 files changed, 34 insertions(+), 18 deletions(-) diffs (116 lines): diff -r 8ceff19492aa -r d2d03f318540 src/chat_control.py --- a/src/chat_control.py Wed Aug 28 10:06:57 2013 +0400 +++ b/src/chat_control.py Wed Aug 28 18:33:27 2013 +0400 @@ -1496,9 +1496,10 @@ self._send_file_button = self.xml.get_object('send_file_button') # add a special img for send file button - path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') - img = gtk.Image() - img.set_from_file(path_to_upload_img) + 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', self._on_send_file_menuitem_activate) diff -r 8ceff19492aa -r d2d03f318540 src/conversation_textview.py --- a/src/conversation_textview.py Wed Aug 28 10:06:57 2013 +0400 +++ b/src/conversation_textview.py Wed Aug 28 18:33:27 2013 +0400 @@ -171,12 +171,21 @@ FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap( 'gajim-muc_separator') - XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-receipt_missing') - XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-receipt_received') + XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no', + quiet=True) + if not XEP0184_WARNING_PIXBUF: + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'gajim-receipt_missing') + XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes', + quiet=True) + if not XEP0184_RECEIVED_PIXBUF: + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'gajim-receipt_received') MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-message_corrected') + 'gtk-spell-check', quiet=True) + if not MESSAGE_CORRECTED_PIXBUF: + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'gajim-message_corrected') # smooth scroll constants MAX_SCROLL_TIME = 0.4 # seconds diff -r 8ceff19492aa -r d2d03f318540 src/groupchat_control.py --- a/src/groupchat_control.py Wed Aug 28 10:06:57 2013 +0400 +++ b/src/groupchat_control.py Wed Aug 28 18:33:27 2013 +0400 @@ -2540,9 +2540,10 @@ item = xml.get_object('send_file_menuitem') # add a special img for send file menuitem - path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') - img = gtk.Image() - img.set_from_file(path_to_upload_img) + 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) if not c.resource: diff -r 8ceff19492aa -r d2d03f318540 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Wed Aug 28 10:06:57 2013 +0400 +++ b/src/gtkgui_helpers.py Wed Aug 28 18:33:27 2013 +0400 @@ -44,11 +44,12 @@ gtk_icon_theme = gtk.icon_theme_get_default() gtk_icon_theme.append_search_path(gajim.ICONS_DIR) -def get_icon_pixmap(icon_name, size=16): +def get_icon_pixmap(icon_name, size=16, quiet=False): try: return gtk_icon_theme.load_icon(icon_name, size, 0) except gobject.GError, e: - log.error('Unable to load icon %s: %s' % (icon_name, str(e))) + if not quiet: + log.error('Unable to load icon %s: %s' % (icon_name, str(e))) def get_icon_path(icon_name, size=16): try: diff -r 8ceff19492aa -r d2d03f318540 src/gui_interface.py --- a/src/gui_interface.py Wed Aug 28 10:06:57 2013 +0400 +++ b/src/gui_interface.py Wed Aug 28 18:33:27 2013 +0400 @@ -2629,8 +2629,11 @@ else: return gtkgui_helpers.load_activity_icon('unknown').get_pixbuf() elif isinstance(pep_obj, pep.UserLocationPEP): - path = gtkgui_helpers.get_icon_path('gajim-earth') - return gtk.gdk.pixbuf_new_from_file(path) + 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): try: diff -r 8ceff19492aa -r d2d03f318540 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Wed Aug 28 10:06:57 2013 +0400 +++ b/src/gui_menu_builder.py Wed Aug 28 18:33:27 2013 +0400 @@ -205,9 +205,10 @@ items_to_hide = [] # add a special img for send file menuitem - path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') - img = gtk.Image() - img.set_from_file(path_to_upload_img) + 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) if not our_jid:

1 0

gajim: force max width to 250px only when initializing the treev...
by Gajim 29 Aug '13

29 Aug '13

changeset 5b8870f9fe3a 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=5b8870f9fe3a description: force max width to 250px only when initializing the treeview. Fixes #7446 diffstat: src/advanced_configuration_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (13 lines): diff -r d2d03f318540 -r 5b8870f9fe3a src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Wed Aug 28 18:33:27 2013 +0400 +++ b/src/advanced_configuration_window.py Thu Aug 29 13:14:22 2013 +0200 @@ -116,7 +116,9 @@ col.set_cell_data_func(renderer_text, self.cb_value_column_data) col.props.resizable = True + # set max width only for initializing the treeview. col.set_max_width(250) + gobject.idle_add(col.set_max_width, -1) renderer_text = gtk.CellRendererText() treeview.insert_column_with_attributes(-1, _('Type'),

1 0

gajim: force max width to 250px only when initializing the treev...
by Gajim 29 Aug '13

29 Aug '13

changeset 89421afcdc4a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=89421afcdc4a description: force max width to 250px only when initializing the treeview. Fixes #7446 diffstat: src/advanced_configuration_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (13 lines): diff -r ca637ebb4176 -r 89421afcdc4a src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Wed Aug 28 18:33:27 2013 +0400 +++ b/src/advanced_configuration_window.py Thu Aug 29 13:14:22 2013 +0200 @@ -116,7 +116,9 @@ col.set_cell_data_func(renderer_text, self.cb_value_column_data) col.props.resizable = True + # set max width only for initializing the treeview. col.set_max_width(250) + gobject.idle_add(col.set_max_width, -1) renderer_text = gtk.CellRendererText() treeview.insert_column_with_attributes(-1, _('Type'),

1 0

gajim: typo
by Gajim 28 Aug '13

28 Aug '13

changeset 1907db5f8cde in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=1907db5f8cde description: typo diffstat: src/groupchat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1ef19b206056 -r 1907db5f8cde src/groupchat_control.py --- a/src/groupchat_control.py Wed Aug 28 10:06:57 2013 +0400 +++ b/src/groupchat_control.py Wed Aug 28 20:27:10 2013 +0200 @@ -837,7 +837,7 @@ 'bookmark-new') if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): gtkgui_helpers.add_image_to_menuitem(history_menuitem, - 'document-open-recent' + 'document-open-recent') if hide_buttonbar_items: change_nick_menuitem.hide()

1 0

gajim: Replacing some of the icons. Fixes #7445
by Gajim 28 Aug '13

28 Aug '13

changeset ca637ebb4176 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ca637ebb4176 description: Replacing some of the icons. Fixes #7445 diffstat: src/chat_control.py | 7 ++++--- src/conversation_textview.py | 19 ++++++++++++++----- src/groupchat_control.py | 7 ++++--- src/gtkgui_helpers.py | 5 +++-- src/gui_interface.py | 7 +++++-- src/gui_menu_builder.py | 7 ++++--- 6 файлов изменено, 34 вставок(+), 18 удалений(-) различия (116 строк): diff -r cbe40841ba1e -r ca637ebb4176 src/chat_control.py --- a/src/chat_control.py Wed Aug 28 11:55:21 2013 +0400 +++ b/src/chat_control.py Wed Aug 28 18:33:27 2013 +0400 @@ -1496,9 +1496,10 @@ self._send_file_button = self.xml.get_object('send_file_button') # add a special img for send file button - path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') - img = gtk.Image() - img.set_from_file(path_to_upload_img) + 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', self._on_send_file_menuitem_activate) diff -r cbe40841ba1e -r ca637ebb4176 src/conversation_textview.py --- a/src/conversation_textview.py Wed Aug 28 11:55:21 2013 +0400 +++ b/src/conversation_textview.py Wed Aug 28 18:33:27 2013 +0400 @@ -171,12 +171,21 @@ FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap( 'gajim-muc_separator') - XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-receipt_missing') - XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-receipt_received') + XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no', + quiet=True) + if not XEP0184_WARNING_PIXBUF: + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'gajim-receipt_missing') + XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes', + quiet=True) + if not XEP0184_RECEIVED_PIXBUF: + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'gajim-receipt_received') MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-message_corrected') + 'gtk-spell-check', quiet=True) + if not MESSAGE_CORRECTED_PIXBUF: + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'gajim-message_corrected') # smooth scroll constants MAX_SCROLL_TIME = 0.4 # seconds diff -r cbe40841ba1e -r ca637ebb4176 src/groupchat_control.py --- a/src/groupchat_control.py Wed Aug 28 11:55:21 2013 +0400 +++ b/src/groupchat_control.py Wed Aug 28 18:33:27 2013 +0400 @@ -2540,9 +2540,10 @@ item = xml.get_object('send_file_menuitem') # add a special img for send file menuitem - path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') - img = gtk.Image() - img.set_from_file(path_to_upload_img) + 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) if not c.resource: diff -r cbe40841ba1e -r ca637ebb4176 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Wed Aug 28 11:55:21 2013 +0400 +++ b/src/gtkgui_helpers.py Wed Aug 28 18:33:27 2013 +0400 @@ -44,11 +44,12 @@ gtk_icon_theme = gtk.icon_theme_get_default() gtk_icon_theme.append_search_path(gajim.ICONS_DIR) -def get_icon_pixmap(icon_name, size=16): +def get_icon_pixmap(icon_name, size=16, quiet=False): try: return gtk_icon_theme.load_icon(icon_name, size, 0) except gobject.GError, e: - log.error('Unable to load icon %s: %s' % (icon_name, str(e))) + if not quiet: + log.error('Unable to load icon %s: %s' % (icon_name, str(e))) def get_icon_path(icon_name, size=16): try: diff -r cbe40841ba1e -r ca637ebb4176 src/gui_interface.py --- a/src/gui_interface.py Wed Aug 28 11:55:21 2013 +0400 +++ b/src/gui_interface.py Wed Aug 28 18:33:27 2013 +0400 @@ -2629,8 +2629,11 @@ else: return gtkgui_helpers.load_activity_icon('unknown').get_pixbuf() elif isinstance(pep_obj, pep.UserLocationPEP): - path = gtkgui_helpers.get_icon_path('gajim-earth') - return gtk.gdk.pixbuf_new_from_file(path) + 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): try: diff -r cbe40841ba1e -r ca637ebb4176 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Wed Aug 28 11:55:21 2013 +0400 +++ b/src/gui_menu_builder.py Wed Aug 28 18:33:27 2013 +0400 @@ -205,9 +205,10 @@ items_to_hide = [] # add a special img for send file menuitem - path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') - img = gtk.Image() - img.set_from_file(path_to_upload_img) + 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) if not our_jid:

1 0

gajim: [Darlan] Set title for ssl error dialogs
by Gajim 28 Aug '13

28 Aug '13

changeset 8606179cce80 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=8606179cce80 description: [Darlan] Set title for ssl error dialogs diffstat: src/dialogs.py | 1 + src/gui_interface.py | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diffs (23 lines): diff -r 632bc717763c -r 8606179cce80 src/dialogs.py --- a/src/dialogs.py Tue Aug 27 17:24:41 2013 +0200 +++ b/src/dialogs.py Tue Aug 27 23:21:16 2013 +0400 @@ -5463,6 +5463,7 @@ def on_cert_clicked(self, button): d = CertificatDialog(self, self.account, self.cert) + d.set_title(_('Certificate')) class SSLErrorDialog(ConfirmationDialogDoubleCheck): def __init__(self, account, certificate, pritext, sectext, checktext1, diff -r 632bc717763c -r 8606179cce80 src/gui_interface.py --- a/src/gui_interface.py Tue Aug 27 17:24:41 2013 +0200 +++ b/src/gui_interface.py Tue Aug 27 23:21:16 2013 +0400 @@ -1351,6 +1351,8 @@ dialogs.SSLErrorDialog(obj.conn.name, obj.certificate, pritext, sectext, checktext1, checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel) + self.instances[account]['online_dialog']['ssl_error'].set_title( + _('SSL Certificate Verification')) def handle_event_fingerprint_error(self, obj): # ('FINGERPRINT_ERROR', account, (new_fingerprint,))

1 0

gajim: Add account name to SSL Certificate Verification dialog t...
by Gajim 28 Aug '13

28 Aug '13

changeset e6116da6c4a7 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e6116da6c4a7 description: Add account name to SSL Certificate Verification dialog title diffstat: src/gui_interface.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8606179cce80 -r e6116da6c4a7 src/gui_interface.py --- a/src/gui_interface.py Tue Aug 27 23:21:16 2013 +0400 +++ b/src/gui_interface.py Tue Aug 27 23:35:11 2013 +0400 @@ -1352,7 +1352,7 @@ sectext, checktext1, checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel) self.instances[account]['online_dialog']['ssl_error'].set_title( - _('SSL Certificate Verification')) + _('SSL Certificate Verification for %s') % account) def handle_event_fingerprint_error(self, obj): # ('FINGERPRINT_ERROR', account, (new_fingerprint,))

1 0

gajim: Fix merged accounts.See [574655470339]
by Gajim 28 Aug '13

28 Aug '13

changeset 1ef19b206056 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=1ef19b206056 description: Fix merged accounts.See [574655470339] diffstat: src/roster_window.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diffs (17 lines): diff -r e6116da6c4a7 -r 1ef19b206056 src/roster_window.py --- a/src/roster_window.py Tue Aug 27 23:35:11 2013 +0400 +++ b/src/roster_window.py Wed Aug 28 10:06:57 2013 +0400 @@ -1470,12 +1470,10 @@ for acct in gajim.contacts.get_accounts(): self._iters[acct] = {'account': None, 'groups': {}, 'contacts': {}} - self._before_fill() for acct in gajim.contacts.get_accounts(): self.add_account(acct) - self.add_account_contacts(acct, improve_speed=False, + self.add_account_contacts(acct, improve_speed=True, draw_contacts=False) - self._after_fill() # Recalculate column width for ellipsizing self.tree.columns_autosize()

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