Commits

commits@gajim.org

17632 discussions

gajim: typo
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 45eb137aae4f in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=45eb137aae4f description: typo diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 682b58d5de1e -r 45eb137aae4f src/common/config.py --- a/src/common/config.py Thu Aug 15 23:21:24 2013 +0200 +++ b/src/common/config.py Fri Aug 16 10:09:41 2013 +0400 @@ -412,7 +412,7 @@ 'oauth2_refresh_token': [ opt_str, '', _('Latest token for Oauth2 authentication.')], 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for Oauth2 authentication.')], 'oauth2_redirect_url': [ opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for Oauth2 authentication.')], - 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDsfor which we want to re-open a chat window on next startup.')], + 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDs for which we want to re-open a chat window on next startup.')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ],

1 0

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 24 Aug '13

24 Aug '13

changeset bec0134d725b in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=bec0134d725b description: [Darlan] Update Hebrew translation diffstat: po/he.po | 860 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 437 insertions(+), 423 deletions(-) diffs (truncated from 2522 to 300 lines): diff -r 45eb137aae4f -r bec0134d725b po/he.po --- a/po/he.po Fri Aug 16 10:09:41 2013 +0400 +++ b/po/he.po Fri Aug 16 10:14:37 2013 +0400 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-12 15:40+0300\n" -"PO-Revision-Date: 2013-08-12 16:09+0200\n" +"POT-Creation-Date: 2013-08-16 02:05+0000\n" +"PO-Revision-Date: 2013-08-16 08:26+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -185,9 +185,9 @@ #: ../data/gui/account_creation_wizard_window.ui.h:30 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 #: ../src/config.py:1248 ../src/config.py:1262 ../src/config.py:1267 -#: ../src/config.py:1315 ../src/config.py:1418 ../src/config.py:1733 -#: ../src/config.py:1738 ../src/config.py:2314 ../src/config.py:2393 -#: ../src/config.py:2406 ../src/config.py:3682 ../src/config.py:3757 +#: ../src/config.py:1315 ../src/config.py:1418 ../src/config.py:1737 +#: ../src/config.py:1742 ../src/config.py:2334 ../src/config.py:2415 +#: ../src/config.py:2430 ../src/config.py:3711 ../src/config.py:3786 #: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 #: ../src/dialogs.py:536 ../src/roster_window.py:3149 #: ../src/roster_window.py:3155 ../src/roster_window.py:3160 @@ -199,14 +199,14 @@ msgstr "חשבונות" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3509 -#: ../src/dialogs.py:3555 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524 +#: ../src/dialogs.py:3570 msgid "Add" msgstr "הוסף" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3513 -#: ../src/dialogs.py:3610 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528 +#: ../src/dialogs.py:3625 msgid "Delete" msgstr "מחק" @@ -444,8 +444,8 @@ msgid "Connection" msgstr "חיבור" -#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1829 -#: ../src/config.py:2407 +#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1835 +#: ../src/config.py:2431 msgid "No key selected" msgstr "לא נבחר מפתח" @@ -522,7 +522,7 @@ msgstr "דוא״ל:" #: ../data/gui/accounts_window.ui.h:67 -#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1856 +#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1862 #: ../src/dialogs.py:841 msgid "Jabber ID:" msgstr "מזהה Jabber:" @@ -614,7 +614,7 @@ msgstr "בדוק פעם נוספת" #: ../data/gui/adhoc_commands_window.ui.h:5 -msgid "Please wait while the command is sending..." +msgid "Please wait while the command is being sent..." msgstr "אנא המתן בזמן שהפקודה נשלחת..." #: ../data/gui/adhoc_commands_window.ui.h:6 @@ -1047,16 +1047,16 @@ msgstr "ה_רשמה" #: ../data/gui/contact_context_menu.ui.h:17 -msgid "_Allow him/her to see my status" -msgstr "_התר לאיש קשר זה לראות את המצב שלי" +msgid "_Allow contact to see my status" +msgstr "הת_ר לאיש קשר לראות את המצב שלי" #: ../data/gui/contact_context_menu.ui.h:18 -msgid "A_sk to see his/her status" -msgstr "_בקש להציג את המצב של איש קשר זה" +msgid "A_sk to see contact status" +msgstr "_בקש להציג מצב איש קשר" #: ../data/gui/contact_context_menu.ui.h:19 -msgid "_Forbid him/her to see my status" -msgstr "_מנע מאיש קשר זה מלראות את המצב שלי" +msgid "_Forbid contact to see my status" +msgstr "_מנע מאיש קשר מלראות את המצב שלי" #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5817 @@ -1161,7 +1161,7 @@ msgstr "ה_שהה" #: ../data/gui/filetransfers.ui.h:12 -msgid "Cancels the selected file transfer and removes incomplete file" +msgid "Cancels the selected file transfer and removes incomplete files" msgstr "ביטול העברת הקובץ הנבחר והסרת קבצים לא שלמים" #: ../data/gui/filetransfers.ui.h:13 @@ -1180,7 +1180,7 @@ msgid "_Continue" msgstr "ה_משך" -#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3343 +#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3345 #: ../src/filetransfers_window.py:213 msgid "_Open Containing Folder" msgstr "_פתח תיקיה מכילה" @@ -1294,7 +1294,7 @@ msgid "_Request Voice" msgstr "_בקש ביטוי" -#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1839 +#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843 msgid "_Bookmark" msgstr "_סמן" @@ -1440,7 +1440,7 @@ msgstr "חפש בתוך _תאריך" #: ../data/gui/history_window.ui.h:7 -msgid "searching only in the selected day " +msgid "Searching only in the selected day " msgstr "חיפוש בתוך היום הנבחר בלבד" #: ../data/gui/history_window.ui.h:8 @@ -1512,7 +1512,7 @@ msgid "require" msgstr "דרוש" -#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2401 +#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416 msgid "Join Group Chat" msgstr "הצטרף אל שיחת קבוצה" @@ -1543,7 +1543,7 @@ msgid "_Bookmark this room" msgstr "_סמן את חדר זה" -#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1846 +#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1852 msgid "Server:" msgstr "שרת:" @@ -1551,8 +1551,8 @@ msgid "Bro_wse Rooms" msgstr "_עיון ברשימת חדרים" -#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3378 -#: ../src/disco.py:1392 ../src/disco.py:1843 +#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3380 +#: ../src/disco.py:1396 ../src/disco.py:1847 msgid "_Join" msgstr "_כנס" @@ -1968,7 +1968,7 @@ # BUG: a dot at the end #: ../data/gui/preferences_window.ui.h:50 msgid "" -"If checked, Gajim will also include information about the sender of the new " +"If checked, Gajim will also include information about the sender of new " "emails" msgstr "" "במידה ואפשרות זו מסומנת, Gajim יכיל גם מידע אודות הממען של ההודעות " @@ -2150,7 +2150,7 @@ #: ../data/gui/preferences_window.ui.h:88 msgid "" -"If checked, Gajim will use protocol-specific status icons. (eg. A contact " +"If checked, Gajim will use protocol-specific status icons. (e.g. A contact " "from MSN will have the equivalent msn icon for status online, away, busy, " "etc...)" msgstr "" @@ -2380,7 +2380,7 @@ msgid "Advanced" msgstr "מתקדם" -#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4106 +#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121 msgid "Privacy List" msgstr "רשימת פרטיות" @@ -2673,7 +2673,7 @@ msgid "Add _Contact..." msgstr "הוספת _איש קשר..." -#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1554 +#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558 msgid "_Edit" msgstr "ע_ריכה" @@ -2760,7 +2760,7 @@ msgid "_Information" msgstr "_מידע" -#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1404 +#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408 msgid "_Search" msgstr "_חפש" @@ -3004,6 +3004,10 @@ msgid "A GTK+ Jabber client" msgstr "לקוח ג׳אבּר ‭GTK+‬" +#: ../data/gajim.desktop.in.in.h:4 +msgid "chat;messaging;im;jabber;xmpp;bonjour;voip" +msgstr "" + #: ../src/adhoc_commands.py:325 msgid "Cancel confirmation" msgstr "אימות ביטול" @@ -3157,8 +3161,8 @@ #. Add to roster #: ../src/chat_control.py:1729 ../src/common/contacts.py:152 #: ../src/common/contacts.py:273 ../src/common/helpers.py:67 -#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2295 -#: ../src/dialogs.py:2324 ../src/dialogs.py:3536 ../src/gui_interface.py:485 +#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310 +#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485 #: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421 #: ../src/roster_window.py:771 ../src/roster_window.py:1734 #: ../src/roster_window.py:1736 ../src/roster_window.py:2084 @@ -3169,12 +3173,12 @@ #. change tooltip text for audio and video buttons if python-farstream is #. not installed #: ../src/chat_control.py:1754 -#: ../src/command_system/implementation/standard.py:214 +#: ../src/command_system/implementation/standard.py:215 msgid "Toggle audio session" msgstr "הפעלת סשן שמע" #: ../src/chat_control.py:1755 -#: ../src/command_system/implementation/standard.py:224 +#: ../src/command_system/implementation/standard.py:225 msgid "Toggle video session" msgstr "הפעלת סשן וידאו" @@ -3210,7 +3214,7 @@ msgstr "%(nickname)s מתוך שיחת קבוצה %(room_name)s" #. No key assigned nor a key is used by remote contact -#: ../src/chat_control.py:2223 ../src/dialogs.py:5177 +#: ../src/chat_control.py:2223 ../src/dialogs.py:5194 msgid "No OpenPGP key assigned" msgstr "לא הוקצה מפתח OpenPGP" @@ -3322,22 +3326,22 @@ msgid "You just received a new message from \"%s\"" msgstr "זה עתה קיבלת הודעה חדשה מן \"%s\"" -#: ../src/chat_control.py:2792 +#: ../src/chat_control.py:2793 msgid "" "If you close this tab and you have history disabled, this message will be " "lost." msgstr "" "אם כרטיסייה זו תיסגר ובמידה ורשימת היסטוריה מנוטרלת אצלך. הודעה זו תאבד." -#: ../src/chat_control.py:2959 ../src/common/connection.py:523 +#: ../src/chat_control.py:2961 ../src/common/connection.py:523 #: ../src/common/connection_handlers.py:1145 #: ../src/common/connection_handlers.py:1269 #: ../src/common/connection_handlers_events.py:913 -#: ../src/common/logger.py:1160 ../src/gajim.py:216 ../src/session.py:98 +#: ../src/common/logger.py:1161 ../src/gajim.py:216 ../src/session.py:98 msgid "Database Error" msgstr "שגיאת מסד נתונים" -#: ../src/chat_control.py:2960 +#: ../src/chat_control.py:2962 #, python-format msgid "" "The database file (%s) cannot be read. Try to repair it or remove it (all " @@ -3346,7 +3350,7 @@ "קובץ מסד הנתונים (%s) לא ניתן לקריאה. נסה לתקנו או להסירו (כל ההיסטוריה " "תאבד)." -#: ../src/chat_control.py:3197 ../src/gui_interface.py:1161 +#: ../src/chat_control.py:3199 ../src/gui_interface.py:1161 #, python-format msgid "" "Unable to decrypt message from %s\n" @@ -3355,52 +3359,52 @@ "אין אפשרות לפענח הודעה מאת %s\n" "ייתכן כי הודעה זו נפגמה." -#: ../src/chat_control.py:3254 +#: ../src/chat_control.py:3256 #, python-format msgid "%(name)s is now %(status)s" msgstr "%(name)s מצוי/ה כעת במצב %(status)s"

1 0

gajim: [x11term] prevent traceback
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 48abad09dcf0 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=48abad09dcf0 description: [x11term] prevent traceback diffstat: src/conversation_textview.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r bec0134d725b -r 48abad09dcf0 src/conversation_textview.py --- a/src/conversation_textview.py Fri Aug 16 10:14:37 2013 +0400 +++ b/src/conversation_textview.py Fri Aug 16 09:21:32 2013 +0200 @@ -353,6 +353,7 @@ # use it for hr too self.tv.focus_out_line_pixbuf = ConversationTextview.FOCUS_OUT_LINE_PIXBUF self.smooth_id = None + self.just_cleared = False def del_handlers(self): for i in self.handlers.keys():

1 0

gajim: show scrollbar only when needed. Fixes #7239
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset dc6083e5e20e in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=dc6083e5e20e description: show scrollbar only when needed. Fixes #7239 diffstat: data/gui/preferences_window.ui | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 48abad09dcf0 -r dc6083e5e20e data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Fri Aug 16 09:21:32 2013 +0200 +++ b/data/gui/preferences_window.ui Fri Aug 16 09:25:07 2013 +0200 @@ -1351,6 +1351,8 @@ <object class="GtkScrolledWindow" id="scrolledwindow22"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="msg_treeview">

1 0

gajim: we release under GPL v3
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset aba205fac587 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=aba205fac587 description: we release under GPL v3 diffstat: src/common/jingle.py | 10 ++++++---- src/common/jingle_content.py | 10 ++++++---- src/common/jingle_ftstates.py | 10 ++++++---- src/common/jingle_rtp.py | 10 ++++++---- src/common/jingle_session.py | 10 ++++++---- src/common/jingle_transport.py | 10 ++++++---- src/common/multimedia_helpers.py | 10 ++++++---- 7 files changed, 42 insertions(+), 28 deletions(-) diffs (175 lines): diff -r dc6083e5e20e -r aba205fac587 src/common/jingle.py --- a/src/common/jingle.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. """ Handles the jingle signalling protocol """ diff -r dc6083e5e20e -r aba205fac587 src/common/jingle_content.py --- a/src/common/jingle_content.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_content.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. """ Handles Jingle contents (XEP 0166) diff -r dc6083e5e20e -r aba205fac587 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_ftstates.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. import gajim import nbxmpp diff -r dc6083e5e20e -r aba205fac587 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_rtp.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. """ Handles Jingle RTP sessions (XEP 0167) diff -r dc6083e5e20e -r aba205fac587 src/common/jingle_session.py --- a/src/common/jingle_session.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_session.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. """ Handles Jingle sessions (XEP 0166) diff -r dc6083e5e20e -r aba205fac587 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_transport.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. """ Handles Jingle Transports (currently only ICE-UDP) diff -r dc6083e5e20e -r aba205fac587 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/multimedia_helpers.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2009 Thibaut GIRKA <thib AT sitedethib.com> ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. import gst

1 0

gajim: [Darlan] improve some strings. Fixes #7239
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset ad49c4bc382d in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ad49c4bc382d description: [Darlan] improve some strings. Fixes #7239 diffstat: data/gui/adhoc_commands_window.ui | 2 +- data/gui/filetransfers.ui | 2 +- data/gui/history_window.ui | 2 +- data/gui/preferences_window.ui | 4 ++-- src/common/config.py | 28 ++++++++++++++-------------- src/common/connection.py | 2 +- src/config.py | 2 +- src/dialogs.py | 6 +++--- src/groupchat_control.py | 4 ++-- src/profile_window.py | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diffs (243 lines): diff -r 4da818156da7 -r ad49c4bc382d data/gui/adhoc_commands_window.ui --- a/data/gui/adhoc_commands_window.ui Thu Aug 15 10:00:42 2013 +0200 +++ b/data/gui/adhoc_commands_window.ui Thu Aug 15 10:33:27 2013 +0200 @@ -171,7 +171,7 @@ <child> <object class="GtkLabel" id="notes_label"> <property name="visible">True</property> - <property name="label" translatable="yes">Please wait while the command is sending...</property> + <property name="label" translatable="yes">Please wait while the command is being sent...</property> <property name="selectable">True</property> </object> <packing> diff -r 4da818156da7 -r ad49c4bc382d data/gui/filetransfers.ui --- a/data/gui/filetransfers.ui Thu Aug 15 10:00:42 2013 +0200 +++ b/data/gui/filetransfers.ui Thu Aug 15 10:33:27 2013 +0200 @@ -196,7 +196,7 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Cancels the selected file transfer and removes incomplete file</property> + <property name="tooltip_text" translatable="yes">Cancels the selected file transfer and removes incomplete files</property> <property name="use_stock">True</property> <child internal-child="accessible"> <object class="AtkObject" id="cancel_button-atkobject"> diff -r 4da818156da7 -r ad49c4bc382d data/gui/history_window.ui --- a/data/gui/history_window.ui Thu Aug 15 10:00:42 2013 +0200 +++ b/data/gui/history_window.ui Thu Aug 15 10:33:27 2013 +0200 @@ -86,7 +86,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">searching only in the selected day </property> + <property name="tooltip_text" translatable="yes">Searching only in the selected day </property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> </object> diff -r 4da818156da7 -r ad49c4bc382d data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Thu Aug 15 10:00:42 2013 +0200 +++ b/data/gui/preferences_window.ui Thu Aug 15 10:33:27 2013 +0200 @@ -669,7 +669,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will also include information about the sender of the new emails</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will also include information about the sender of new emails</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_notify_gmail_extra_checkbutton_toggled"/> @@ -1530,7 +1530,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (e.g. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/> diff -r 4da818156da7 -r ad49c4bc382d src/common/config.py --- a/src/common/config.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/common/config.py Thu Aug 15 10:33:27 2013 +0200 @@ -80,10 +80,10 @@ 'show_transports_group': [ opt_bool, True ], 'autoaway': [ opt_bool, True ], 'autoawaytime': [ opt_int, 5, _('Time in minutes, after which your status changes to away.') ], - 'autoaway_message': [ opt_str, _('$S (Away as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoaway time.') ], + 'autoaway_message': [ opt_str, _('$S (Away as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoawaytime.') ], 'autoxa': [ opt_bool, True ], 'autoxatime': [ opt_int, 15, _('Time in minutes, after which your status changes to not available.') ], - 'autoxa_message': [ opt_str, _('$S (Not available as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoxa time.') ], + 'autoxa_message': [ opt_str, _('$S (Not available as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoxatime.') ], 'ask_online_status': [ opt_bool, False ], 'ask_offline_status': [ opt_bool, False ], 'trayicon': [opt_str, 'always', _("When to show notification area icon. Can be 'never', 'on_event', 'always'."), False], @@ -157,7 +157,7 @@ 'single-msg-y-position': [opt_int, 0], 'single-msg-width': [opt_int, 400], 'single-msg-height': [opt_int, 280], - 'save-roster-position': [opt_bool, True, _('If true, Gajim will save roster position when hiding roster, and restore it when showing roster.')], + 'save-roster-position': [opt_bool, True, _('If True, Gajim will save roster position when hiding roster, and restore it when showing roster.')], 'roster_x-position': [ opt_int, 0 ], 'roster_y-position': [ opt_int, 0 ], 'roster_width': [ opt_int, 200 ], @@ -177,10 +177,10 @@ 'notify_on_new_gmail_email_command': [ opt_str, '', _('Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q') ], 'use_gpg_agent': [ opt_bool, False ], 'change_roster_title': [ opt_bool, True, _('Add * and [n] in roster title?')], - 'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened.')], + 'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened?')], 'restore_timeout': [opt_int, 60, _('How many minutes should last lines from previous conversation last.')], 'muc_restore_lines': [opt_int, 20, _('How many lines to request from server when entering a groupchat. -1 means no limit')], - 'muc_restore_timeout': [opt_int, 60, _('How many minutes back to request logs when a entering a groupchat. -1 means no limit')], + 'muc_restore_timeout': [opt_int, 60, _('How many minutes back to request logs when entering a groupchat. -1 means no limit')], 'muc_autorejoin_timeout': [opt_int, 1, _('How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining.')], 'muc_autorejoin_on_kick': [opt_bool, False, _('Should autorejoin be activated when we are being kicked from a conference?')], 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour).')], @@ -198,9 +198,9 @@ 'autodetect_browser_mailer': [opt_bool, True, '', True], 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (print_time==sometimes), print it every x minutes.')], 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], - 'confirm_close_muc_rooms': [opt_str, '', _('Always ask before closing group chat tab/window in this space separated list of group chat jids.')], - 'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask before closing group chat tab/window in this space separated list of group chat jids.')], - 'confirm_close_multiple_tabs': [opt_bool, True, _('Ask before closing tabbed chat window if there are control that can loose data (chat, private chat, groupchat that will not be minimized)')], + 'confirm_close_muc_rooms': [opt_str, '', _('Always ask before closing group chat tab/window in this space separated list of group chat JIDs.')], + 'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask before closing group chat tab/window in this space separated list of group chat JIDs.')], + 'confirm_close_multiple_tabs': [opt_bool, True, _('Ask before closing tabbed chat window if there are controls that can lose data (chat, private chat, groupchat that will not be minimized)')], 'notify_on_file_complete': [opt_bool, True], 'file_transfers_port': [opt_int, 28011], 'ft_add_hosts_to_send': [opt_str, '', _('Comma separated list of hosts that we send, in addition of local interfaces, for File Transfer in case of address translation/port forwarding.')], @@ -256,7 +256,7 @@ 'avatar_position_in_roster': [opt_str, 'right', _('Define the position of the avatar in roster. Can be left or right'), True], 'ask_avatars_on_startup': [opt_bool, True, _('If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old.')], 'print_status_in_chats': [opt_bool, True, _('If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message.')], - 'print_status_in_muc': [opt_str, 'in_and_out', _('can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')], + 'print_status_in_muc': [opt_str, 'in_and_out', _('Can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')], 'log_contact_status_changes': [opt_bool, False], 'log_xhtml_messages': [opt_bool, False, _('Log XHTML messages instead of plain text messages.')], 'just_connected_bg_color': [opt_str, '#adc3c6', _('Background color of contacts when they just signed in.')], @@ -270,7 +270,7 @@ 'send_sha_in_gc_presence': [opt_bool, True, _('Jabberd1.4 does not like sha info when one join a password protected group chat. Turn this option to False to stop sending sha info in group chat presences.')], 'one_message_window': [opt_str, 'always', #always, never, peracct, pertype should not be translated - _('Controls the window where new messages are placed.\n\'always\' - All messages are sent to a single window.\n\'always_with_roster\' - Like \'always\' but the messages are in a single window along with the roster.\n\'never\' - All messages get their own window.\n\'peracct\' - Messages for each account are sent to a specific window.\n\'pertype\' - Each message type (e.g., chats vs. groupchats) are sent to a specific window.')], + _('Controls the window where new messages are placed.\n\'always\' - All messages are sent to a single window.\n\'always_with_roster\' - Like \'always\' but the messages are in a single window along with the roster.\n\'never\' - All messages get their own window.\n\'peracct\' - Messages for each account are sent to a specific window.\n\'pertype\' - Each message type (e.g. chats vs. groupchats) is sent to a specific window.')], 'show_roster_on_startup':[opt_str, 'always', _('Show roster on startup.\n\'always\' - Always show roster.\n\'never\' - Never show roster.\n\'last_state\' - Restore the last state roster.')], 'show_avatar_in_chat': [opt_bool, True, _('If False, you will no longer see the avatar in the chat window.')], 'escape_key_closes': [opt_bool, True, _('If True, pressing the escape key closes a tab/window.')], @@ -297,7 +297,7 @@ 'attach_notifications_to_systray': [opt_bool, False, _('If True, notification windows from notification-daemon will be attached to notification icon.')], 'check_idle_every_foo_seconds': [opt_int, 2, _('Choose interval between 2 checks of idleness.')], 'uri_schemes': [opt_str, 'aaa:// aaas:// acap:// cap:// cid: crid:// data: dav: dict:// dns: fax: file:/ ftp:// geo: go: gopher:// h323: http:// https:// iax: icap:// im: imap:// info: ipp:// iris: iris.beep: iris.xpc: iris.xpcs: iris.lwz: ldap:// mid: modem: msrp:// msrps:// mtqp:// mupdate:// news: nfs:// nntp:// opaquelocktoken: pop:// pres: prospero:// rtsp:// service: shttp:// sip: sips: sms: snmp:// soap.beep:// soap.beeps:// tag: tel: telnet:// tftp:// thismessage:/ tip:// tv: urn:// vemmi:// xmlrpc.beep:// xmlrpc.beeps:// z39.50r:// z39.50s:// about: apt: cvs:// daap:// ed2k:// feed: fish:// git:// iax2: irc:// ircs:// ldaps:// magnet: mms:// rsync:// ssh:// svn:// sftp:// smb:// webcal://', _('Valid uri schemes. Only schemes in this list will be accepted as "real" uri. (mailto and xmpp are handled separately)'), True], - 'ask_offline_status_on_connection': [ opt_bool, False, _('Ask offline status message to all offline contacts when connection to an accoutn is established. WARNING: This causes a lot of requests to be sent!') ], + 'ask_offline_status_on_connection': [ opt_bool, False, _('Ask offline status message to all offline contacts when connection to an account is established. WARNING: This causes a lot of requests to be sent!') ], 'shell_like_completion': [ opt_bool, False, _('If True, completion in groupchats will be like a shell auto-completion')], 'show_self_contact': [opt_str, 'when_other_resource', _('When is self contact row displayed. Can be "always", "when_other_resource" or "never"'), True], 'audio_input_device': [opt_str, 'autoaudiosrc ! volume name=gajim_vol'], @@ -368,7 +368,7 @@ # send keepalive every N seconds of inactivity 'keep_alive_every_foo_secs': [ opt_int, 55 ], 'ping_alive_every_foo_secs': [ opt_int, 120 ], - 'time_for_ping_alive_answer': [ opt_int, 60, _('How many seconds to wait for the answer of ping alive packet before we try to reconnect.') ], + 'time_for_ping_alive_answer': [ opt_int, 60, _('How many seconds to wait for the answer of ping alive packet before we try to reconnect?') ], # try for 1 minutes before giving up (aka. timeout after those seconds) 'try_connecting_for_foo_secs': [ opt_int, 60 ], 'http_auth': [opt_str, 'ask'], # yes, no, ask @@ -412,7 +412,7 @@ 'oauth2_refresh_token': [ opt_str, '', _('Latest token for Oauth2 authentication.')], 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for Oauth2 authentication.')], 'oauth2_redirect_url': [ opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for Oauth2 authentication.')], - 'opened_chat_controls': [opt_str, '', _('Space separated list of jid for which we want to re-open a chat window on next startup.')], + 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDsfor which we want to re-open a chat window on next startup.')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ], @@ -481,7 +481,7 @@ 'rooms': ({ 'speller_language': [ opt_str, '', _('Language for which we want to check misspelled words')], 'muc_restore_lines': [opt_int, -2, _('How many lines to request from server when entering a groupchat. -1 means no limit, -2 means global value')], - 'muc_restore_timeout': [opt_int, -2, _('How many minutes back to request logs when a entering a groupchat. -1 means no limit, -2 means global value')], + 'muc_restore_timeout': [opt_int, -2, _('How many minutes back to request logs when entering a groupchat. -1 means no limit, -2 means global value')], }, {}), 'plugins': ({ 'active': [opt_bool, False, _('State whether plugins should be activated on startup (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], diff -r 4da818156da7 -r ad49c4bc382d src/common/connection.py --- a/src/common/connection.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/common/connection.py Thu Aug 15 10:33:27 2013 +0200 @@ -1460,7 +1460,7 @@ self.disconnect(on_purpose=True) gajim.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, title=_('Could not connect to "%s"') % self._hostname, - msg=_('Check your connection or try again later'))) + msg=_('Check your connection or try again later.'))) if self.on_connect_auth: self.on_connect_auth(None) self.on_connect_auth = None diff -r 4da818156da7 -r ad49c4bc382d src/config.py --- a/src/config.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/config.py Thu Aug 15 10:33:27 2013 +0200 @@ -2445,7 +2445,7 @@ return if not gajim.connections[self.current_account].vcard_supported: - dialogs.ErrorDialog(_("Your server doesn't support Vcard"), + dialogs.ErrorDialog(_("Your server doesn't support vCard"), _("Your server can't save your personal information.")) return diff -r 4da818156da7 -r ad49c4bc382d src/dialogs.py --- a/src/dialogs.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/dialogs.py Thu Aug 15 10:33:27 2013 +0200 @@ -2140,7 +2140,7 @@ except Exception: # invalid char ErrorDialog(_('Invalid nickname'), - _('The nickname has not allowed characters.')) + _('The nickname contains invalid characters.')) return self.on_ok(nick, self.is_checked()) @@ -2594,7 +2594,7 @@ nickname = helpers.parse_resource(nickname) except Exception: ErrorDialog(_('Invalid Nickname'), - _('The nickname has not allowed characters.')) + _('The nickname contains invalid characters.')) return user, server, resource = helpers.decompose_jid(room_jid) if not user or not server or resource: @@ -2605,7 +2605,7 @@ room_jid = helpers.parse_jid(room_jid) except Exception: ErrorDialog(_('Invalid group chat Jabber ID'), - _('The group chat Jabber ID has not allowed characters.')) + _('The group chat Jabber ID contains invalid characters.')) return if gajim.contacts.get_contact(self.account, room_jid) and \ diff -r 4da818156da7 -r ad49c4bc382d src/groupchat_control.py --- a/src/groupchat_control.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/groupchat_control.py Thu Aug 15 10:33:27 2013 +0200 @@ -1288,9 +1288,9 @@ changes.append(_('Any occupant is allowed to see your full JID')) self.is_anonymous = False if '102' in obj.status_code: - changes.append(_('Room now shows unavailable member')) + changes.append(_('Room now shows unavailable members')) if '103' in obj.status_code: - changes.append(_('room now does not show unavailable members')) + changes.append(_('Room now does not show unavailable members')) if '104' in obj.status_code: changes.append(_('A non-privacy-related room configuration change ' 'has occurred')) diff -r 4da818156da7 -r ad49c4bc382d src/profile_window.py --- a/src/profile_window.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/profile_window.py Thu Aug 15 10:33:27 2013 +0200 @@ -367,7 +367,7 @@ return if gajim.connections[self.account].connected < 2: dialogs.ErrorDialog(_('You are not connected to the server'), - _('Without a connection you can not publish your contact ' + _('Without a connection, you can not publish your contact ' 'information.')) return vcard_ = self.make_vcard()

1 0

gajim: Avoid him/her in strings. Fixes #7390
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset e4ef04d4509e in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=e4ef04d4509e description: Avoid him/her in strings. Fixes #7390 diffstat: data/gui/contact_context_menu.ui | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (32 lines): diff -r ad49c4bc382d -r e4ef04d4509e data/gui/contact_context_menu.ui --- a/data/gui/contact_context_menu.ui Thu Aug 15 10:33:27 2013 +0200 +++ b/data/gui/contact_context_menu.ui Thu Aug 15 10:36:25 2013 +0200 @@ -168,7 +168,7 @@ <object class="GtkMenu" id="subscription_menuitem_menu"> <child> <object class="GtkImageMenuItem" id="resend_authorization_to_menuitem"> - <property name="label" translatable="yes">_Allow him/her to see my status</property> + <property name="label" translatable="yes">_Allow contact to see my status</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image15</property> @@ -177,7 +177,7 @@ </child> <child> <object class="GtkImageMenuItem" id="rerequest_authorization_from_menuitem"> - <property name="label" translatable="yes">A_sk to see his/her status</property> + <property name="label" translatable="yes">A_sk to see contact status</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image16</property> @@ -185,8 +185,8 @@ </object> </child> <child> - <object class="GtkImageMenuItem" id="forbid_him/her_to_see_my_status1"> - <property name="label" translatable="yes">_Forbid him/her to see my status</property> + <object class="GtkImageMenuItem" id="forbid_contact_to_see_my_status1"> + <property name="label" translatable="yes">_Forbid contact to see my status</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image17</property>

1 0

gajim: Auto clear/hide search when open a chat. Fixes #7423
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 6df33c5eb1e5 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=6df33c5eb1e5 description: Auto clear/hide search when open a chat. Fixes #7423 diffstat: src/roster_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r e4ef04d4509e -r 6df33c5eb1e5 src/roster_window.py --- a/src/roster_window.py Thu Aug 15 10:36:25 2013 +0200 +++ b/src/roster_window.py Thu Aug 15 12:45:38 2013 +0400 @@ -4041,6 +4041,8 @@ When an iter is activated (double-click or single click if gnome is set this way) """ + if self.rfilter_enabled: + self.disable_rfilter() model = self.modelfilter account = model[path][C_ACCOUNT].decode('utf-8') type_ = model[path][C_TYPE] @@ -4107,8 +4109,6 @@ """ When an iter is double clicked: open the first event window """ - if self.rfilter_enabled: - self.disable_rfilter() if not gajim.single_click: self.on_row_activated(widget, path)

1 0

gajim: Auto clear/hide search when open a chat.
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 59a212ecee5e in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=59a212ecee5e description: Auto clear/hide search when open a chat. diffstat: src/roster_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 6df33c5eb1e5 -r 59a212ecee5e src/roster_window.py --- a/src/roster_window.py Thu Aug 15 12:45:38 2013 +0400 +++ b/src/roster_window.py Thu Aug 15 14:32:14 2013 +0400 @@ -4041,8 +4041,6 @@ When an iter is activated (double-click or single click if gnome is set this way) """ - if self.rfilter_enabled: - self.disable_rfilter() model = self.modelfilter account = model[path][C_ACCOUNT].decode('utf-8') type_ = model[path][C_TYPE] @@ -4052,6 +4050,8 @@ else: self.tree.expand_row(path, False) return + if self.rfilter_enabled: + self.disable_rfilter() jid = model[path][C_JID].decode('utf-8') resource = None contact = gajim.contacts.get_contact_with_highest_priority(account, jid)

1 0

gajim: prevent bug when forming a jid
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 938105bd5564 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=938105bd5564 description: prevent bug when forming a jid diffstat: src/common/stanza_session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 59a212ecee5e -r 938105bd5564 src/common/stanza_session.py --- a/src/common/stanza_session.py Thu Aug 15 14:32:14 2013 +0400 +++ b/src/common/stanza_session.py Thu Aug 15 14:38:59 2013 +0400 @@ -83,7 +83,7 @@ def get_to(self): to = str(self.jid) - return gajim.get_jid_without_resource(to) + self.resource + return gajim.get_jid_without_resource(to) + '/' + self.resource def remove_events(self, types): """

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