Commits

commits@gajim.org

17632 discussions

gajim-website: prepare website for 0.15.3
by Yann Leboulanger 17 Mar '13

17 Mar '13

changeset f92829292d6f in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=f92829292d6f description: prepare website for 0.15.3 diffstat: downloads.php | 2 +- index.php | 38 +++++++++++++------ locale/bg_BG/LC_MESSAGES/msg.po | 58 +++++++++++++++++++----------- locale/de_DE/LC_MESSAGES/msg.po | 63 ++++++++++++++++++++------------- locale/eo/LC_MESSAGES/msg.po | 58 +++++++++++++++++++----------- locale/es_ES/LC_MESSAGES/msg.po | 74 +++++++++++++++++++++++--------------- locale/fr_FR/LC_MESSAGES/msg.po | 77 +++++++++++++++++++++++----------------- locale/he_IL/LC_MESSAGES/msg.po | 61 ++++++++++++++++++++----------- locale/hu_HU/LC_MESSAGES/msg.po | 58 +++++++++++++++++++----------- locale/it_IT/LC_MESSAGES/msg.po | 58 +++++++++++++++++++----------- locale/pl_PL/LC_MESSAGES/msg.po | 63 ++++++++++++++++++++------------- locale/pt_BR/LC_MESSAGES/msg.po | 63 ++++++++++++++++++++------------- locale/ru_RU/LC_MESSAGES/msg.po | 62 ++++++++++++++++++++------------ msg.pot | 74 +++++++++++++++++++++++--------------- 14 files changed, 500 insertions(+), 309 deletions(-) diffs (truncated from 1785 to 300 lines): diff -r 4552a24787cb -r f92829292d6f downloads.php --- a/downloads.php Wed Jan 23 19:36:46 2013 +0100 +++ b/downloads.php Sun Mar 17 19:29:19 2013 +0100 @@ -5,7 +5,7 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); $download_folder = "0.15"; -$last_version = "0.15.2"; +$last_version = "0.15.3"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; #printf(_(" A %s version is in test"), "0.15-beta4"); diff -r 4552a24787cb -r f92829292d6f index.php --- a/index.php Wed Jan 23 19:36:46 2013 +0100 +++ b/index.php Sun Mar 17 19:29:19 2013 +0100 @@ -50,50 +50,62 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.15.2"), - 1 => sprintf(_("Gajim %s is here!"), "0.15.1"), - 2 => sprintf(_("Gajim %s is here!"), "0.15"), + 0 => sprintf(_("Gajim %s is here!"), "0.15.3"), + 1 => sprintf(_("Gajim %s is here!"), "0.15.2"), + 2 => sprintf(_("Gajim %s is here!"), "0.15.1"), + 3 => sprintf(_("Gajim %s is here!"), "0.15"), ); // 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), // 6 => sprintf(_("Beta-release of Gajim %s"), "0.12"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("30 October 2012"), - 1 => _("29 August 2012"), - 2 => _("18 March 2012"), + 0 => _("17 March 2013"), + 1 => _("30 October 2012"), + 2 => _("29 August 2012"), + 3 => _("18 March 2012"), ); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.15.2"), - 1 => sprintf(_("Version %s of Gajim has been released."), "0.15.1"), - 2 => sprintf(_("Version %s of Gajim has been released."), "0.15"), + 0 => sprintf(_("Version %s of Gajim has been released."), "0.15.3"), + 1 => sprintf(_("Version %s of Gajim has been released."), "0.15.2"), + 2 => sprintf(_("Version %s of Gajim has been released."), "0.15.1"), + 3 => sprintf(_("Version %s of Gajim has been released."), "0.15"), ); // 6 => sprintf(_("Version %s will arrive very soon."), "0.12"), // 7 => sprintf(_("Version %s will arrive soon."), "0.12")); // 3 => sprintf(_("New Windows Installer with GTK+ included.")), $array_news_whats_new = array( - 0 => sprintf(_("What's new since %s:"), "0.15.1"), + 0 => sprintf(_("What's new since %s:"), "0.15.2"), + 1 => sprintf(_("What's new since %s:"), "0.15.1"), 1 => sprintf(_("What's new since %s:"), "0.15"), - 2 => sprintf(_("What's new since %s:"), "0.14.4"), + 3 => sprintf(_("What's new since %s:"), "0.14.4"), ); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( + 0 => _("Better handling of SSL errors"), + 1 => _("Better handling of canceling file transfer"), + 2 => _("Improve farstream calls"), + 3 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.3/ChangeLog\">"._("Full ChangeLog")."</a> ", + 4 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.3\">"._("List of fixed bugs")."</a>", + ); + +$array_news_items[1] = array( 0 => _("Fix crash when pressing ESC in chat window"), 1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.2/ChangeLog\">"._("Full ChangeLog")."</a> ", 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.2\">"._("List of fixed bugs")."</a>", ); -$array_news_items[1] = array( +$array_news_items[2] = array( 0 => _("Switch to python-farstream"), 1 => _("Fix several issues"), 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.1/ChangeLog\">"._("Full ChangeLog")."</a> ", 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.1\">"._("List of fixed bugs")."</a>", ); -$array_news_items[2] = array( +$array_news_items[3] = array( 0 => _("Plugin system"), 1 => _("Whiteboard (via a plugin)"), 2 => _("Message archiving"), diff -r 4552a24787cb -r f92829292d6f locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Wed Jan 23 19:36:46 2013 +0100 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Sun Mar 17 19:29:19 2013 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-19 23:43+0100\n" +"POT-Creation-Date: 2013-03-17 19:25+0100\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -761,85 +761,101 @@ msgid "NEWS" msgstr "НОВИНИ" -#: index.php:53 index.php:54 index.php:55 +#: index.php:53 index.php:54 index.php:55 index.php:56 #, fuzzy, c-format msgid "Gajim %s is here!" msgstr "Излезе Gajim 0.11!" -#: index.php:62 +#: index.php:63 +msgid "17 March 2013" +msgstr "" + +#: index.php:64 #, fuzzy msgid "30 October 2012" msgstr "19 декември 2006 г." -#: index.php:63 +#: index.php:65 msgid "29 August 2012" msgstr "" -#: index.php:64 +#: index.php:66 msgid "18 March 2012" msgstr "" -#: index.php:68 index.php:69 index.php:70 +#: index.php:70 index.php:71 index.php:72 index.php:73 #, fuzzy, c-format msgid "Version %s of Gajim has been released." msgstr "Издадена е версия 0.11 на Gajim." -#: index.php:77 index.php:78 index.php:79 +#: index.php:80 index.php:81 index.php:82 index.php:83 #, fuzzy, c-format msgid "What's new since %s:" msgstr "Какво е новото спрямо " -#: index.php:84 -msgid "Fix crash when pressing ESC in chat window" +#: index.php:88 +msgid "Better handling of SSL errors" msgstr "" -#: index.php:85 index.php:92 index.php:104 +#: index.php:89 +msgid "Better handling of canceling file transfer" +msgstr "" + +#: index.php:90 +msgid "Improve farstream calls" +msgstr "" + +#: index.php:91 index.php:97 index.php:104 index.php:116 msgid "Full ChangeLog" msgstr "Пълен дневник на промените" -#: index.php:85 index.php:92 index.php:104 +#: index.php:91 index.php:97 index.php:104 index.php:116 #, fuzzy msgid "Full changelog, see" msgstr "Пълен дневник на промените" -#: index.php:86 index.php:93 index.php:105 +#: index.php:92 index.php:98 index.php:105 index.php:117 msgid "List of fixed bugs" msgstr "" -#: index.php:90 +#: index.php:96 +msgid "Fix crash when pressing ESC in chat window" +msgstr "" + +#: index.php:102 msgid "Switch to python-farstream" msgstr "" -#: index.php:91 +#: index.php:103 #, fuzzy msgid "Fix several issues" msgstr "Нов превод: сръбски" -#: index.php:97 +#: index.php:109 msgid "Plugin system" msgstr "" -#: index.php:98 +#: index.php:110 msgid "Whiteboard (via a plugin)" msgstr "" -#: index.php:99 +#: index.php:111 msgid "Message archiving" msgstr "" -#: index.php:100 +#: index.php:112 msgid "Stream managment" msgstr "" -#: index.php:101 +#: index.php:113 msgid "Nested roster group" msgstr "" -#: index.php:102 +#: index.php:114 msgid "Roster filtrering" msgstr "" -#: index.php:103 +#: index.php:115 msgid "GPG and spell checking support for windows" msgstr "" diff -r 4552a24787cb -r f92829292d6f locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Wed Jan 23 19:36:46 2013 +0100 +++ b/locale/de_DE/LC_MESSAGES/msg.po Sun Mar 17 19:29:19 2013 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-19 23:43+0100\n" +"POT-Creation-Date: 2013-03-17 19:25+0100\n" "PO-Revision-Date: 2008-12-22 22:59+0100\n" "Last-Translator: \n" "Language-Team: German <kde-i18n-de(a)lists.kde.org>\n" @@ -789,86 +789,103 @@ msgid "NEWS" msgstr "NEUIGKEITEN" -#: index.php:53 index.php:54 index.php:55 +#: index.php:53 index.php:54 index.php:55 index.php:56 #, c-format msgid "Gajim %s is here!" msgstr "Gajim %s ist da!" -#: index.php:62 +#: index.php:63 +msgid "17 March 2013" +msgstr "" + +#: index.php:64 #, fuzzy msgid "30 October 2012" msgstr "22. September 2007" -#: index.php:63 +#: index.php:65 #, fuzzy msgid "29 August 2012" msgstr "12. August 2008" -#: index.php:64 +#: index.php:66 msgid "18 March 2012" msgstr "" -#: index.php:68 index.php:69 index.php:70 +#: index.php:70 index.php:71 index.php:72 index.php:73 #, c-format msgid "Version %s of Gajim has been released." msgstr "Version %s von Gajim wurde veröffentlicht." -#: index.php:77 index.php:78 index.php:79 +#: index.php:80 index.php:81 index.php:82 index.php:83 #, c-format msgid "What's new since %s:" msgstr "Was ist neu seit %s:" -#: index.php:84 -msgid "Fix crash when pressing ESC in chat window" +#: index.php:88 +msgid "Better handling of SSL errors" msgstr "" -#: index.php:85 index.php:92 index.php:104 +#: index.php:89 +msgid "Better handling of canceling file transfer" +msgstr "" + +#: index.php:90 +#, fuzzy +msgid "Improve farstream calls" +msgstr "Fehler beim Dateitransfer behoben" + +#: index.php:91 index.php:97 index.php:104 index.php:116 msgid "Full ChangeLog" msgstr "Vollständige Veränderungshistorie"

1 0

gajim: fix gtk names
by Denis Fomin 17 Mar '13

17 Mar '13

changeset 0a029416bcd6 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0a029416bcd6 description: fix gtk names diffstat: src/chat_control.py | 2 +- src/groupchat_control.py | 6 +++--- src/gui_menu_builder.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diffs (49 lines): diff -r eb79638b0c73 -r 0a029416bcd6 src/chat_control.py --- a/src/chat_control.py Sun Mar 17 00:36:39 2013 +0400 +++ b/src/chat_control.py Sun Mar 17 22:22:48 2013 +0400 @@ -358,7 +358,7 @@ img = self.xml.get_object('image8') else: img = self.xml.get_object('image5') - img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) + img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) id_ = widget.connect('clicked', self._on_history_menuitem_activate) self.handlers[id_] = widget diff -r eb79638b0c73 -r 0a029416bcd6 src/groupchat_control.py --- a/src/groupchat_control.py Sun Mar 17 00:36:39 2013 +0400 +++ b/src/groupchat_control.py Sun Mar 17 22:22:48 2013 +0400 @@ -336,7 +336,7 @@ if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): img = self.xml.get_object('image8') - img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) + img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) widget = self.xml.get_object('list_treeview') id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded) self.handlers[id_] = widget @@ -814,8 +814,8 @@ img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU) bookmark_room_menuitem.set_image(img) if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - img = Gtk.Image() - img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) + img = gtk.Image() + img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) history_menuitem.set_image(img) if hide_buttonbar_items: diff -r eb79638b0c73 -r 0a029416bcd6 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Sun Mar 17 00:36:39 2013 +0400 +++ b/src/gui_menu_builder.py Sun Mar 17 22:22:48 2013 +0400 @@ -254,8 +254,8 @@ account) history_menuitem.connect('activate', roster.on_history, contact, account) if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - img = Gtk.Image() - img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) + img = gtk.Image() + img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) history_menuitem.set_image(img) if control:

1 0

gajim: Added tag gajim-0.15.3 for changeset aef163617c56
by Yann Leboulanger 17 Mar '13

17 Mar '13

changeset bb49f71438e1 in /home/hg/repos/gajim branches: gajim_0.15 details:http://hg.gajim.org/gajim?cmd=changeset;node=bb49f71438e1 description: Added tag gajim-0.15.3 for changeset aef163617c56 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r aef163617c56 -r bb49f71438e1 .hgtags --- a/.hgtags Sun Mar 17 18:44:59 2013 +0100 +++ b/.hgtags Sun Mar 17 19:22:01 2013 +0100 @@ -12,3 +12,4 @@ da5a3cc7b8df6be335142f47cf27b80d5d859e2a gajim-0.15 1db355e55e5a690754adbcf8b530d1b1ba2e286f gajim-0.15.1 970a8f2ab76d3d00d78e8d5310d24bcbe575368c gajim-0.15.2 +aef163617c5634482d6feb46cefd4206432810d2 gajim-0.15.3

1 0

gajim: prepare 0.15.3 release
by Yann Leboulanger 17 Mar '13

17 Mar '13

changeset 84dbf1856a7a in /home/hg/repos/gajim branches: gajim_0.15 details:http://hg.gajim.org/gajim?cmd=changeset;node=84dbf1856a7a description: prepare 0.15.3 release diffstat: ChangeLog | 6 + autogen.sh | 2 +- debian/changelog | 28 +++++++ debian/control | 2 +- debian/patches/00_connection_handlers.diff | 25 ++++++ debian/patches/00list | 2 + debian/patches/01_accel_group.diff | 109 +++++++++++++++++++++++++++++ debian/rules | 10 ++ gajim.nsi | 24 ++++++- src/common/defs.py | 2 +- 10 files changed, 206 insertions(+), 4 deletions(-) diffs (truncated from 326 to 300 lines): diff -r 1d677aad0201 -r 84dbf1856a7a ChangeLog --- a/ChangeLog Thu Mar 14 12:45:53 2013 +0100 +++ b/ChangeLog Sun Mar 17 18:28:39 2013 +0100 @@ -1,3 +1,9 @@ +Gajim 0.15.3 (17 March 2013) + * Better handling of SSL errors + * Better handling of canceling file transfer + * Improve farstream calls + * Minor fixes and improvements + Gajim 0.15.2 (30 October 2012) * Show punycode encoded urls if they contain non-ascii chars diff -r 1d677aad0201 -r 84dbf1856a7a autogen.sh --- a/autogen.sh Thu Mar 14 12:45:53 2013 +0100 +++ b/autogen.sh Sun Mar 17 18:28:39 2013 +0100 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.2" + gajimversion="0.15.3" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 1d677aad0201 -r 84dbf1856a7a debian/changelog --- a/debian/changelog Thu Mar 14 12:45:53 2013 +0100 +++ b/debian/changelog Sun Mar 17 18:28:39 2013 +0100 @@ -1,3 +1,23 @@ +gajim (0.15.1-4) unstable; urgency=low + + * apply patches using dpatch in debian/rules + + -- Yann Leboulanger <asterix(a)lagaule.org> Fri, 15 Feb 2013 23:34:36 +0200 + +gajim (0.15.1-3) unstable; urgency=low + + * Go back to old patch format so that Gajim can go in testing. + + -- Yann Leboulanger <asterix(a)lagaule.org> Sun, 02 Dec 2012 19:42:34 +0200 + +gajim (0.15.1-2) unstable; urgency=low + + * re-add missing 0.15-1.1 changelog entry + * add a patch to prevent a traceback. + * add a patch to fix a crash. Closes: #690937 + + -- Yann Leboulanger <asterix(a)lagaule.org> Sun, 14 Oct 2012 18:02:36 +0200 + gajim (0.15.1-1) unstable; urgency=low * New upstream release. @@ -8,6 +28,14 @@ -- Yann Leboulanger <asterix(a)lagaule.org> Tue, 29 Aug 2012 09:51:52 +0200 +gajim (0.15-1.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix CVE-2012-2093: insecure use of temporary files when convering LaTeX + IM messages to png images. Closes: #668710 + + -- Luk Claes <luk(a)debian.org> Sat, 16 Jun 2012 18:22:00 +0200 + gajim (0.15-1) unstable; urgency=low * New upstream release. diff -r 1d677aad0201 -r 84dbf1856a7a debian/control --- a/debian/control Thu Mar 14 12:45:53 2013 +0100 +++ b/debian/control Sun Mar 17 18:28:39 2013 +0100 @@ -2,7 +2,7 @@ Section: net Priority: optional Maintainer: Yann Leboulanger <asterix(a)lagaule.org> -Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, libglib2.0-dev +Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, libglib2.0-dev, dpatch Standards-Version: 3.9.3 Homepage: http://www.gajim.org Vcs-Hg: http://hg.gajim.org/gajim/ diff -r 1d677aad0201 -r 84dbf1856a7a debian/patches/00_connection_handlers.diff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/patches/00_connection_handlers.diff Sun Mar 17 18:28:39 2013 +0100 @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 00_connection_handlers.diff by <asterix(a)lagaule.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix variable name +# +# Description: fix variable name +# Author: Yann Leboulanger <asterix(a)lagaule.org> +# Last-Update: 2012-10-28 + +@DPATCH@ + +Index: src/common/connection_handlers.py +=================================================================== +--- a/src/common/connection_handlers.py ++++ b/src/common/connection_handlers.py +@@ -1993,7 +1993,7 @@ + def _StreamCB(self, con, iq_obj): + log.debug('StreamCB') + gajim.nec.push_incoming_event(StreamReceivedEvent(None, +- conn=self, stanza=obj)) ++ conn=self, stanza=iq_obj)) + + def _register_handlers(self, con, con_type): + # try to find another way to register handlers in each class diff -r 1d677aad0201 -r 84dbf1856a7a debian/patches/00list --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/patches/00list Sun Mar 17 18:28:39 2013 +0100 @@ -0,0 +1,2 @@ +00_connection_handlers.diff +01_accel_group.diff diff -r 1d677aad0201 -r 84dbf1856a7a debian/patches/01_accel_group.diff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/patches/01_accel_group.diff Sun Mar 17 18:28:39 2013 +0100 @@ -0,0 +1,109 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_connection_handlers.dpatch by <asterix(a)asterix.lagaule.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix using accel group +# +# Description: fix using accel group +# Author: Yann Leboulanger <asterix(a)lagaule.org> +# Origin: upstream,http://hg.gajim.org/gajim/rev/fdd7c9b81c1b +# Last-Update: 2012-10-28 + +@DPATCH@ + +--- a/src/message_window.py ++++ b/src/message_window.py +@@ -352,6 +352,7 @@ + if modifier & gtk.gdk.CONTROL_MASK: + if keyval == gtk.keysyms.h: # CTRL + h + control._on_history_menuitem_activate() ++ return True + elif control.type_id == message_control.TYPE_CHAT and \ + keyval == gtk.keysyms.f: # CTRL + f + # CTRL + f moves cursor one char forward when user uses Emacs +@@ -359,28 +360,35 @@ + if not gtk.settings_get_default().get_property( + 'gtk-key-theme-name') == 'Emacs': + control._on_send_file_menuitem_activate(None) ++ return True + elif control.type_id == message_control.TYPE_CHAT and \ + keyval == gtk.keysyms.g: # CTRL + g + control._on_convert_to_gc_menuitem_activate(None) ++ return True + elif control.type_id in (message_control.TYPE_CHAT, + message_control.TYPE_PM) and keyval == gtk.keysyms.i: # CTRL + i + control._on_contact_information_menuitem_activate(None) + elif keyval == gtk.keysyms.l or keyval == gtk.keysyms.L: # CTRL + l|L + control.conv_textview.clear() ++ return True + elif keyval == gtk.keysyms.u: # CTRL + u: emacs style clear line + control.clear(control.msg_textview) ++ return True + elif control.type_id == message_control.TYPE_GC and \ + keyval == gtk.keysyms.b: # CTRL + b + control._on_bookmark_room_menuitem_activate(None) ++ return True + # Tab switch bindings + elif keyval == gtk.keysyms.F4: # CTRL + F4 + self.remove_tab(control, self.CLOSE_CTRL_KEY) ++ return True + elif keyval == gtk.keysyms.w: # CTRL + w + # CTRL + w removes latest word before sursor when User uses emacs + # theme + if not gtk.settings_get_default().get_property( + 'gtk-key-theme-name') == 'Emacs': + self.remove_tab(control, self.CLOSE_CTRL_KEY) ++ return True + elif keyval in (gtk.keysyms.Page_Up, gtk.keysyms.Page_Down): + # CTRL + PageUp | PageDown + # Create event and send it to notebook +@@ -390,12 +398,14 @@ + event.state = gtk.gdk.CONTROL_MASK + event.keyval = int(keyval) + self.notebook.emit('key_press_event', event) ++ return True + + if modifier & gtk.gdk.SHIFT_MASK: + # CTRL + SHIFT + if control.type_id == message_control.TYPE_GC and \ + keyval == gtk.keysyms.n: # CTRL + SHIFT + n + control._on_change_nick_menuitem_activate(None) ++ return True + # MOD1 (ALT) mask + elif modifier & gtk.gdk.MOD1_MASK: + # Tab switch bindings +@@ -404,26 +414,34 @@ + if new >= self.notebook.get_n_pages(): + new = 0 + self.notebook.set_current_page(new) ++ return True + elif keyval == gtk.keysyms.Left: # ALT + LEFT + new = self.notebook.get_current_page() - 1 + if new < 0: + new = self.notebook.get_n_pages() - 1 + self.notebook.set_current_page(new) ++ return True + elif chr(keyval) in st: # ALT + 1,2,3.. + self.notebook.set_current_page(st.index(chr(keyval))) ++ return True + elif keyval == gtk.keysyms.c: # ALT + C toggles chat buttons + control.chat_buttons_set_visible(not control.hide_chat_buttons) ++ return True + elif keyval == gtk.keysyms.m: # ALT + M show emoticons menu + control.show_emoticons_menu() ++ return True + elif keyval == gtk.keysyms.d: # ALT + D show actions menu + control.on_actions_button_clicked(control.actions_button) ++ return True + elif control.type_id == message_control.TYPE_GC and \ + keyval == gtk.keysyms.t: # ALT + t + control._on_change_subject_menuitem_activate(None) ++ return True + # Close tab bindings + elif keyval == gtk.keysyms.Escape and \ + gajim.config.get('escape_key_closes'): # Escape + self.remove_tab(control, self.CLOSE_ESC) ++ return True + + def _on_close_button_clicked(self, button, control): + """ diff -r 1d677aad0201 -r 84dbf1856a7a debian/rules --- a/debian/rules Thu Mar 14 12:45:53 2013 +0100 +++ b/debian/rules Sun Mar 17 18:28:39 2013 +0100 @@ -1,8 +1,18 @@ #!/usr/bin/make -f +include /usr/share/dpatch/dpatch.make %: dh $@ --with python2 +build: build-stamp + +build-stamp: patch-stamp + dh build + touch $@ + +clean: unpatch + dh clean + # test target is broken override_dh_auto_test: diff -r 1d677aad0201 -r 84dbf1856a7a gajim.nsi --- a/gajim.nsi Thu Mar 14 12:45:53 2013 +0100 +++ b/gajim.nsi Sun Mar 17 18:28:39 2013 +0100 @@ -39,11 +39,15 @@ !insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_FINISH +;Show all languages, despite user's codepage +!define MUI_LANGDLL_ALLLANGUAGES + !insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "German" !insertmacro MUI_LANGUAGE "Italian" !insertmacro MUI_LANGUAGE "Russian" +!insertmacro MUI_LANGUAGE "Hebrew" !insertmacro MUI_RESERVEFILE_LANGDLL ; English @@ -125,6 +129,22 @@ LangString STR_Installed ${LANG_RUSSIAN} "Ïîõîæå, Gajim óæå óñòàíîâëåí. Äåèíñòàëëèðîâàòü óñòàíîâëåííóþ âåðñèþ?" LangString STR_Running ${LANG_RUSSIAN} "Ïîõîæå, Gajim óæå çàïóùåí.$\nÇàêðîéòå åãî è çàïóñòèòå äåèíñòàëëÿòîð ñíîâà." +; Hebrew +LangString NAME_Emoticons ${LANG_HEBREW} "øâùåðéí" +LangString NAME_Iconsets ${LANG_HEBREW} "îòøëé öìîéú" +LangString NAME_Languages ${LANG_HEBREW} "ùôåú" +LangString NAME_SecLanguagesOther ${LANG_HEBREW} "àçøåú" +LangString NAME_Themes ${LANG_HEBREW} "òøëàåú ðåùà" +LangString NAME_SecDesktopIcon ${LANG_HEBREW} "öåø ñîì áùåìçï òáåãä" +LangString NAME_SecAutostart ${LANG_HEBREW} "äôòì àú Gajim ëàùø Windows îúçéì" +LangString DESC_SecGajim ${LANG_HEBREW} "îú÷éï ÷áöé Gajim òé÷øééí." +LangString DESC_SecGtk ${LANG_HEBREW} "îú÷éï Gtk+ 2 (ðçåöä ìäøöú Gajim)." +LangString DESC_SecDesktopIcon ${LANG_HEBREW} "áîéãä åð÷áòú, ÷éöåø ãøê òáåø Gajim éåùí òì ùåìçï äòáåãä." +LangString DESC_SecAutostart ${LANG_HEBREW} "áîéãä åð÷áòú, Gajim éåôòì àåèåîèéú ëàùø Windows îúçéì." +LangString STR_Installed ${LANG_HEBREW} "ëôé äðøàä, Gajim ëáø îåú÷ï. ìäñéø àåúå?" +LangString STR_Running ${LANG_HEBREW} "ðøàä ùäúåëðéú Gajim îåøöú ëòú.$\n\ + àðà öà îï Gajim åàúçì àú îñéø ääú÷ðä." + Section "Gajim" SecGajim SectionIn RO @@ -180,7 +200,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.15.2" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.3" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" @@ -343,6 +363,7 @@ File /r "po\eo"

1 0

gajim: update debian folder for 0.15.3
by Yann Leboulanger 17 Mar '13

17 Mar '13

changeset aef163617c56 in /home/hg/repos/gajim branches: gajim_0.15 details:http://hg.gajim.org/gajim?cmd=changeset;node=aef163617c56 description: update debian folder for 0.15.3 diffstat: debian/changelog | 7 + debian/patches/00_connection_handlers.diff | 25 ------ debian/patches/00list | 2 - debian/patches/01_accel_group.diff | 109 ----------------------------- debian/rules | 10 -- debian/source/format | 1 + 6 files changed, 8 insertions(+), 146 deletions(-) diffs (189 lines): diff -r 84dbf1856a7a -r aef163617c56 debian/changelog --- a/debian/changelog Sun Mar 17 18:28:39 2013 +0100 +++ b/debian/changelog Sun Mar 17 18:44:59 2013 +0100 @@ -1,3 +1,10 @@ +gajim (0.15.3-1) unstable; urgency=low + + * New upstream release + * Switch to 3.0 (quilt) source format. + + -- Yann Leboulanger <yann(a)leboulanger.org> Sun, 17 Mar 2013 18:32:12 +0200 + gajim (0.15.1-4) unstable; urgency=low * apply patches using dpatch in debian/rules diff -r 84dbf1856a7a -r aef163617c56 debian/patches/00_connection_handlers.diff --- a/debian/patches/00_connection_handlers.diff Sun Mar 17 18:28:39 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 00_connection_handlers.diff by <asterix(a)lagaule.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: fix variable name -# -# Description: fix variable name -# Author: Yann Leboulanger <asterix(a)lagaule.org> -# Last-Update: 2012-10-28 - -@DPATCH@ - -Index: src/common/connection_handlers.py -=================================================================== ---- a/src/common/connection_handlers.py -+++ b/src/common/connection_handlers.py -@@ -1993,7 +1993,7 @@ - def _StreamCB(self, con, iq_obj): - log.debug('StreamCB') - gajim.nec.push_incoming_event(StreamReceivedEvent(None, -- conn=self, stanza=obj)) -+ conn=self, stanza=iq_obj)) - - def _register_handlers(self, con, con_type): - # try to find another way to register handlers in each class diff -r 84dbf1856a7a -r aef163617c56 debian/patches/00list --- a/debian/patches/00list Sun Mar 17 18:28:39 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -00_connection_handlers.diff -01_accel_group.diff diff -r 84dbf1856a7a -r aef163617c56 debian/patches/01_accel_group.diff --- a/debian/patches/01_accel_group.diff Sun Mar 17 18:28:39 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,109 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_connection_handlers.dpatch by <asterix(a)asterix.lagaule.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: fix using accel group -# -# Description: fix using accel group -# Author: Yann Leboulanger <asterix(a)lagaule.org> -# Origin: upstream,http://hg.gajim.org/gajim/rev/fdd7c9b81c1b -# Last-Update: 2012-10-28 - -@DPATCH@ - ---- a/src/message_window.py -+++ b/src/message_window.py -@@ -352,6 +352,7 @@ - if modifier & gtk.gdk.CONTROL_MASK: - if keyval == gtk.keysyms.h: # CTRL + h - control._on_history_menuitem_activate() -+ return True - elif control.type_id == message_control.TYPE_CHAT and \ - keyval == gtk.keysyms.f: # CTRL + f - # CTRL + f moves cursor one char forward when user uses Emacs -@@ -359,28 +360,35 @@ - if not gtk.settings_get_default().get_property( - 'gtk-key-theme-name') == 'Emacs': - control._on_send_file_menuitem_activate(None) -+ return True - elif control.type_id == message_control.TYPE_CHAT and \ - keyval == gtk.keysyms.g: # CTRL + g - control._on_convert_to_gc_menuitem_activate(None) -+ return True - elif control.type_id in (message_control.TYPE_CHAT, - message_control.TYPE_PM) and keyval == gtk.keysyms.i: # CTRL + i - control._on_contact_information_menuitem_activate(None) - elif keyval == gtk.keysyms.l or keyval == gtk.keysyms.L: # CTRL + l|L - control.conv_textview.clear() -+ return True - elif keyval == gtk.keysyms.u: # CTRL + u: emacs style clear line - control.clear(control.msg_textview) -+ return True - elif control.type_id == message_control.TYPE_GC and \ - keyval == gtk.keysyms.b: # CTRL + b - control._on_bookmark_room_menuitem_activate(None) -+ return True - # Tab switch bindings - elif keyval == gtk.keysyms.F4: # CTRL + F4 - self.remove_tab(control, self.CLOSE_CTRL_KEY) -+ return True - elif keyval == gtk.keysyms.w: # CTRL + w - # CTRL + w removes latest word before sursor when User uses emacs - # theme - if not gtk.settings_get_default().get_property( - 'gtk-key-theme-name') == 'Emacs': - self.remove_tab(control, self.CLOSE_CTRL_KEY) -+ return True - elif keyval in (gtk.keysyms.Page_Up, gtk.keysyms.Page_Down): - # CTRL + PageUp | PageDown - # Create event and send it to notebook -@@ -390,12 +398,14 @@ - event.state = gtk.gdk.CONTROL_MASK - event.keyval = int(keyval) - self.notebook.emit('key_press_event', event) -+ return True - - if modifier & gtk.gdk.SHIFT_MASK: - # CTRL + SHIFT - if control.type_id == message_control.TYPE_GC and \ - keyval == gtk.keysyms.n: # CTRL + SHIFT + n - control._on_change_nick_menuitem_activate(None) -+ return True - # MOD1 (ALT) mask - elif modifier & gtk.gdk.MOD1_MASK: - # Tab switch bindings -@@ -404,26 +414,34 @@ - if new >= self.notebook.get_n_pages(): - new = 0 - self.notebook.set_current_page(new) -+ return True - elif keyval == gtk.keysyms.Left: # ALT + LEFT - new = self.notebook.get_current_page() - 1 - if new < 0: - new = self.notebook.get_n_pages() - 1 - self.notebook.set_current_page(new) -+ return True - elif chr(keyval) in st: # ALT + 1,2,3.. - self.notebook.set_current_page(st.index(chr(keyval))) -+ return True - elif keyval == gtk.keysyms.c: # ALT + C toggles chat buttons - control.chat_buttons_set_visible(not control.hide_chat_buttons) -+ return True - elif keyval == gtk.keysyms.m: # ALT + M show emoticons menu - control.show_emoticons_menu() -+ return True - elif keyval == gtk.keysyms.d: # ALT + D show actions menu - control.on_actions_button_clicked(control.actions_button) -+ return True - elif control.type_id == message_control.TYPE_GC and \ - keyval == gtk.keysyms.t: # ALT + t - control._on_change_subject_menuitem_activate(None) -+ return True - # Close tab bindings - elif keyval == gtk.keysyms.Escape and \ - gajim.config.get('escape_key_closes'): # Escape - self.remove_tab(control, self.CLOSE_ESC) -+ return True - - def _on_close_button_clicked(self, button, control): - """ diff -r 84dbf1856a7a -r aef163617c56 debian/rules --- a/debian/rules Sun Mar 17 18:28:39 2013 +0100 +++ b/debian/rules Sun Mar 17 18:44:59 2013 +0100 @@ -1,18 +1,8 @@ #!/usr/bin/make -f -include /usr/share/dpatch/dpatch.make %: dh $@ --with python2 -build: build-stamp - -build-stamp: patch-stamp - dh build - touch $@ - -clean: unpatch - dh clean - # test target is broken override_dh_auto_test: diff -r 84dbf1856a7a -r aef163617c56 debian/source/format --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/source/format Sun Mar 17 18:44:59 2013 +0100 @@ -0,0 +1,1 @@ +3.0 (quilt)

1 0

gajim: hnadle MISSING_PASSPHRASE message from gnupg when signing
by Yann Leboulanger 17 Mar '13

17 Mar '13

changeset 1d677aad0201 in /home/hg/repos/gajim branches: gajim_0.15 details:http://hg.gajim.org/gajim?cmd=changeset;node=1d677aad0201 description: hnadle MISSING_PASSPHRASE message from gnupg when signing diffstat: src/common/gnupg.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6c317f38b51e -r 1d677aad0201 src/common/gnupg.py --- a/src/common/gnupg.py Mon Mar 11 20:21:59 2013 +0100 +++ b/src/common/gnupg.py Thu Mar 14 12:45:53 2013 +0100 @@ -447,7 +447,7 @@ def handle_status(self, key, value): if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE", - "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL"): + "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", "MISSING_PASSPHRASE"): pass elif key in ("KEYEXPIRED", "SIGEXPIRED"): self.status = 'key expired'

1 0

gajim: fix history button icon in gc
by Denis Fomin 16 Mar '13

16 Mar '13

changeset eb79638b0c73 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=eb79638b0c73 description: fix history button icon in gc diffstat: src/chat_control.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (19 lines): diff -r 779388b37875 -r eb79638b0c73 src/chat_control.py --- a/src/chat_control.py Sat Mar 16 23:56:22 2013 +0400 +++ b/src/chat_control.py Sun Mar 17 00:36:39 2013 +0400 @@ -352,9 +352,14 @@ contact, acct, resource=resource) widget = self.xml.get_object('history_button') + # set document-open-recent icon for history button if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - img = self.xml.get_object('image5') + if widget_name == 'groupchat_control': + img = self.xml.get_object('image8') + else: + img = self.xml.get_object('image5') img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) + id_ = widget.connect('clicked', self._on_history_menuitem_activate) self.handlers[id_] = widget

1 0

gajim: fix history button icon in gc
by Denis Fomin 16 Mar '13

16 Mar '13

changeset ef07d9da7329 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ef07d9da7329 description: fix history button icon in gc diffstat: src/chat_control.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (19 lines): diff -r 5d923908cc16 -r ef07d9da7329 src/chat_control.py --- a/src/chat_control.py Sat Mar 16 23:56:22 2013 +0400 +++ b/src/chat_control.py Sun Mar 17 00:36:39 2013 +0400 @@ -353,9 +353,14 @@ contact, acct, resource=resource) widget = self.xml.get_object('history_button') + # set document-open-recent icon for history button if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - img = self.xml.get_object('image5') + if widget_name == 'groupchat_control': + img = self.xml.get_object('image8') + else: + img = self.xml.get_object('image5') img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) + id_ = widget.connect('clicked', self._on_history_menuitem_activate) self.handlers[id_] = widget

1 0

gajim: Change history icon if theme have 'document-open-recent' ...
by Denis Fomin 16 Mar '13

16 Mar '13

changeset 779388b37875 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=779388b37875 description: Change history icon if theme have 'document-open-recent' icon. Fixes #6893 diffstat: src/chat_control.py | 3 +++ src/groupchat_control.py | 7 +++++++ src/gui_menu_builder.py | 4 ++++ 3 files changed, 14 insertions(+), 0 deletions(-) diffs (51 lines): diff -r 7986ef9c882f -r 779388b37875 src/chat_control.py --- a/src/chat_control.py Thu Mar 14 12:47:49 2013 +0100 +++ b/src/chat_control.py Sat Mar 16 23:56:22 2013 +0400 @@ -352,6 +352,9 @@ contact, acct, resource=resource) widget = self.xml.get_object('history_button') + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + img = self.xml.get_object('image5') + img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) id_ = widget.connect('clicked', self._on_history_menuitem_activate) self.handlers[id_] = widget diff -r 7986ef9c882f -r 779388b37875 src/groupchat_control.py --- a/src/groupchat_control.py Thu Mar 14 12:47:49 2013 +0100 +++ b/src/groupchat_control.py Sat Mar 16 23:56:22 2013 +0400 @@ -334,6 +334,9 @@ gajim.connections[self.account].pubsub_publish_options_supported)) widget.show() + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + img = self.xml.get_object('image8') + img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) widget = self.xml.get_object('list_treeview') id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded) self.handlers[id_] = widget @@ -810,6 +813,10 @@ img = gtk.Image() img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU) bookmark_room_menuitem.set_image(img) + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + img = Gtk.Image() + img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) + history_menuitem.set_image(img) if hide_buttonbar_items: change_nick_menuitem.hide() diff -r 7986ef9c882f -r 779388b37875 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Thu Mar 14 12:47:49 2013 +0100 +++ b/src/gui_menu_builder.py Sat Mar 16 23:56:22 2013 +0400 @@ -253,6 +253,10 @@ rename_menuitem.connect('activate', roster.on_rename, 'contact', jid, account) history_menuitem.connect('activate', roster.on_history, contact, account) + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + img = Gtk.Image() + img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) + history_menuitem.set_image(img) if control: convert_to_gc_menuitem.connect('activate',

1 0

gajim: Change history icon if theme have 'document-open-recent' ...
by Denis Fomin 16 Mar '13

16 Mar '13

changeset 5d923908cc16 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5d923908cc16 description: Change history icon if theme have 'document-open-recent' icon diffstat: src/chat_control.py | 3 +++ src/groupchat_control.py | 7 +++++++ src/gui_menu_builder.py | 4 ++++ 3 files changed, 14 insertions(+), 0 deletions(-) diffs (51 lines): diff -r 4eb460d81866 -r 5d923908cc16 src/chat_control.py --- a/src/chat_control.py Sun Mar 10 16:59:16 2013 +0100 +++ b/src/chat_control.py Sat Mar 16 23:56:22 2013 +0400 @@ -353,6 +353,9 @@ contact, acct, resource=resource) widget = self.xml.get_object('history_button') + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + img = self.xml.get_object('image5') + img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) id_ = widget.connect('clicked', self._on_history_menuitem_activate) self.handlers[id_] = widget diff -r 4eb460d81866 -r 5d923908cc16 src/groupchat_control.py --- a/src/groupchat_control.py Sun Mar 10 16:59:16 2013 +0100 +++ b/src/groupchat_control.py Sat Mar 16 23:56:22 2013 +0400 @@ -340,6 +340,9 @@ gajim.connections[self.account].pubsub_publish_options_supported)) widget.show() + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + img = self.xml.get_object('image8') + img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) widget = self.xml.get_object('list_treeview') id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded) self.handlers[id_] = widget @@ -820,6 +823,10 @@ img = Gtk.Image() img.set_from_icon_name('bookmark-new', Gtk.IconSize.MENU) bookmark_room_menuitem.set_image(img) + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + img = Gtk.Image() + img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) + history_menuitem.set_image(img) if hide_buttonbar_items: change_nick_menuitem.hide() diff -r 4eb460d81866 -r 5d923908cc16 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Sun Mar 10 16:59:16 2013 +0100 +++ b/src/gui_menu_builder.py Sat Mar 16 23:56:22 2013 +0400 @@ -254,6 +254,10 @@ rename_menuitem.connect('activate', roster.on_rename, 'contact', jid, account) history_menuitem.connect('activate', roster.on_history, contact, account) + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + img = Gtk.Image() + img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) + history_menuitem.set_image(img) if control: convert_to_gc_menuitem.connect('activate',

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