Commits October 2013

commits@gajim.org

1 participants
48 discussions

gajim: Disable emoticons if emoticons.py is corrupted. Fixes #74...
by Gajim 19 Oct '13

19 Oct '13

changeset e65971276cf2 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=e65971276cf2 description: Disable emoticons if emoticons.py is corrupted. Fixes #7414. Fixes #7513 diffstat: src/gui_interface.py | 25 ++++++++++++++++++------- 1 файлов изменено, 18 вставок(+), 7 удалений(-) различия (50 строк): diff -r 67a5b3059a0f -r e65971276cf2 src/gui_interface.py --- a/src/gui_interface.py Sat Oct 19 12:32:01 2013 +0400 +++ b/src/gui_interface.py Sat Oct 19 14:06:06 2013 +0400 @@ -1955,13 +1955,16 @@ self.emoticons = dict() self.emoticons_animations = dict() - sys.path.append(path) + sys.path.insert(0, path) import emoticons - if need_reload: - # we need to reload else that doesn't work when changing emoticon - # set - reload(emoticons) - emots = emoticons.emoticons + try: + if need_reload: + # we need to reload else that doesn't work when changing emoticon + # set + reload(emoticons) + emots = emoticons.emoticons + except Exception, e: + return True for emot_filename in emots: emot_file = os.path.join(path, emot_filename) if not self.image_is_ok(emot_file): @@ -2002,7 +2005,14 @@ transient_for=transient_for) gajim.config.set('emoticons_theme', '') return - self._init_emoticons(path, need_reload) + if self._init_emoticons(path, need_reload): + dialogs.WarningDialog(_('Emoticons disabled'), + _('Your configured emoticons theme cannot been loaded. You ' + 'maybe need to update the format of emoticons.py file. See ' + 'http://trac.gajim.org/wiki/Emoticons for more details.'), + transient_for=transient_for) + gajim.config.set('emoticons_theme', '') + return if len(self.emoticons) == 0: # maybe old format of emoticons file, try to convert it try: @@ -2025,6 +2035,7 @@ 'maybe need to update the format of emoticons.py file. See ' 'http://trac.gajim.org/wiki/Emoticons for more details.'), transient_for=transient_for) + gajim.config.set('emoticons_theme', '') if self.emoticons_menu: self.emoticons_menu.destroy() self.emoticons_menu = self.prepare_emoticons_menu()

1 0

gajim: Set transient_for for 'Emoticons disabled' warning dialog...
by Gajim 19 Oct '13

19 Oct '13

changeset 67a5b3059a0f 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=67a5b3059a0f description: Set transient_for for 'Emoticons disabled' warning dialog. See #7185 diffstat: src/gui_interface.py | 10 ++++++++-- 1 файлов изменено, 8 вставок(+), 2 удалений(-) различия (34 строк): diff -r 08695479a11e -r 67a5b3059a0f src/gui_interface.py --- a/src/gui_interface.py Wed Oct 16 00:05:16 2013 +0400 +++ b/src/gui_interface.py Sat Oct 19 12:32:01 2013 +0400 @@ -1986,6 +1986,10 @@ if not emot_theme: return + transient_for = None + if 'preferences' in gajim.interface.instances: + transient_for = gajim.interface.instances['preferences'].window + path = os.path.join(gajim.DATA_DIR, 'emoticons', emot_theme) if not os.path.exists(path): # It's maybe a user theme @@ -1994,7 +1998,8 @@ # theme doesn't exist, disable emoticons dialogs.WarningDialog(_('Emoticons disabled'), _('Your configured emoticons theme has not been found, so ' - 'emoticons have been disabled.')) + 'emoticons have been disabled.'), + transient_for=transient_for) gajim.config.set('emoticons_theme', '') return self._init_emoticons(path, need_reload) @@ -2018,7 +2023,8 @@ dialogs.WarningDialog(_('Emoticons disabled'), _('Your configured emoticons theme cannot been loaded. You ' 'maybe need to update the format of emoticons.py file. See ' - 'http://trac.gajim.org/wiki/Emoticons for more details.')) + 'http://trac.gajim.org/wiki/Emoticons for more details.'), + transient_for=transient_for) if self.emoticons_menu: self.emoticons_menu.destroy() self.emoticons_menu = self.prepare_emoticons_menu()

1 0

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

15 Oct '13

changeset 08695479a11e 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=08695479a11e description: [Darlan]Set layout_style of buttons Add (gtk-add) Remove (gtk-remove) to default. Fixes #7491 diffstat: data/gui/manage_bookmarks_window.ui | 23 +++++++++++------------ data/gui/manage_proxies_window.ui | 31 +++++++++++++++---------------- 2 файлов изменено, 26 вставок(+), 28 удалений(-) различия (256 строк): diff -r 934baf987fc6 -r 08695479a11e data/gui/manage_bookmarks_window.ui --- a/data/gui/manage_bookmarks_window.ui Tue Oct 15 23:56:20 2013 +0400 +++ b/data/gui/manage_bookmarks_window.ui Wed Oct 16 00:05:16 2013 +0400 @@ -51,7 +51,6 @@ <object class="GtkHButtonBox" id="hbuttonbox25"> <property name="visible">True</property> <property name="spacing">6</property> - <property name="layout_style">end</property> <child> <object class="GtkButton" id="add_bookmark_button"> <property name="label">gtk-add</property> @@ -113,7 +112,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> @@ -128,7 +127,7 @@ <property name="right_attach">2</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -142,7 +141,7 @@ <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -156,7 +155,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> @@ -170,7 +169,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> @@ -184,7 +183,7 @@ <property name="right_attach">2</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> @@ -198,7 +197,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -212,7 +211,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> @@ -224,7 +223,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -236,7 +235,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -250,7 +249,7 @@ <property name="top_attach">6</property> <property name="bottom_attach">7</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> diff -r 934baf987fc6 -r 08695479a11e data/gui/manage_proxies_window.ui --- a/data/gui/manage_proxies_window.ui Tue Oct 15 23:56:20 2013 +0400 +++ b/data/gui/manage_proxies_window.ui Wed Oct 16 00:05:16 2013 +0400 @@ -64,7 +64,6 @@ <object class="GtkHButtonBox" id="hbuttonbox21"> <property name="visible">True</property> <property name="spacing">6</property> - <property name="layout_style">end</property> <child> <object class="GtkButton" id="add_proxy_button"> <property name="label">gtk-add</property> @@ -138,7 +137,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -173,7 +172,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> @@ -186,7 +185,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> @@ -238,7 +237,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> @@ -250,7 +249,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -263,7 +262,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -281,7 +280,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> @@ -295,7 +294,7 @@ <property name="right_attach">2</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -310,7 +309,7 @@ <property name="right_attach">2</property> <property name="top_attach">6</property> <property name="bottom_attach">7</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -325,7 +324,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> @@ -340,7 +339,7 @@ <property name="top_attach">6</property> <property name="bottom_attach">7</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -355,7 +354,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> @@ -369,7 +368,7 @@ <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -383,7 +382,7 @@ <property name="right_attach">2</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> @@ -398,7 +397,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> </object>

1 0

gajim: Set gajim-remote to not active by default. Fixes #7454
by Gajim 15 Oct '13

15 Oct '13

changeset 934baf987fc6 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=934baf987fc6 description: Set gajim-remote to not active by default. Fixes #7454 diffstat: src/common/config.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r f57508eee203 -r 934baf987fc6 src/common/config.py --- a/src/common/config.py Tue Oct 15 09:59:05 2013 +0400 +++ b/src/common/config.py Tue Oct 15 23:56:20 2013 +0400 @@ -191,7 +191,7 @@ 'dictionary_url': [opt_str, 'WIKTIONARY', _("Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary.")], 'always_english_wikipedia': [opt_bool, False], 'always_english_wiktionary': [opt_bool, True], - 'remote_control': [opt_bool, True, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], + 'remote_control': [opt_bool, False, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], 'networkmanager_support': [opt_bool, True, _('If True, listen to D-Bus signals from NetworkManager and change the status of accounts (provided they do not have listen_to_network_manager set to False and they sync with global status) based upon the status of the network connection.'), True], 'outgoing_chat_state_notifications': [opt_str, 'all', _('Sent chat state notifications. Can be one of all, composing_only, disabled.')], 'displayed_chat_state_notifications': [opt_str, 'all', _('Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled.')],

1 0

gajim: Set transient_for for 'Wrong server' error dialog in join gc
by Gajim 15 Oct '13

15 Oct '13

changeset f57508eee203 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=f57508eee203 description: Set transient_for for 'Wrong server' error dialog in join gc diffstat: src/dialogs.py | 3 ++- 1 файлов изменено, 2 вставок(+), 1 удалений(-) различия (14 строк): diff -r 40a046f14d38 -r f57508eee203 src/dialogs.py --- a/src/dialogs.py Mon Oct 14 16:11:50 2013 +0400 +++ b/src/dialogs.py Tue Oct 15 09:59:05 2013 +0400 @@ -2547,8 +2547,9 @@ if obj.jid != self.requested_jid: return self.requested_jid = None + window = gajim.interface.instances[self.account]['join_gc'].window ErrorDialog(_('Wrong server'), _('%s is not a groupchat server') % \ - obj.jid) + obj.jid, transient_for=window) def _nec_agent_info_received(self, obj): if obj.conn.name != self.account:

1 0

gajim: Set transient_for for 'Wrong server' error dialog in join gc
by Gajim 14 Oct '13

14 Oct '13

changeset 40a046f14d38 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=40a046f14d38 description: Set transient_for for 'Wrong server' error dialog in join gc diffstat: src/dialogs.py | 3 ++- 1 файлов изменено, 2 вставок(+), 1 удалений(-) различия (14 строк): diff -r a03df124e461 -r 40a046f14d38 src/dialogs.py --- a/src/dialogs.py Mon Oct 14 15:23:40 2013 +0400 +++ b/src/dialogs.py Mon Oct 14 16:11:50 2013 +0400 @@ -2557,8 +2557,9 @@ return self.requested_jid = None if nbxmpp.NS_MUC not in obj.features: + window = gajim.interface.instances[self.account]['join_gc'].window ErrorDialog(_('Wrong server'), _('%s is not a groupchat server') % \ - obj.jid) + obj.jid, transient_for=window) return if obj.jid in gajim.interface.instances[self.account]['disco']: gajim.interface.instances[self.account]['disco'][obj.jid].window.\

1 0

gajim: Fix missing import
by Gajim 14 Oct '13

14 Oct '13

changeset a03df124e461 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=a03df124e461 description: Fix missing import diffstat: src/htmltextview.py | 3 ++- 1 файлов изменено, 2 вставок(+), 1 удалений(-) различия (20 строк): diff -r 77a13e31ff9d -r a03df124e461 src/htmltextview.py --- a/src/htmltextview.py Mon Oct 14 11:00:17 2013 +0400 +++ b/src/htmltextview.py Mon Oct 14 15:23:40 2013 +0400 @@ -52,6 +52,7 @@ import gtkgui_helpers from common import gajim from gtkgui_helpers import get_icon_pixmap +from gtkgui_helpers import get_gtk_builder from common import helpers import tooltips @@ -916,7 +917,7 @@ dialogs.AddNewContactWindow(self.account, jid) def make_link_menu(self, event, kind, text): - xml = gtkgui_helpers.get_gtk_builder('chat_context_menu.ui') + xml = get_gtk_builder('chat_context_menu.ui') menu = xml.get_object('chat_context_menu') childs = menu.get_children() if kind == 'url':

1 0

gajim: [Darlan] Update Hebrew translation
by Gajim 14 Oct '13

14 Oct '13

changeset 77a13e31ff9d 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=77a13e31ff9d description: [Darlan] Update Hebrew translation diffstat: po/he.po | 21 +++++++++++---------- 1 файлов изменено, 11 вставок(+), 10 удалений(-) различия (81 строк): diff -r bdce46f6d2fd -r 77a13e31ff9d po/he.po --- a/po/he.po Sun Oct 06 22:43:27 2013 +0400 +++ b/po/he.po Mon Oct 14 11:00:17 2013 +0400 @@ -9,7 +9,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-14 10:28+0200\n" -"PO-Revision-Date: 2013-09-14 10:29+0200\n" +"PO-Revision-Date: 2013-10-08 19:46+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -415,13 +415,14 @@ msgstr "ש_לח חבילות keep-alive" # BUG: a dot at the end +# נובעת בניתוק #: ../data/gui/accounts_window.ui.h:44 msgid "" "If checked, Gajim will send keep-alive packets to prevent connection timeout " "which results in disconnection" msgstr "" "במידה ואפשרות זו מסומנת, Gajim ישלח חבילות keep-alive כדי למנוע פקיעת זמן של " -"חיבור (connection timeout) המביאה לידי ניתוק" +"חיבור (connection timeout) אשר מביאה לידי ניתוק" #: ../data/gui/accounts_window.ui.h:45 msgid "Use cust_om hostname/port" @@ -804,7 +805,7 @@ #: ../data/gui/change_password_dialog.ui.h:1 msgid "Change Password" -msgstr "שנה סיסמה" +msgstr "שינוי סיסמה" #: ../data/gui/change_password_dialog.ui.h:2 msgid "Enter new password:" @@ -1241,7 +1242,7 @@ # Chat-state? #: ../data/gui/gajim_themes_window.ui.h:15 msgid "Chatstate Tab Colors" -msgstr "צבעי כרטיסייה מצב שיחה" +msgstr "צבעי כרטיסיית מצב שיחה" #: ../data/gui/gajim_themes_window.ui.h:16 msgid "Gone" @@ -2627,7 +2628,7 @@ #: ../data/gui/remove_account_window.ui.h:1 msgid "Remove account _only from Gajim" -msgstr "להסיר חשבון מתוך Gajim _בלבד" +msgstr "להסיר חשבון מתוך _Gajim בלבד" #: ../data/gui/remove_account_window.ui.h:2 msgid "Remove account from Gajim and from _server" @@ -3798,7 +3799,7 @@ msgid "Time in minutes, after which your status changes to away." msgstr "זמן בדקות, אשר לאחריו מצבך ישתנה אל נעדר." -# במצב סרק +# משום היותי במצב סרק #: ../src/common/config.py:83 msgid "$S (Away as a result of being idle more than $T min)" msgstr "$S (נעדר כתוצאה מהיותי בחוסר פעילות למשך של יותר מ־$T דקות)" @@ -7401,12 +7402,12 @@ msgid "What would you like to do?" msgstr "מה ברצונך לעשות?" -# מהיישום +# BUG: USE: Remove account _only from Gajim #: ../src/config.py:3091 msgid "Remove only from Gajim" -msgstr "הסרה מתוך Gajim בלבד" - -# אחר כך +msgstr "להסיר מתוך Gajim בלבד" + +# BUG: Underline #: ../src/config.py:3092 msgid "Don't remove anything. I'll try again later" msgstr "לא להסיר דבר. אני אנסה שוב מאוחר יותר"

1 0

gajim: Fix different background color for Birthday entry. Fixes ...
by Gajim 06 Oct '13

06 Oct '13

changeset bdce46f6d2fd 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=bdce46f6d2fd description: Fix different background color for Birthday entry. Fixes #7239 diffstat: data/gui/profile_window.ui | 1 + 1 файлов изменено, 1 вставок(+), 0 удалений(-) различия (11 строк): diff -r 20b740413931 -r bdce46f6d2fd data/gui/profile_window.ui --- a/data/gui/profile_window.ui Sat Sep 28 17:32:09 2013 +0400 +++ b/data/gui/profile_window.ui Sun Oct 06 22:43:27 2013 +0400 @@ -531,6 +531,7 @@ <object class="GtkEventBox" id="eventbox1"> <property name="visible">True</property> <property name="tooltip_text" translatable="yes">Format: YYYY-MM-DD</property> + <property name="visible_window">False</property> <child> <object class="GtkLabel" id="label13"> <property name="visible">True</property>

1 0

gajim-plugins: Made the ayatana plugin show the roster when clic...
by Gajim Plugins 04 Oct '13

04 Oct '13

changeset e3d6d38640c2 in /home/hg/repos/gajim-plugins author: Guillaume <boss(a)etenil.net> branches: details:gajim-plugins?cmd=changeset;node=e3d6d38640c2 description: Made the ayatana plugin show the roster when clicking on its messaging menu entry. diffstat: ubuntu_integration/plugin.py | 6 ++++++ 1 файлов изменено, 6 вставок(+), 0 удалений(-) различия (23 строк): diff -r f3e4968feec8 -r e3d6d38640c2 ubuntu_integration/plugin.py --- a/ubuntu_integration/plugin.py Fri Oct 04 22:52:51 2013 +0400 +++ b/ubuntu_integration/plugin.py Fri Oct 04 11:12:57 2013 +0100 @@ -60,6 +60,10 @@ self.available_text += _('python-indicate is missing! ' 'Install python-indicate.') + def show_roster_window(a, b, c): + roster = gajim.interface.roster.window + roster.present() + @log_calls("UbuntuIntegrationPlugin") def activate(self): """ @@ -81,6 +85,8 @@ if not dfile: raise GajimPluginException("Can't locate gajim.desktop!") self.server.set_desktop_file(dfile) + roster = gajim.interface.roster.window + self.server.connect('server-display', self.show_roster_window) self.server.show() gajim.events.event_added_subscribe(self.on_event_added)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2013