Commits November 2011

commits@gajim.org

3 participants
55 discussions

gajim: call set_title on tooltip windows to prevent GTKWarning
by Yann Leboulanger 10 Nov '11

10 Nov '11

changeset 110725180dee in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=110725180dee description: call set_title on tooltip windows to prevent GTKWarning diffstat: src/tooltips.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 5c03b097e855 -r 110725180dee src/tooltips.py --- a/src/tooltips.py Thu Jun 16 18:59:21 2011 -0400 +++ b/src/tooltips.py Thu Nov 10 22:26:11 2011 +0100 @@ -85,6 +85,7 @@ Create a popup window each time tooltip is requested """ self.win = gtk.Window(gtk.WINDOW_POPUP) + self.win.set_title('tooltip') self.win.set_border_width(3) self.win.set_resizable(False) self.win.set_name('gtk-tooltips')

1 0

gajim: Update russian translation
by Fomin Denis 10 Nov '11

10 Nov '11

changeset 8a94c1a25462 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8a94c1a25462 description: Update russian translation diffstat: po/ru.po | 798 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 407 insertions(+), 391 deletions(-) diffs (truncated from 2113 to 300 lines): diff -r c42677f32401 -r 8a94c1a25462 po/ru.po --- a/po/ru.po Thu Nov 10 20:39:24 2011 +0100 +++ b/po/ru.po Thu Nov 10 23:19:39 2011 +0300 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-08 00:24+0400\n" -"PO-Revision-Date: 2011-11-10 21:47+0300\n" +"POT-Creation-Date: 2011-11-11 00:06+0400\n" +"PO-Revision-Date: 2011-11-11 00:17+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -126,15 +126,18 @@ #: ../data/gui/account_creation_wizard_window.ui.h:17 #: ../data/gui/accounts_window.ui.h:41 #: ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1301 -#: ../src/config.py:1404 -#: ../src/config.py:1715 -#: ../src/config.py:1720 -#: ../src/config.py:2296 -#: ../src/config.py:2375 -#: ../src/config.py:2388 -#: ../src/config.py:3667 -#: ../src/config.py:3742 +#: ../src/config.py:1264 +#: ../src/config.py:1278 +#: ../src/config.py:1283 +#: ../src/config.py:1331 +#: ../src/config.py:1434 +#: ../src/config.py:1745 +#: ../src/config.py:1750 +#: ../src/config.py:2326 +#: ../src/config.py:2405 +#: ../src/config.py:2418 +#: ../src/config.py:3697 +#: ../src/config.py:3772 #: ../src/dialogs.py:311 #: ../src/dialogs.py:313 #: ../src/dialogs.py:519 @@ -317,8 +320,8 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:26 #: ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1148 -#: ../src/common/helpers.py:1160 +#: ../src/common/helpers.py:1159 +#: ../src/common/helpers.py:1171 #: ../src/notify.py:314 #: ../src/notify.py:337 #: ../src/notify.py:387 @@ -374,7 +377,7 @@ #: ../data/gui/accounts_window.ui.h:37 #: ../data/gui/zeroconf_information_window.ui.h:4 -#: ../src/config.py:1838 +#: ../src/config.py:1868 #: ../src/dialogs.py:837 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -389,8 +392,8 @@ msgstr "_Объединить учетные записи" #: ../data/gui/accounts_window.ui.h:40 -#: ../src/config.py:1811 -#: ../src/config.py:2389 +#: ../src/config.py:1841 +#: ../src/config.py:2419 msgid "No key selected" msgstr "Не выбран ключ" @@ -481,6 +484,7 @@ msgstr "_Хост: " #: ../data/gui/accounts_window.ui.h:64 +#: ../data/gui/preferences_window.ui.h:133 msgid "_Manage..." msgstr "_Управление..." @@ -510,7 +514,7 @@ msgstr "Добавить новый контакт" #: ../data/gui/add_new_contact_window.ui.h:4 -#: ../src/common/helpers.py:1339 +#: ../src/common/helpers.py:1350 msgid "I would like to add you to my contact list." msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?" @@ -1497,7 +1501,7 @@ msgstr "Комната:" #: ../data/gui/join_groupchat_window.ui.h:9 -#: ../src/config.py:1828 +#: ../src/config.py:1858 msgid "Server:" msgstr "Сервер:" @@ -1847,7 +1851,7 @@ #: ../data/gui/preferences_window.ui.h:46 #: ../src/config.py:170 -#: ../src/config.py:680 +#: ../src/config.py:682 msgid "Disabled" msgstr "Отключены" @@ -1892,142 +1896,146 @@ msgstr "Gajim будет уведомлять вас об отсоединившемся контакте с помощью сообщения в правом нижнем углу экрана" #: ../data/gui/preferences_window.ui.h:58 +msgid "Global proxy:" +msgstr "Глобальный прокси:" + +#: ../data/gui/preferences_window.ui.h:59 msgid "Hide all buttons in chat windows" msgstr "Не показывать кнопки в окнах чата" -#: ../data/gui/preferences_window.ui.h:59 +#: ../data/gui/preferences_window.ui.h:60 msgid "If checked, Gajim will allow others to detect the operation system you are using" msgstr "Если отмечено, то Gajim будет разрешать определять операционную систему, которую вы используете" -#: ../data/gui/preferences_window.ui.h:60 +#: ../data/gui/preferences_window.ui.h:61 msgid "If checked, Gajim will allow others to detect the time on your system" msgstr "Если отмечено, то Gajim будет разрешать определять время в системе, которую вы используете" -#: ../data/gui/preferences_window.ui.h:61 +#: ../data/gui/preferences_window.ui.h:62 msgid "If checked, Gajim will also include information about the sender of the new emails" msgstr "Если отмечено, то Gajim будет включать информацию об отправителе новых писем." -#: ../data/gui/preferences_window.ui.h:62 +#: ../data/gui/preferences_window.ui.h:63 msgid "If checked, Gajim will change status to Away when the computer is unused." msgstr "Если отмечено, то Gajim изменит статус на Away, если компьютер не используется." -#: ../data/gui/preferences_window.ui.h:63 +#: ../data/gui/preferences_window.ui.h:64 msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer" msgstr "Если отмечено, Gajim будет менять статус на Недоступен, если компьютер долго не используется" -#: ../data/gui/preferences_window.ui.h:64 +#: ../data/gui/preferences_window.ui.h:65 msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats" msgstr "Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и в окнах комнат" -#: ../data/gui/preferences_window.ui.h:65 +#: ../data/gui/preferences_window.ui.h:66 msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats" msgstr "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под его именем в окне ростера и в окнах комнат" -#: ../data/gui/preferences_window.ui.h:66 +#: ../data/gui/preferences_window.ui.h:67 msgid "If checked, Gajim will display the activity of contacts in the roster window" msgstr "Если отмечено, то Gajim будет показывать занятия контактов в окне ростера" -#: ../data/gui/preferences_window.ui.h:67 +#: ../data/gui/preferences_window.ui.h:68 msgid "If checked, Gajim will display the location of contacts in the roster window" msgstr "Если отмечено, то Gajim будет показывать местоположение контактов в окне ростера" -#: ../data/gui/preferences_window.ui.h:68 +#: ../data/gui/preferences_window.ui.h:69 msgid "If checked, Gajim will display the mood of contacts in the roster window" msgstr "Если отмечено, то Gajim будет показывать настроения контактов в окне ростера" -#: ../data/gui/preferences_window.ui.h:69 +#: ../data/gui/preferences_window.ui.h:70 msgid "If checked, Gajim will display the tunes of contacts in the roster window" msgstr "Если отмечено, то Gajim будет показывать tunes контактов в окне ростера" -#: ../data/gui/preferences_window.ui.h:70 +#: ../data/gui/preferences_window.ui.h:71 msgid "If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat." msgstr "Если отмечено, Gajim будет выделять орфографические ошибки в полях ввода окон чата. Если язык проверки явно не задан, будет использован язык по умолчанию для данного контакта или комнаты." -#: ../data/gui/preferences_window.ui.h:71 +#: ../data/gui/preferences_window.ui.h:72 msgid "If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster" msgstr "Отметьте эту опцию, только если кто-то не из вашего ростера спамит/достает вас. Используйте с осторожностью, потому что это заблокирует все сообщения от контактов не из вашего ростера." -#: ../data/gui/preferences_window.ui.h:72 +#: ../data/gui/preferences_window.ui.h:73 msgid "If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged." msgstr "Если отмечено, Gajim будет сохранять историю зашифрованных сообщений. Помните, что при использовании E2E шифрования удаленная сторона должна дать согласие на ведение истории, иначе сообщения не будут сохраняться." -#: ../data/gui/preferences_window.ui.h:73 +#: ../data/gui/preferences_window.ui.h:74 msgid "If checked, Gajim will show a notification when a new e-mail is received via GMail" msgstr "Если отмечено, то Gajim будет сообщать о новых письмах, полученных в GMail" -#: ../data/gui/preferences_window.ui.h:74 +#: ../data/gui/preferences_window.ui.h:75 msgid "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...)" msgstr "Если отмечено, то Gajim будет использовать для каждого протокола свои иконки (например, контакты из MSN будут иметь соответствующие иконки msn для статусов «в сети», «ушёл», «занят» и т.д.)" -#: ../data/gui/preferences_window.ui.h:75 +#: ../data/gui/preferences_window.ui.h:76 msgid "If enabled, Gajim will not ask for a status message. The specified default message will be used instead." msgstr "Если включено, Gajim не будет запрашивать сообщение о статусе. Вместо него будет использовано соответствующее сообщение по умолчанию." -#: ../data/gui/preferences_window.ui.h:76 +#: ../data/gui/preferences_window.ui.h:77 msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons" msgstr "Gajim заменяет текстовые смайлики, например ':)', их графическим или анимированным эквивалентом. Выберите «Отключены», чтобы этого не происходило." -#: ../data/gui/preferences_window.ui.h:77 +#: ../data/gui/preferences_window.ui.h:78 msgid "Last state" msgstr "Последнее состояние" -#: ../data/gui/preferences_window.ui.h:78 +#: ../data/gui/preferences_window.ui.h:79 msgid "Log _encrypted chat session" msgstr "Записывать в лог _шифрованные сообщения" -#: ../data/gui/preferences_window.ui.h:79 +#: ../data/gui/preferences_window.ui.h:80 msgid "Ma_ke message windows compact" msgstr "_Компактное окно сообщений" -#: ../data/gui/preferences_window.ui.h:80 +#: ../data/gui/preferences_window.ui.h:81 msgid "Ma_nage..." msgstr "_Управление..." -#: ../data/gui/preferences_window.ui.h:81 +#: ../data/gui/preferences_window.ui.h:82 msgid "Never" msgstr "Никогда" -#: ../data/gui/preferences_window.ui.h:82 +#: ../data/gui/preferences_window.ui.h:83 msgid "Notifications" msgstr "Уведомления" -#: ../data/gui/preferences_window.ui.h:83 +#: ../data/gui/preferences_window.ui.h:84 msgid "Notify me about contacts that sign _in" msgstr "Уведомлять о контактах, которые _вошли: " -#: ../data/gui/preferences_window.ui.h:84 +#: ../data/gui/preferences_window.ui.h:85 msgid "Notify me about contacts that sign _out" msgstr "Уведомлять о контактах, которые _вышли: " -#: ../data/gui/preferences_window.ui.h:85 +#: ../data/gui/preferences_window.ui.h:86 msgid "Notify me about it" msgstr "Уведомлять об этом" -#: ../data/gui/preferences_window.ui.h:86 +#: ../data/gui/preferences_window.ui.h:87 msgid "Notify on new _GMail email" msgstr "Сообщать о новых письмах в _Gmail" -#: ../data/gui/preferences_window.ui.h:87 +#: ../data/gui/preferences_window.ui.h:88 msgid "Only when pending events" msgstr "Только при пропущенных событиях" -#: ../data/gui/preferences_window.ui.h:88 +#: ../data/gui/preferences_window.ui.h:89 msgid "Personal Events" msgstr "Расширенные статусы" -#: ../data/gui/preferences_window.ui.h:89 +#: ../data/gui/preferences_window.ui.h:90 msgid "Play _sounds" msgstr "Проигрывать _звук" -#: ../data/gui/preferences_window.ui.h:90 +#: ../data/gui/preferences_window.ui.h:91 msgid "Pop it up" msgstr "Показать" -#: ../data/gui/preferences_window.ui.h:91 +#: ../data/gui/preferences_window.ui.h:92 msgid "Preferences" msgstr "Настройки" -#: ../data/gui/preferences_window.ui.h:92 +#: ../data/gui/preferences_window.ui.h:93 msgid "" "STUN server hostname. If none given, Gajim will try\n" "to discover one from server." @@ -2035,56 +2043,56 @@ "Адрес сервера STUN. Если не указано, Gajim попробует\n" "получить адрес с сервера." -#: ../data/gui/preferences_window.ui.h:94 +#: ../data/gui/preferences_window.ui.h:95 msgid "STUN server:" msgstr "STUN сервер:" -#: ../data/gui/preferences_window.ui.h:95 +#: ../data/gui/preferences_window.ui.h:96

1 0

gajim: add missin pref window changes. Fixes #7023
by Yann Leboulanger 10 Nov '11

10 Nov '11

changeset c42677f32401 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c42677f32401 description: add missin pref window changes. Fixes #7023 diffstat: data/gui/preferences_window.ui | 560 ++++++++++++++++++++++++++++++++-------- 1 files changed, 444 insertions(+), 116 deletions(-) diffs (truncated from 2341 to 300 lines): diff -r 60d50b443753 -r c42677f32401 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Thu Nov 10 20:37:48 2011 +0100 +++ b/data/gui/preferences_window.ui Thu Nov 10 20:39:24 2011 +0100 @@ -1,7 +1,20 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  + <requires lib="gtk+" version="2.22"/> + <object class="GtkAdjustment" id="adjustment1"> + <property name="lower">1</property> + <property name="upper">1440</property> + <property name="value">20</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="lower">1</property> + <property name="upper">720</property> + <property name="value">12</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> <object class="GtkListStore" id="liststore1"> <columns>  @@ -124,17 +137,29 @@ </row> </data> </object> + <object class="GtkListStore" id="liststore8"> + <columns> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0">None</col> + </row> + </data> + </object> <object class="GtkWindow" id="preferences_window"> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Preferences</property> <property name="role">preferences</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_preferences_window_destroy"/> - <signal name="key_press_event" handler="on_preferences_window_key_press_event"/> + <signal name="destroy" handler="on_preferences_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_preferences_window_key_press_event" swapped="no"/> <child> <object class="GtkVBox" id="vbox13"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkNotebook" id="preferences_notebook"> @@ -144,26 +169,28 @@ <child> <object class="GtkVBox" id="vbox41"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">12</property> - <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="show_avatars_in_roster_checkbutton"> @@ -172,9 +199,10 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display avatars of contacts in roster window and in group chats</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_avatars_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_avatars_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -189,9 +217,10 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_status_msgs_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_status_msgs_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -206,9 +235,10 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display the mood of contacts in the roster window</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_mood_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_mood_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -223,9 +253,10 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display the activity of contacts in the roster window</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_activity_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_activity_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -240,9 +271,10 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display the tunes of contacts in the roster window</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_tunes_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_tunes_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -258,9 +290,10 @@ <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display the location of contacts in the roster window</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_location_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_location_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -271,14 +304,17 @@ <child> <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label10"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Sort contacts by status</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -288,12 +324,14 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_sort_by_show_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_sort_by_show_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -303,16 +341,21 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_sort_by_show_in_muc_checkbutton_toggled"/> + <signal name="toggled" handler="on_sort_by_show_in_muc_checkbutton_toggled" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">6</property> </packing> </child> @@ -323,6 +366,7 @@ <child type="label"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes"><b>Roster Appearance</b></property> <property name="use_markup">True</property> @@ -331,24 +375,28 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkFrame" id="frame2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="n_rows">6</property> <property name="n_columns">2</property> @@ -357,6 +405,7 @@ <child> <object class="GtkLabel" id="label379"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">1</property> <property name="label" translatable="yes">_Window behavior:</property> @@ -372,7 +421,8 @@ <child> <object class="GtkComboBox" id="emoticons_combobox"> <property name="visible">True</property> - <signal name="changed" handler="on_emoticons_combobox_changed"/> + <property name="can_focus">False</property> + <signal name="changed" handler="on_emoticons_combobox_changed" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -382,10 +432,12 @@ <child> <object class="GtkEventBox" id="eventbox5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property> <child> <object class="GtkLabel" id="label381"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">1</property> <property name="label" translatable="yes">_Emoticons:</property> @@ -403,9 +455,10 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Hide all buttons in chat windows</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_compact_view_checkbutton_toggled"/> + <signal name="toggled" handler="on_compact_view_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="right_attach">2</property>

1 0

gajim: add a global proxy option that will apply to all account ...
by Yann Leboulanger 10 Nov '11

10 Nov '11

changeset 60d50b443753 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=60d50b443753 description: add a global proxy option that will apply to all account that don't have a proxy configured. Fixes #7023 diffstat: src/common/config.py | 1 + src/common/connection.py | 61 +++++++++++------------------------------------ src/common/helpers.py | 45 +++++++++++++++++++++++++++++++++++ src/config.py | 30 +++++++++++++++++++++++ 4 files changed, 90 insertions(+), 47 deletions(-) diffs (226 lines): diff -r 2bcc7d3feb56 -r 60d50b443753 src/common/config.py --- a/src/common/config.py Thu Nov 10 20:49:03 2011 +0300 +++ b/src/common/config.py Thu Nov 10 20:37:48 2011 +0100 @@ -290,6 +290,7 @@ 'use_stun_server': [opt_bool, False, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')], 'stun_server': [opt_str, '', _('STUN server to use when using jingle')], 'show_affiliation_in_groupchat': [opt_bool, True, _('If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')], + 'global_proxy': [opt_str, '', _('Proxy used for all outgoing connections if the account does not have a specific proxy configured')], } __options_per_key = { diff -r 2bcc7d3feb56 -r 60d50b443753 src/common/connection.py --- a/src/common/connection.py Thu Nov 10 20:49:03 2011 +0300 +++ b/src/common/connection.py Thu Nov 10 20:37:48 2011 +0100 @@ -981,7 +981,7 @@ if weightsum >= rndint: return host - def connect(self, data = None): + def connect(self, data=None): """ Start a connection to the Jabber server @@ -998,11 +998,19 @@ self.try_connecting_for_foo_secs = gajim.config.get_per('accounts', self.name, 'try_connecting_for_foo_secs') use_custom = False + proxy = helpers.get_proxy_info(self.name) elif data: hostname = data['hostname'] self.try_connecting_for_foo_secs = 45 p = data['proxy'] + if p and p in gajim.config.get_per('proxies'): + proxy = {} + proxyptr = gajim.config.get_per('proxies', p) + for key in proxyptr.keys(): + proxy[key] = proxyptr[key][1] + else: + proxy = None use_srv = True use_custom = data['use_custom_host'] if use_custom: @@ -1013,7 +1021,7 @@ usessl = gajim.config.get_per('accounts', self.name, 'usessl') self.try_connecting_for_foo_secs = gajim.config.get_per('accounts', self.name, 'try_connecting_for_foo_secs') - p = gajim.config.get_per('accounts', self.name, 'proxy') + proxy = helpers.get_proxy_info(self.name) use_srv = gajim.config.get_per('accounts', self.name, 'use_srv') use_custom = gajim.config.get_per('accounts', self.name, 'use_custom_host') @@ -1022,52 +1030,10 @@ # create connection if it doesn't already exist self.connected = 1 - if p and p in gajim.config.get_per('proxies'): - proxy = {} - proxyptr = gajim.config.get_per('proxies', p) - for key in proxyptr.keys(): - proxy[key] = proxyptr[key][1] - elif gajim.config.get_per('accounts', self.name, 'use_env_http_proxy'): - try: - try: - env_http_proxy = os.environ['HTTP_PROXY'] - except Exception: - env_http_proxy = os.environ['http_proxy'] - env_http_proxy = env_http_proxy.strip('"') - # Dispose of the http:// prefix - env_http_proxy = env_http_proxy.split('://') - env_http_proxy = env_http_proxy[len(env_http_proxy)-1] - env_http_proxy = env_http_proxy.split('@') - - if len(env_http_proxy) == 2: - login = env_http_proxy[0].split(':') - addr = env_http_proxy[1].split(':') - else: - login = ['', ''] - addr = env_http_proxy[0].split(':') - - proxy = {'host': addr[0], 'type' : u'http', 'user':login[0]} - - if len(addr) == 2: - proxy['port'] = addr[1] - else: - proxy['port'] = 3128 - - if len(login) == 2: - proxy['pass'] = login[1] - proxy['useauth'] = True - else: - proxy['pass'] = u'' - - except Exception: - proxy = None - else: - proxy = None h = hostname p = 5222 ssl_p = 5223 -# use_srv = False # wants ssl? disable srv lookup if use_custom: h = custom_h p = custom_p @@ -1082,8 +1048,8 @@ if use_srv: # add request for srv query to the resolve, on result '_on_resolve' # will be called - gajim.resolver.resolve('_xmpp-client._tcp.' + helpers.idn_to_ascii(h), - self._on_resolve) + gajim.resolver.resolve('_xmpp-client._tcp.' + helpers.idn_to_ascii( + h), self._on_resolve) else: self._on_resolve('', []) @@ -1094,7 +1060,8 @@ # Add ssl port ssl_p = 5223 if gajim.config.get_per('accounts', self.name, 'use_custom_host'): - ssl_p = gajim.config.get_per('accounts', self.name, 'custom_port') + ssl_p = gajim.config.get_per('accounts', self.name, + 'custom_port') for i in self._hosts: i['ssl_port'] = ssl_p self._connect_to_next_host() diff -r 2bcc7d3feb56 -r 60d50b443753 src/common/helpers.py --- a/src/common/helpers.py Thu Nov 10 20:49:03 2011 +0300 +++ b/src/common/helpers.py Thu Nov 10 20:37:48 2011 +0100 @@ -1381,3 +1381,48 @@ uri.setData(data.getData()) found = True return found + +def get_proxy_info(account): + p = gajim.config.get_per('accounts', account, 'proxy') + if not p: + if gajim.config.get_per('accounts', account, 'use_env_http_proxy'): + try: + try: + env_http_proxy = os.environ['HTTP_PROXY'] + except Exception: + env_http_proxy = os.environ['http_proxy'] + env_http_proxy = env_http_proxy.strip('"') + # Dispose of the http:// prefix + env_http_proxy = env_http_proxy.split('://')[-1] + env_http_proxy = env_http_proxy.split('@') + + if len(env_http_proxy) == 2: + login = env_http_proxy[0].split(':') + addr = env_http_proxy[1].split(':') + else: + login = ['', ''] + addr = env_http_proxy[0].split(':') + + proxy = {'host': addr[0], 'type' : u'http', 'user':login[0]} + + if len(addr) == 2: + proxy['port'] = addr[1] + else: + proxy['port'] = 3128 + + if len(login) == 2: + proxy['pass'] = login[1] + proxy['useauth'] = True + else: + proxy['pass'] = u'' + return proxy + + except Exception: + proxy = None + p = gajim.config.get('global_proxy') + if p: + proxy = {} + proxyptr = gajim.config.get_per('proxies', p) + for key in proxyptr.keys(): + proxy[key] = proxyptr[key][1] + return proxy \ No newline at end of file diff -r 2bcc7d3feb56 -r 60d50b443753 src/config.py --- a/src/config.py Thu Nov 10 20:49:03 2011 +0300 +++ b/src/config.py Thu Nov 10 20:37:48 2011 +0100 @@ -551,6 +551,8 @@ else: w.set_active(st) + self.update_proxy_list() + # check if gajm is default st = gajim.config.get('check_if_gajim_is_default') self.xml.get_object('check_default_client_checkbutton').set_active(st) @@ -1256,6 +1258,34 @@ if event.keyval == gtk.keysyms.Delete: self.on_delete_msg_button_clicked(widget) + def on_proxies_combobox_changed(self, widget): + active = widget.get_active() + proxy = widget.get_model()[active][0].decode('utf-8') + if proxy == _('None'): + proxy = '' + + gajim.config.set('global_proxy', proxy) + + def on_manage_proxies_button_clicked(self, widget): + if 'manage_proxies' in gajim.interface.instances: + gajim.interface.instances['manage_proxies'].window.present() + else: + gajim.interface.instances['manage_proxies'] = ManageProxiesWindow() + + def update_proxy_list(self): + our_proxy = gajim.config.get('global_proxy') + if not our_proxy: + our_proxy = _('None') + proxy_combobox = self.xml.get_object('proxies_combobox') + model = proxy_combobox.get_model() + model.clear() + l = gajim.config.get_per('proxies') + l.insert(0, _('None')) + for i in xrange(len(l)): + model.append([l[i]]) + if our_proxy == l[i]: + proxy_combobox.set_active(i) + def on_open_advanced_editor_button_clicked(self, widget, data = None): if 'advanced_config' in gajim.interface.instances: gajim.interface.instances['advanced_config'].window.present()

1 0

gajim: Fix russian translation
by Fomin Denis 10 Nov '11

10 Nov '11

changeset 2bcc7d3feb56 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2bcc7d3feb56 description: Fix russian translation diffstat: po/ru.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 9b90f2673172 -r 2bcc7d3feb56 po/ru.po --- a/po/ru.po Thu Nov 10 15:57:45 2011 +0300 +++ b/po/ru.po Thu Nov 10 20:49:03 2011 +0300 @@ -13,7 +13,7 @@ "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-11-08 00:24+0400\n" -"PO-Revision-Date: 2011-11-08 00:46+0300\n" +"PO-Revision-Date: 2011-11-10 21:47+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -1400,7 +1400,7 @@ #: ../data/gui/history_window.ui.h:6 #: ../data/gui/zeroconf_information_window.ui.h:10 msgid "_Log conversation history" -msgstr "_История сообщения" +msgstr "_Сохранять историю переписки" #: ../data/gui/item_archiving_preferences_window.ui.h:1 msgid "approve"

1 0

gajim: change the size of a 'whiteboard' button
by Fomin Denis 10 Nov '11

10 Nov '11

changeset 9b90f2673172 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9b90f2673172 description: change the size of a 'whiteboard' button diffstat: plugins/whiteboard/plugin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4c31e8cf8db4 -r 9b90f2673172 plugins/whiteboard/plugin.py --- a/plugins/whiteboard/plugin.py Thu Nov 10 15:50:32 2011 +0300 +++ b/plugins/whiteboard/plugin.py Thu Nov 10 15:57:45 2011 +0300 @@ -295,7 +295,7 @@ iconset = gtk.IconSet(pixbuf=pixbuf) factory.add('oval_tool', iconset) factory.add_default() - img.set_from_stock('whiteboard', gtk.ICON_SIZE_BUTTON) + img.set_from_stock('whiteboard', gtk.ICON_SIZE_MENU) self.button.set_image(img) send_button = self.chat_control.xml.get_object('send_button') send_button_pos = actions_hbox.child_get_property(send_button,

1 0

gajim: change the size of a 'info' button
by Fomin Denis 10 Nov '11

10 Nov '11

changeset 4c31e8cf8db4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4c31e8cf8db4 description: change the size of a 'info' button diffstat: data/gui/chat_control.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r bc296e96ac10 -r 4c31e8cf8db4 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Tue Nov 08 22:41:07 2011 +0100 +++ b/data/gui/chat_control.ui Thu Nov 10 15:50:32 2011 +0300 @@ -450,7 +450,7 @@ <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock">gtk-info</property> - <property name="icon-size">2</property> + <property name="icon-size">1</property> </object> </child> </object>

1 0

gajim: execute commands without use_shell=True to prevent remote...
by Yann Leboulanger 08 Nov '11

08 Nov '11

changeset bc296e96ac10 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bc296e96ac10 description: execute commands without use_shell=True to prevent remote code execution, except for commands configured in triggers plugin (configured by user itself). Fixes #7031 diffstat: src/common/helpers.py | 15 +++++++++++++-- src/notify.py | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diffs (44 lines): diff -r bfd5f94489d8 -r bc296e96ac10 src/common/helpers.py --- a/src/common/helpers.py Tue Nov 08 22:00:52 2011 +0100 +++ b/src/common/helpers.py Tue Nov 08 22:41:07 2011 +0100 @@ -40,6 +40,7 @@ import select import base64 import hashlib +import shlex import caps_cache from encodings.punycode import punycode_encode @@ -381,8 +382,18 @@ pass return False -def exec_command(command): - subprocess.Popen('%s &' % command, shell=True).wait() +def exec_command(command, use_shell=False): + """ + execute a command. if use_shell is True, we run the command as is it was + typed in a console. So it may be dangerous if you are not sure about what + is executed. + """ + if use_shell: + subprocess.Popen('%s &' % command, shell=True).wait() + else: + args = shlex.split(command.encode('utf-8')) + p = subprocess.Popen(args) + gajim.thread_interface(p.wait) def build_command(executable, parameter): # we add to the parameter (can hold path with spaces) diff -r bfd5f94489d8 -r bc296e96ac10 src/notify.py --- a/src/notify.py Tue Nov 08 22:00:52 2011 +0100 +++ b/src/notify.py Tue Nov 08 22:41:07 2011 +0100 @@ -167,7 +167,7 @@ if obj.do_command: try: - helpers.exec_command(obj.command) + helpers.exec_command(obj.command, use_shell=True) except Exception: pass

1 0

gajim: use prepared statements in all SQL queries that contains ...
by Yann Leboulanger 08 Nov '11

08 Nov '11

changeset bfd5f94489d8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bfd5f94489d8 description: use prepared statements in all SQL queries that contains jids to prevent SQL injection. Fixes #7034 diffstat: src/common/logger.py | 78 +++++++++++++++++++++++++++------------------------ 1 files changed, 41 insertions(+), 37 deletions(-) diffs (163 lines): diff -r 0ec525152985 -r bfd5f94489d8 src/common/logger.py --- a/src/common/logger.py Tue Nov 08 20:23:48 2011 +0100 +++ b/src/common/logger.py Tue Nov 08 22:00:52 2011 +0100 @@ -569,7 +569,7 @@ except exceptions.PysqliteOperationalError, e: # Error trying to create a new jid_id. This means there is no log return [] - where_sql = self._build_contact_where(account, jid) + where_sql, jid_tuple = self._build_contact_where(account, jid) now = int(float(time.time())) timed_out = now - (timeout * 60) # before that they are too old @@ -577,14 +577,13 @@ # 3 - 8 (we avoid the last 2 lines but we still return 5 asked) try: self.cur.execute(''' - SELECT time, kind, message FROM logs - WHERE (%s) AND kind IN (%d, %d, %d, %d, %d) AND time > %d - ORDER BY time DESC LIMIT %d OFFSET %d - ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV, - constants.KIND_CHAT_MSG_RECV, constants.KIND_SINGLE_MSG_SENT, - constants.KIND_CHAT_MSG_SENT, constants.KIND_ERROR, - timed_out, restore_how_many_rows, pending_how_many) - ) + SELECT time, kind, message FROM logs + WHERE (%s) AND kind IN (%d, %d, %d, %d, %d) AND time > %d + ORDER BY time DESC LIMIT %d OFFSET %d + ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV, + constants.KIND_CHAT_MSG_RECV, constants.KIND_SINGLE_MSG_SENT, + constants.KIND_CHAT_MSG_SENT, constants.KIND_ERROR, timed_out, + restore_how_many_rows, pending_how_many), jid_tuple) results = self.cur.fetchall() except sqlite.DatabaseError: @@ -614,18 +613,18 @@ except exceptions.PysqliteOperationalError, e: # Error trying to create a new jid_id. This means there is no log return [] - where_sql = self._build_contact_where(account, jid) + where_sql, jid_tuple = self._build_contact_where(account, jid) start_of_day = self.get_unix_time_from_date(year, month, day) seconds_in_a_day = 86400 # 60 * 60 * 24 last_second_of_day = start_of_day + seconds_in_a_day - 1 self.cur.execute(''' - SELECT contact_name, time, kind, show, message, subject FROM logs - WHERE (%s) - AND time BETWEEN %d AND %d - ORDER BY time - ''' % (where_sql, start_of_day, last_second_of_day)) + SELECT contact_name, time, kind, show, message, subject FROM logs + WHERE (%s) + AND time BETWEEN %d AND %d + ORDER BY time + ''' % (where_sql, start_of_day, last_second_of_day), jid_tuple) results = self.cur.fetchall() return results @@ -651,13 +650,13 @@ return results else: # user just typed something, we search in message column - where_sql = self._build_contact_where(account, jid) + where_sql, jid_tuple = self._build_contact_where(account, jid) like_sql = '%' + query.replace("'", "''") + '%' self.cur.execute(''' - SELECT contact_name, time, kind, show, message, subject FROM logs - WHERE (%s) AND message LIKE '%s' - ORDER BY time - ''' % (where_sql, like_sql)) + SELECT contact_name, time, kind, show, message, subject FROM logs + WHERE (%s) AND message LIKE '%s' + ORDER BY time + ''' % (where_sql, like_sql), jid_tuple) results = self.cur.fetchall() return results @@ -672,7 +671,7 @@ # Error trying to create a new jid_id. This means there is no log return [] days_with_logs = [] - where_sql = self._build_contact_where(account, jid) + where_sql, jid_tuple = self._build_contact_where(account, jid) # First select all date of month whith logs we want start_of_month = self.get_unix_time_from_date(year, month, 1) @@ -684,13 +683,13 @@ # and take only one of the same values (distinct) # Now we have timestamps of time 0:00 of every day with logs self.cur.execute(''' - SELECT DISTINCT time/(86400)*86400 FROM logs - WHERE (%s) - AND time BETWEEN %d AND %d - AND kind NOT IN (%d, %d) - ORDER BY time - ''' % (where_sql, start_of_month, last_second_of_month, - constants.KIND_STATUS, constants.KIND_GCSTATUS)) + SELECT DISTINCT time/(86400)*86400 FROM logs + WHERE (%s) + AND time BETWEEN %d AND %d + AND kind NOT IN (%d, %d) + ORDER BY time + ''' % (where_sql, start_of_month, last_second_of_month, + constants.KIND_STATUS, constants.KIND_GCSTATUS), jid_tuple) result = self.cur.fetchall() # convert timestamps to day of month @@ -706,19 +705,21 @@ """ where_sql = '' if not is_room: - where_sql = self._build_contact_where(account, jid) + where_sql, jid_tuple = self._build_contact_where(account, jid) else: try: jid_id = self.get_jid_id(jid, 'ROOM') except exceptions.PysqliteOperationalError, e: # Error trying to create a new jid_id. This means there is no log return None - where_sql = 'jid_id = %s' % jid_id + where_sql = 'jid_id = ?' + jid_tuple = (jid_id,) self.cur.execute(''' - SELECT MAX(time) FROM logs - WHERE (%s) - AND kind NOT IN (%d, %d) - ''' % (where_sql, constants.KIND_STATUS, constants.KIND_GCSTATUS)) + SELECT MAX(time) FROM logs + WHERE (%s) + AND kind NOT IN (%d, %d) + ''' % (where_sql, constants.KIND_STATUS, constants.KIND_GCSTATUS), + jid_tuple) results = self.cur.fetchone() if results is not None: @@ -766,6 +767,7 @@ Build the where clause for a jid, including metacontacts jid(s) if any """ where_sql = '' + jid_tuple = () # will return empty list if jid is not associated with # any metacontacts family = gajim.contacts.get_metacontacts_family(account, jid) @@ -775,13 +777,15 @@ jid_id = self.get_jid_id(user['jid']) except exceptions.PysqliteOperationalError, e: continue - where_sql += 'jid_id = %s' % jid_id + where_sql += 'jid_id = ?' + jid_tuple += (jid_id,) if user != family[-1]: where_sql += ' OR ' else: # if jid was not associated with metacontacts jid_id = self.get_jid_id(jid) - where_sql = 'jid_id = %s' % jid_id - return where_sql + where_sql = 'jid_id = ?' + jid_tuple += (jid_id,) + return where_sql, jid_tuple def save_transport_type(self, jid, type_): """

1 0

gajim: prevent traceback in trigger plugin.
by Yann Leboulanger 08 Nov '11

08 Nov '11

changeset 0ec525152985 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0ec525152985 description: prevent traceback in trigger plugin. diffstat: plugins/triggers/manifest.ini | 2 +- plugins/triggers/triggers.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diffs (28 lines): diff -r e873dbfdbcc5 -r 0ec525152985 plugins/triggers/manifest.ini --- a/plugins/triggers/manifest.ini Tue Nov 08 20:01:51 2011 +0100 +++ b/plugins/triggers/manifest.ini Tue Nov 08 20:23:48 2011 +0100 @@ -1,7 +1,7 @@ [info] name: Triggers short_name: triggers -version: 0.0.2 +version: 0.0.3 description: Configure Gajim's behaviour for each contact authors: Yann Leboulanger <asterix(a)lagaule.org> homepage: http://trac.gajim.org/wiki/ diff -r e873dbfdbcc5 -r 0ec525152985 plugins/triggers/triggers.py --- a/plugins/triggers/triggers.py Tue Nov 08 20:01:51 2011 +0100 +++ b/plugins/triggers/triggers.py Tue Nov 08 20:23:48 2011 +0100 @@ -48,8 +48,10 @@ if rule['recipient_type'] == 'contact' and obj.jid not in \ rule_recipients: return False - contact_groups = gajim.contacts.get_first_contact_from_jid( - obj.conn.name, obj.jid).groups + contact = gajim.contacts.get_first_contact_from_jid(obj.conn.name, obj.jid) + if not contact: # PM? + return False + contact_groups = contact.groups group_found = False for group in contact_groups: if group in rule_recipients:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2011