Commits January 2010

commits@gajim.org

7 participants
107 discussions

gajim: Bye bye glade, Hi gtk builder. Fixes #4945
by Yann Leboulanger 22 Jan '10

22 Jan '10

changeset 698a99934bff in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=698a99934bff description: Bye bye glade, Hi gtk builder. Fixes #4945 diffstat: README.html | 1 - autogen.sh | 2 +- configure.ac | 2 +- data/Makefile.am | 2 +- data/glade/Makefile.am | 8 - data/glade/account_context_menu.glade | 144 - data/glade/account_creation_wizard_window.glade | 886 ------ data/glade/account_modification_window.glade | 1283 -------- data/glade/accounts_window.glade | 1394 --------- data/glade/add_new_contact_window.glade | 334 -- data/glade/adhoc_commands_window.glade | 723 ---- data/glade/advanced_configuration_window.glade | 257 - data/glade/advanced_menuitem_menu.glade | 80 - data/glade/advanced_notifications_window.glade | 865 ----- data/glade/atom_entry_window.glade | 372 -- data/glade/blocked_contacts_window.glade | 147 - data/glade/change_activity_dialog.glade | 327 -- data/glade/change_mood_dialog.glade | 340 -- data/glade/change_password_dialog.glade | 200 - data/glade/change_status_message_dialog.glade | 296 -- data/glade/chat_context_menu.glade | 156 - data/glade/chat_to_muc_window.glade | 185 - data/glade/choose_gpg_key_dialog.glade | 142 - data/glade/contact_context_menu.glade | 421 -- data/glade/data_form_window.glade | 800 ----- data/glade/dubbleinput_dialog.glade | 203 - data/glade/edit_groups_dialog.glade | 190 - data/glade/esession_info_window.glade | 200 - data/glade/features_window.glade | 117 - data/glade/filetransfers.glade | 281 - data/glade/gajim_themes_window.glade | 783 ----- data/glade/gc_control_popup_menu.glade | 134 - data/glade/gc_occupants_menu.glade | 179 - data/glade/groups_post_window.glade | 230 - data/glade/history_manager.glade | 321 -- data/glade/history_window.glade | 210 - data/glade/input_dialog.glade | 113 - data/glade/input_text_dialog.glade | 109 - data/glade/join_groupchat_window.glade | 272 - data/glade/manage_accounts_window.glade | 306 -- data/glade/manage_bookmarks_window.glade | 326 -- data/glade/manage_pep_services_window.glade | 108 - data/glade/manage_proxies_window.glade | 440 --- data/glade/manage_sounds_window.glade | 106 - data/glade/message_window.glade | 1413 --------- data/glade/passphrase_dialog.glade | 100 - data/glade/popup_notification_window.glade | 165 - data/glade/preferences_window.glade | 2690 ------------------ data/glade/privacy_list_window.glade | 540 --- data/glade/privacy_lists_window.glade | 212 - data/glade/profile_window.glade | 1163 ------- data/glade/progress_dialog.glade | 98 - data/glade/remove_account_window.glade | 263 - data/glade/roster_item_exchange_window.glade | 140 - data/glade/roster_window.glade | 429 -- data/glade/search_window.glade | 215 - data/glade/service_discovery_window.glade | 237 - data/glade/service_registration_window.glade | 133 - data/glade/single_message_window.glade | 344 -- data/glade/subscription_request_popup_menu.glade | 39 - data/glade/subscription_request_window.glade | 364 -- data/glade/synchronise_select_account_dialog.glade | 131 - data/glade/synchronise_select_contacts_dialog.glade | 131 - data/glade/systray_context_menu.glade | 158 - data/glade/vcard_information_window.glade | 1665 ----------- data/glade/voip_call_received_dialog.glade | 39 - data/glade/xml_console_window.glade | 371 -- data/glade/zeroconf_context_menu.glade | 41 - data/glade/zeroconf_information_window.glade | 666 ---- data/gui/Makefile.am | 8 + data/gui/account_context_menu.ui | 105 + data/gui/account_creation_wizard_window.ui | 899 ++++++ data/gui/accounts_window.ui | 1423 +++++++++ data/gui/add_new_contact_window.ui | 383 ++ data/gui/adhoc_commands_window.ui | 434 ++ data/gui/advanced_configuration_window.ui | 153 + data/gui/advanced_menuitem_menu.ui | 70 + data/gui/advanced_notifications_window.ui | 951 ++++++ data/gui/atom_entry_window.ui | 219 + data/gui/blocked_contacts_window.ui | 91 + data/gui/change_activity_dialog.ui | 341 ++ data/gui/change_mood_dialog.ui | 353 ++ data/gui/change_password_dialog.ui | 143 + data/gui/change_status_message_dialog.ui | 316 ++ data/gui/chat_context_menu.ui | 77 + data/gui/chat_to_muc_window.ui | 184 + data/gui/choose_gpg_key_dialog.ui | 104 + data/gui/contact_context_menu.ui | 399 ++ data/gui/data_form_window.ui | 146 + data/gui/dubbleinput_dialog.ui | 138 + data/gui/edit_groups_dialog.ui | 125 + data/gui/esession_info_window.ui | 151 + data/gui/features_window.ui | 119 + data/gui/filetransfers.ui | 296 ++ data/gui/gajim_themes_window.ui | 586 ++++ data/gui/gc_control_popup_menu.ui | 99 + data/gui/gc_occupants_menu.ui | 152 + data/gui/groups_post_window.ui | 138 + data/gui/history_manager.ui | 350 ++ data/gui/history_window.ui | 239 + data/gui/input_dialog.ui | 117 + data/gui/input_text_dialog.ui | 125 + data/gui/join_groupchat_window.ui | 278 + data/gui/manage_bookmarks_window.ui | 372 ++ data/gui/manage_pep_services_window.ui | 122 + data/gui/manage_proxies_window.ui | 458 +++ data/gui/manage_sounds_window.ui | 117 + data/gui/message_window.ui | 1423 +++++++++ data/gui/passphrase_dialog.ui | 115 + data/gui/popup_notification_window.ui | 105 + data/gui/preferences_window.ui | 2771 +++++++++++++++++++ data/gui/privacy_list_window.ui | 624 ++++ data/gui/privacy_lists_window.ui | 174 + data/gui/profile_window.ui | 1164 +++++++ data/gui/progress_dialog.ui | 68 + data/gui/remove_account_window.ui | 183 + data/gui/roster_item_exchange_window.ui | 143 + data/gui/roster_window.ui | 368 ++ data/gui/search_window.ui | 233 + data/gui/service_discovery_window.ui | 250 + data/gui/service_registration_window.ui | 145 + data/gui/single_message_window.ui | 275 + data/gui/subscription_request_popup_menu.ui | 28 + data/gui/subscription_request_window.ui | 184 + data/gui/synchronise_select_account_dialog.ui | 94 + data/gui/synchronise_select_contacts_dialog.ui | 96 + data/gui/systray_context_menu.ui | 100 + data/gui/vcard_information_window.ui | 1662 +++++++++++ data/gui/voip_call_received_dialog.ui | 40 + data/gui/xml_console_window.ui | 367 ++ data/gui/zeroconf_context_menu.ui | 32 + data/gui/zeroconf_information_window.ui | 399 ++ gajim.nsi | 8 +- src/adhoc_commands.py | 10 +- src/advanced_configuration_window.py | 16 +- src/atom_window.py | 8 +- src/chat_control.py | 92 +- src/config.py | 604 ++-- src/conversation_textview.py | 8 +- src/dataforms_widget.py | 22 +- src/dialogs.py | 436 +- src/disco.py | 26 +- src/features_window.py | 12 +- src/filetransfers_window.py | 28 +- src/gajim.py | 9 - src/gajim_themes_window.py | 42 +- src/groupchat_control.py | 80 +- src/groups.py | 8 +- src/gtkgui_helpers.py | 18 +- src/gui_menu_builder.py | 56 +- src/history_manager.py | 36 +- src/history_window.py | 22 +- src/message_control.py | 4 +- src/message_window.py | 16 +- src/negotiation.py | 8 +- src/profile_window.py | 32 +- src/roster_window.py | 104 +- src/search_window.py | 8 +- src/statusicon.py | 16 +- src/vcard.py | 98 +- test/lib/__init__.py | 2 +- 161 files changed, 22736 insertions(+), 26659 deletions(-) diffs (truncated from 52849 to 300 lines): diff -r 66e3a9cfa4f8 -r 698a99934bff README.html --- a/README.html Fri Jan 22 19:03:14 2010 +0100 +++ b/README.html Fri Jan 22 19:57:59 2010 +0100 @@ -16,7 +16,6 @@ <ul> <li>python2.5 or higher</li> <li>pygtk2.16 or higher</li> -<li>python-libglade</li> <li>pysqlite2 (if you have python 2.5, you already have this)</li> </ul> diff -r 66e3a9cfa4f8 -r 698a99934bff autogen.sh --- a/autogen.sh Fri Jan 22 19:03:14 2010 +0100 +++ b/autogen.sh Fri Jan 22 19:57:59 2010 +0100 @@ -8,7 +8,7 @@ fi echo "[encoding: UTF-8]" > po/POTFILES.in \ - && ls -1 data/gajim.desktop.in.in data/glade/*.glade \ + && ls -1 data/gajim.desktop.in.in data/gui/*.ui \ src/*py src/common/*py src/common/zeroconf/*.py | grep -v ipython_view.py >> \ po/POTFILES.in || exit 1 if test -z `which pkg-config 2>/dev/null`;then diff -r 66e3a9cfa4f8 -r 698a99934bff configure.ac --- a/configure.ac Fri Jan 22 19:03:14 2010 +0100 +++ b/configure.ac Fri Jan 22 19:57:59 2010 +0100 @@ -80,7 +80,7 @@ AC_CONFIG_FILES([ Makefile data/Makefile - data/glade/Makefile + data/gui/Makefile data/emoticons/Makefile data/pixmaps/Makefile data/iconsets/Makefile diff -r 66e3a9cfa4f8 -r 698a99934bff data/Makefile.am --- a/data/Makefile.am Fri Jan 22 19:03:14 2010 +0100 +++ b/data/Makefile.am Fri Jan 22 19:57:59 2010 +0100 @@ -1,4 +1,4 @@ -SUBDIRS = glade emoticons pixmaps iconsets moods activities +SUBDIRS = gui emoticons pixmaps iconsets moods activities @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications diff -r 66e3a9cfa4f8 -r 698a99934bff data/glade/Makefile.am --- a/data/glade/Makefile.am Fri Jan 22 19:03:14 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - -gladedir = $(pkgdatadir)/data/glade -glade_DATA = $(srcdir)/*.glade -EXTRA_DIST = $(glade_DATA) - -DISTCLEANFILES = *.h - -MAINTAINERCLEANFILES = Makefile.in diff -r 66e3a9cfa4f8 -r 698a99934bff data/glade/account_context_menu.glade --- a/data/glade/account_context_menu.glade Fri Jan 22 19:03:14 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,144 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> - -<glade-interface> - <widget class="GtkMenu" id="account_context_menu"> - <child> - <widget class="GtkImageMenuItem" id="status_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Status</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1235"> - <property name="visible">True</property> - <property name="stock">gtk-network</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="pep_menuitem"> - <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="label" translatable="yes">_Personal Events</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image7"> - <property name="stock">gtk-home</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> - <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> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="start_chat_menuitem"> - <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="label" translatable="yes">_Start Chat...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image7"> - <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-jump-to</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="join_group_chat_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Join _Group Chat...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1236"> - <property name="visible">True</property> - <property name="stock">gtk-connect</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="seperator"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="add_contact_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Add Contact...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1238"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="service_discovery_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Discover Services</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1239"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="execute_command_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Execute Command...</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1246"> - <property name="visible">True</property> - <property name="stock">gtk-execute</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="open_gmail_inbox_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Open Gmail Inbox</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="seperator"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="edit_account_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Modify Account</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1240"> - <property name="visible">True</property> - <property name="stock">gtk-preferences</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - </widget> -</glade-interface> diff -r 66e3a9cfa4f8 -r 698a99934bff data/glade/account_creation_wizard_window.glade --- a/data/glade/account_creation_wizard_window.glade Fri Jan 22 19:03:14 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,886 +0,0 @@ -<?xml version="1.0"?> -<glade-interface> -  -  - <widget class="GtkWindow" id="account_creation_wizard_window"> - <property name="border_width">12</property> - <property name="title" translatable="yes">Gajim: Account Creation Wizard</property> - <property name="resizable">False</property> - <signal name="destroy" handler="on_wizard_window_destroy"/> - <child> - <widget class="GtkVBox" id="vbox77"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkNotebook" id="notebook"> - <property name="visible">True</property> - <property name="show_tabs">False</property> - <property name="show_border">False</property> - <child> - <widget class="GtkVBox" id="vbox78"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkLabel" id="label256"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">You need to have an account in order to connect -to the Jabber network.</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkFrame" id="frame33"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <widget class="GtkAlignment" id="alignment68"> - <property name="visible">True</property> - <property name="top_padding">5</property> - <property name="left_padding">12</property> - <child> - <widget class="GtkVBox" id="vbox83"> - <property name="visible">True</property> - <property name="border_width">6</property> - <property name="spacing">6</property> - <child> - <widget class="GtkRadioButton" id="use_existing_account_radiobutton"> - <property name="label" translatable="yes">I already have an account I want to _use</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkRadioButton" id="register_new_account_radiobutton"> - <property name="label" translatable="yes">I want to _register for a new account</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <property name="group">use_existing_account_radiobutton</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkLabel" id="label269"> - <property name="visible">True</property> - <property name="label" translatable="yes">Please choose one of the options below:</property> - <property name="use_markup">True</property> - </widget> - <packing>

1 0

gajim: [Petr Mensik] updated czech translation
by Yann Leboulanger 22 Jan '10

22 Jan '10

changeset 66e3a9cfa4f8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=66e3a9cfa4f8 description: [Petr Mensik] updated czech translation diffstat: po/cs.po | 2735 ++++++++++++++++++++++++------------------------------------- 1 files changed, 1086 insertions(+), 1649 deletions(-) diffs (truncated from 5784 to 300 lines): diff -r 2e2919d8150e -r 66e3a9cfa4f8 po/cs.po --- a/po/cs.po Wed Jan 20 12:23:46 2010 +0100 +++ b/po/cs.po Fri Jan 22 19:03:14 2010 +0100 @@ -22,9 +22,9 @@ "Project-Id-Version: gajim\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-25 22:20+0100\n" -"PO-Revision-Date: 2009-08-19 23:44+0200\n" +"PO-Revision-Date: 2010-01-22 14:35+0100\n" "Last-Translator: Petr Menšík <pihhan(a)cipis.net>\n" -"Language-Team: <>\n" +"Language-Team: <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -120,9 +120,8 @@ "SHA1 otisk certifikátu:\n" #: ../data/glade/account_creation_wizard_window.glade.h:11 -#, fuzzy msgid "Anon_ymous authentication" -msgstr "Použít při_hlášení k proxy" +msgstr "Anon_ymní autentizace" #: ../data/glade/account_creation_wizard_window.glade.h:12 msgid "Connect when I press Finish" @@ -256,15 +255,8 @@ msgstr "_Změnit heslo" #: ../data/glade/account_modification_window.glade.h:10 -msgid "" -"Check this so Gajim will connect in port 5223 where legacy servers are " -"expected to have SSL capabilities. Note that Gajim uses TLS encryption by " -"default if broadcasted by the server, and with this option enabled TLS will " -"be disabled" -msgstr "" -"Zaškrtněte pokud se má Gajim připojit na port 5223, kde obvykle nabízejí " -"starší servery SSL. Pozor- Gajim použije TLS šifrování standardně, pokud " -"server ohlásí jeho podporu. Touto volbou bude TLS vypnuto" +msgid "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled" +msgstr "Zaškrtněte pokud se má Gajim připojit na port 5223, kde obvykle nabízejí starší servery SSL. Pozor- Gajim použije TLS šifrování standardně, pokud server ohlásí jeho podporu. Touto volbou bude TLS vypnuto" #: ../data/glade/account_modification_window.glade.h:11 #: ../data/glade/accounts_window.glade.h:14 @@ -293,9 +285,13 @@ #. No configured account #: ../data/glade/account_modification_window.glade.h:16 #: ../data/glade/accounts_window.glade.h:21 -#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100 -#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581 -#: ../src/notify.py:620 ../src/notify.py:632 +#: ../data/glade/roster_window.glade.h:5 +#: ../src/common/helpers.py:1100 +#: ../src/common/helpers.py:1112 +#: ../src/notify.py:560 +#: ../src/notify.py:581 +#: ../src/notify.py:620 +#: ../src/notify.py:632 msgid "Gajim" msgstr "Gajim" @@ -304,8 +300,11 @@ #. General group cannot be changed #: ../data/glade/account_modification_window.glade.h:17 #: ../data/glade/accounts_window.glade.h:22 -#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135 -#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746 +#: ../data/glade/preferences_window.glade.h:52 +#: ../src/common/contacts.py:135 +#: ../src/dialogs.py:111 +#: ../src/dialogs.py:121 +#: ../src/roster_window.py:2746 #: ../src/roster_window.py:5268 msgid "General" msgstr "Obecné" @@ -316,47 +315,27 @@ #: ../data/glade/account_modification_window.glade.h:19 #: ../data/glade/accounts_window.glade.h:23 -msgid "" -"If checked, Gajim will also broadcast some more IPs except from just your " -"IP, so file transfer has higher chances of working." -msgstr "" -"Pokud je zaškrtnuto, Gajim ohlásí navíc několik dalších IP kromě Vaší IP, " -"takže přenos souboru má větší šanci správného fungování." +msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working." +msgstr "Pokud je zaškrtnuto, Gajim ohlásí navíc několik dalších IP kromě Vaší IP, takže přenos souboru má větší šanci správného fungování." #: ../data/glade/account_modification_window.glade.h:21 #: ../data/glade/accounts_window.glade.h:26 -msgid "" -"If checked, Gajim will send keep-alive packets to prevent connection timeout " -"which results in disconnection" -msgstr "" -"Pokud zaškrtnuto, Gajim bude posílat keep-alive pakety, aby předešel ztrátě " -"spojení způsobeném vypršením spojení" +msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection" +msgstr "Pokud zaškrtnuto, Gajim bude posílat keep-alive pakety, aby předešel ztrátě spojení způsobeném vypršením spojení" #: ../data/glade/account_modification_window.glade.h:22 -msgid "" -"If checked, Gajim will store the password in ~/.gajim/config with 'read' " -"permission only for you" -msgstr "" -"Pokud zaškrtnuto, Gajim uloží heslo v ~/.gajim/config s právem čtení pouze " -"pro Vás" +msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you" +msgstr "Pokud zaškrtnuto, Gajim uloží heslo v ~/.gajim/config s právem čtení pouze pro Vás" #: ../data/glade/account_modification_window.glade.h:23 #: ../data/glade/accounts_window.glade.h:27 -msgid "" -"If checked, Gajim, when launched, will automatically connect to jabber using " -"this account" -msgstr "" -"Pokud zaškrtnuto, Gajim po spuštění se automaticky připojí pomocí tohoto účtu" +msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account" +msgstr "Pokud zaškrtnuto, Gajim po spuštění se automaticky připojí pomocí tohoto účtu" #: ../data/glade/account_modification_window.glade.h:24 #: ../data/glade/accounts_window.glade.h:28 -msgid "" -"If checked, any change to the global status (handled by the combobox at the " -"bottom of the roster window) will change the status of this account " -"accordingly" -msgstr "" -"Pokud zaškrtnuto, jakákoliv změna globálního stavu (pomocí comboboxu na " -"spodní straně Seznamu) změní stav tohoto účtu také" +msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly" +msgstr "Pokud zaškrtnuto, jakákoliv změna globálního stavu (pomocí comboboxu na spodní straně Seznamu) změní stav tohoto účtu také" #: ../data/glade/account_modification_window.glade.h:25 #: ../data/glade/accounts_window.glade.h:31 @@ -364,7 +343,8 @@ msgstr "Informace o Vás, jak jsou uloženy na serveru" #: ../data/glade/account_modification_window.glade.h:27 -#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646 +#: ../data/glade/accounts_window.glade.h:35 +#: ../src/config.py:1646 #: ../src/config.py:2196 msgid "No key selected" msgstr "Není zvolen žádný klíč" @@ -372,12 +352,22 @@ #. None means no proxy profile selected #: ../data/glade/account_modification_window.glade.h:29 #: ../data/glade/accounts_window.glade.h:37 -#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158 -#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555 -#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195 -#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308 -#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526 -#: ../src/roster_window.py:2800 ../src/roster_window.py:2806 +#: ../data/glade/change_mood_dialog.glade.h:3 +#: ../src/config.py:1158 +#: ../src/config.py:1261 +#: ../src/config.py:1550 +#: ../src/config.py:1555 +#: ../src/config.py:2103 +#: ../src/config.py:2182 +#: ../src/config.py:2195 +#: ../src/config.py:3396 +#: ../src/config.py:3469 +#: ../src/dialogs.py:308 +#: ../src/dialogs.py:310 +#: ../src/dialogs.py:513 +#: ../src/dialogs.py:526 +#: ../src/roster_window.py:2800 +#: ../src/roster_window.py:2806 #: ../src/roster_window.py:2811 msgid "None" msgstr "Žádný" @@ -399,14 +389,8 @@ #: ../data/glade/account_modification_window.glade.h:33 #: ../data/glade/accounts_window.glade.h:40 -msgid "" -"Priority is used in Jabber to determine who gets the events from the jabber " -"server when two or more clients are connected using the same account; The " -"client with the highest priority gets the events" -msgstr "" -"Priorita je v Jabberu použita ke zjištění, kdo obdrží zprávu od jabber " -"serveru, pokud je připojeno více klientů přes stejný účet. Zprávu obdrží " -"klient s vyšší prioritou" +msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events" +msgstr "Priorita je v Jabberu použita ke zjištění, kdo obdrží zprávu od jabber serveru, pokud je připojeno více klientů přes stejný účet. Zprávu obdrží klient s vyšší prioritou" #: ../data/glade/account_modification_window.glade.h:34 #: ../data/glade/accounts_window.glade.h:41 @@ -424,18 +408,8 @@ #: ../data/glade/account_modification_window.glade.h:37 #: ../data/glade/accounts_window.glade.h:44 -msgid "" -"Resource is sent to the Jabber server in order to separate the same JID in " -"two or more parts depending on the number of the clients connected in the " -"same server with the same account. So you might be connected in the same " -"account with resource 'Home' and 'Work' at the same time. The resource which " -"has the highest priority will get the events. (see below)" -msgstr "" -"Zdroj je odeslán Jabber serveru pro oddělení stejné JID na dvě nebo více " -"částí závisejících na počtu připojených klientů na stejný server se stejným " -"účtem. Takže můžete být připojeni ke stejnému účtu se zdroji 'Domov' a " -"'Práce' zároveň. Zdroj, který má nejvyšší prioritu obdrží zprávy. (více " -"následuje)" +msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" +msgstr "Zdroj je odeslán Jabber serveru pro oddělení stejné JID na dvě nebo více částí závisejících na počtu připojených klientů na stejný server se stejným účtem. Takže můžete být připojeni ke stejnému účtu se zdroji 'Domov' a 'Práce' zároveň. Zdroj, který má nejvyšší prioritu obdrží zprávy. (více následuje)" #: ../data/glade/account_modification_window.glade.h:38 msgid "Save _passphrase (insecure)" @@ -492,17 +466,12 @@ msgstr "Účty" #: ../data/glade/accounts_window.glade.h:9 -#, fuzzy msgid "Anonymous authentication" -msgstr "Použít při_hlášení k proxy" +msgstr "Anonymní autentizace" #: ../data/glade/accounts_window.glade.h:13 -msgid "" -"Check this so Gajim will ask you before sending your password over an " -"insecure connection." -msgstr "" -"Zaškrtněte pokud se má Gajim ptát předtím než odešlete vaše heslo přes " -"nezabezpečené připojení." +msgid "Check this so Gajim will ask you before sending your password over an insecure connection." +msgstr "Zaškrtněte pokud se má Gajim ptát předtím než odešlete vaše heslo přes nezabezpečené připojení." #: ../data/glade/accounts_window.glade.h:17 msgid "Co_nnect on Gajim startup" @@ -524,16 +493,15 @@ #: ../data/glade/accounts_window.glade.h:29 msgid "" -"If the default port that is used for incoming messages is unfitting for your " -"setup you can select another one here.\n" +"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n" "You might consider to change possible firewall settings." msgstr "" -"Pokud výchozí port použitý k přijímání zpráv nevyhovuje tvému nastavení, " -"můžeš si zvolit jiný.\n" +"Pokud výchozí port použitý k přijímání zpráv nevyhovuje tvému nastavení, můžeš si zvolit jiný.\n" "Můžeš také zvážit změnu nastavení firewallu." #: ../data/glade/accounts_window.glade.h:32 -#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673 +#: ../data/glade/zeroconf_information_window.glade.h:4 +#: ../src/config.py:1673 #: ../src/dialogs.py:830 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -548,7 +516,8 @@ msgstr "_Spojit účty" #. Rename -#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219 +#: ../data/glade/accounts_window.glade.h:42 +#: ../src/roster_window.py:5219 msgid "Re_name" msgstr "Přejme_novat" @@ -712,9 +681,7 @@ #: ../data/glade/advanced_configuration_window.glade.h:2 msgid "NOTE: You should restart Gajim for some settings to take effect" -msgstr "" -"POZNÁMKA: Měl(a) by jste restartovat gajim, aby se projevila všechna " -"nastavení" +msgstr "POZNÁMKA: Měl(a) by jste restartovat gajim, aby se projevila všechna nastavení" #: ../data/glade/advanced_configuration_window.glade.h:3 msgid "Advanced Configuration Editor" @@ -798,7 +765,8 @@ msgstr "Všechny stavy" #: ../data/glade/advanced_notifications_window.glade.h:8 -#: ../src/common/commands.py:101 ../src/common/helpers.py:219 +#: ../src/common/commands.py:101 +#: ../src/common/helpers.py:219 msgid "Away" msgstr "Pryč" @@ -865,10 +833,8 @@ msgstr "Když" #: ../data/glade/advanced_notifications_window.glade.h:27 -msgid "" -"_Activate window manager's UrgencyHint to make chat window in taskbar flash" -msgstr "" -"_Aktivuj UrgencyHint window manageru pro blikání okna rozhovoru v liště úloh" +msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash" +msgstr "_Aktivuj UrgencyHint window manageru pro blikání okna rozhovoru v liště úloh" #: ../data/glade/advanced_notifications_window.glade.h:28 msgid "_Disable auto opening chat window" @@ -944,7 +910,8 @@ msgid "New entry received" msgstr "Přijat nový záznam"

1 0

gajim: send pep info only once we are connected. Fixes #5567
by Yann Leboulanger 20 Jan '10

20 Jan '10

changeset 2e2919d8150e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2e2919d8150e description: send pep info only once we are connected. Fixes #5567 diffstat: src/common/connection.py | 9 +++--- src/common/connection_handlers.py | 1 + src/common/pep.py | 49 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 4 deletions(-) diffs (137 lines): diff -r 9cfc92b99ecc -r 2e2919d8150e src/common/connection.py --- a/src/common/connection.py Wed Jan 20 11:52:20 2010 +0100 +++ b/src/common/connection.py Wed Jan 20 12:23:46 2010 +0100 @@ -708,6 +708,7 @@ # We are doing disconnect at so many places, better use one function in all def disconnect(self, on_purpose=False): gajim.interface.music_track_changed(None, None, self.name) + self.reset_awaiting_pep() self.on_purpose = on_purpose self.connected = 0 self.time_to_reconnect = None @@ -1474,16 +1475,16 @@ self.priority = priority self.dispatch('STATUS', 'invisible') if initial: - #ask our VCard + # ask our VCard self.request_vcard(None) - #Get bookmarks from private namespace + # Get bookmarks from private namespace self.get_bookmarks() - #Get annotations + # Get annotations self.get_annotations() - #Inform GUI we just signed in + # Inform GUI we just signed in self.dispatch('SIGNED_IN', ()) def get_signed_presence(self, msg, callback = None): diff -r 9cfc92b99ecc -r 2e2919d8150e src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Jan 20 11:52:20 2010 +0100 +++ b/src/common/connection_handlers.py Wed Jan 20 12:23:46 2010 +0100 @@ -2163,6 +2163,7 @@ # Inform GUI we just signed in self.dispatch('SIGNED_IN', ()) + self.send_awaiting_pep() self.continue_connect_info = None def request_gmail_notifications(self): diff -r 9cfc92b99ecc -r 2e2919d8150e src/common/pep.py --- a/src/common/pep.py Wed Jan 20 11:52:20 2010 +0100 +++ b/src/common/pep.py Wed Jan 20 12:23:46 2010 +0100 @@ -500,6 +500,30 @@ self._account = account self._dispatcher = dispatcher self._pubsub_connection = pubsub_connection + self.reset_awaiting_pep() + + def reset_awaiting_pep(self): + self.to_be_sent_activity = None + self.to_be_sent_mood = None + self.to_be_sent_tune = None + self.to_be_sent_nick = None + self.to_be_sent_location = None + + def send_awaiting_pep(self): + """ + Send pep info that were waiting for connection + """ + if self.to_be_sent_activity: + self.send_activity(*self.to_be_sent_activity) + if self.to_be_sent_mood: + self.send_mood(*self.to_be_sent_mood) + if self.to_be_sent_tune: + self.send_tune(*self.to_be_sent_tune) + if self.to_be_sent_nick: + self.send_nick(self.to_be_sent_nick) + if self.to_be_sent_location: + self.send_location(self.to_be_sent_location) + self.reset_awaiting_pep() def _pubsubEventCB(self, xmpp_dispatcher, msg): ''' Called when we receive <message /> with pubsub event. ''' @@ -530,6 +554,11 @@ raise xmpp.NodeProcessed def send_activity(self, activity, subactivity=None, message=None): + if self.connected == 1: + # We are connecting, keep activity in mem and send it when we'll be + # conencted + self.to_be_sent_activity = (activity, subactivity, message) + return if not self.pep_supported: return item = xmpp.Node('activity', {'xmlns': xmpp.NS_ACTIVITY}) @@ -550,6 +579,11 @@ self._pubsub_connection.send_pb_retract('', xmpp.NS_ACTIVITY, '0') def send_mood(self, mood, message=None): + if self.connected == 1: + # We are connecting, keep mood in mem and send it when we'll be + # conencted + self.to_be_sent_mood = (mood, message) + return if not self.pep_supported: return item = xmpp.Node('mood', {'xmlns': xmpp.NS_MOOD}) @@ -569,6 +603,11 @@ def send_tune(self, artist='', title='', source='', track=0, length=0, items=None): + if self.connected == 1: + # We are connecting, keep tune in mem and send it when we'll be + # conencted + self.to_be_sent_tune = (artist, title, source, track, length, items) + return if not self.pep_supported: return item = xmpp.Node('tune', {'xmlns': xmpp.NS_TUNE}) @@ -599,6 +638,11 @@ self._pubsub_connection.send_pb_retract('', xmpp.NS_TUNE, '0') def send_nickname(self, nick): + if self.connected == 1: + # We are connecting, keep nick in mem and send it when we'll be + # conencted + self.to_be_sent_nick = nick + return if not self.pep_supported: return item = xmpp.Node('nick', {'xmlns': xmpp.NS_NICK}) @@ -613,6 +657,11 @@ self._pubsub_connection.send_pb_retract('', xmpp.NS_NICK, '0') def send_location(self, info): + if self.connected == 1: + # We are connecting, keep location in mem and send it when we'll be + # conencted + self.to_be_sent_location = info + return if not self.pep_supported: return item = xmpp.Node('geoloc', {'xmlns': xmpp.NS_LOCATION})

1 0

gajim: fix missing import
by Yann Leboulanger 20 Jan '10

20 Jan '10

changeset 9cfc92b99ecc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9cfc92b99ecc description: fix missing import diffstat: src/config.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 0cebb95c165a -r 9cfc92b99ecc src/config.py --- a/src/config.py Wed Jan 20 11:00:24 2010 +0100 +++ b/src/config.py Wed Jan 20 11:52:20 2010 +0100 @@ -58,6 +58,7 @@ from common.zeroconf import connection_zeroconf from common import dataforms from common import GnuPG +from common import ged try: from common.multimedia_helpers import AudioInputManager, AudioOutputManager

1 0

gajim: fix string to not suppose contact is male. Fixes #758
by Yann Leboulanger 20 Jan '10

20 Jan '10

changeset 0cebb95c165a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0cebb95c165a description: fix string to not suppose contact is male. Fixes #758 diffstat: src/roster_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 43b72e62de71 -r 0cebb95c165a src/roster_window.py --- a/src/roster_window.py Tue Jan 19 22:52:17 2010 +0100 +++ b/src/roster_window.py Wed Jan 20 11:00:24 2010 +0100 @@ -3331,8 +3331,8 @@ pritext = _('You are about to send a custom status. Are you sure you want' ' to continue?') sectext = _('This contact will temporarily see you as %(status)s, ' - 'but only until you change your status. Then he will see your global ' - 'status.') % {'status': show} + 'but only until you change your status. Then he or she will see your ' + 'global status.') % {'status': show} dlg = dialogs.ConfirmationDialogCheck(pritext, sectext, _('Do _not ask me again'), on_response_ok=send_it)

1 0

gajim: prevent printing a useless traceback when gajim fails to ...
by Yann Leboulanger 19 Jan '10

19 Jan '10

changeset 43b72e62de71 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=43b72e62de71 description: prevent printing a useless traceback when gajim fails to start diffstat: src/gajim.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r a1c34520ec0d -r 43b72e62de71 src/gajim.py --- a/src/gajim.py Tue Jan 19 22:51:03 2010 +0100 +++ b/src/gajim.py Tue Jan 19 22:52:17 2010 +0100 @@ -362,7 +362,8 @@ if os.path.exists(pid_filename): os.remove(pid_filename) # Shutdown GUI and save config - gajim.interface.roster.prepare_quit() + if hasattr(gajim.interface, 'roster'): + gajim.interface.roster.prepare_quit() import atexit atexit.register(on_exit)

1 0

gajim: use ged for account creation wizard
by Yann Leboulanger 19 Jan '10

19 Jan '10

changeset a1c34520ec0d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a1c34520ec0d description: use ged for account creation wizard diffstat: src/config.py | 36 +++++++++++++++++++++++++++++++----- src/gui_interface.py | 23 ----------------------- 2 files changed, 31 insertions(+), 28 deletions(-) diffs (138 lines): diff -r 49bd9f5cf408 -r a1c34520ec0d src/config.py --- a/src/config.py Tue Jan 19 22:23:19 2010 +0100 +++ b/src/config.py Tue Jan 19 22:51:03 2010 +0100 @@ -3339,6 +3339,13 @@ self.notebook.set_current_page(0) self.xml.signal_autoconnect(self) self.window.show_all() + gajim.ged.register_event_handler('NEW_ACC_CONNECTED', ged.CORE, + self.new_acc_connected) + gajim.ged.register_event_handler('NEW_ACC_NOT_CONNECTED', ged.CORE, + self.new_acc_not_connected) + gajim.ged.register_event_handler('ACC_OK', ged.CORE, self.acc_is_ok) + gajim.ged.register_event_handler('ACC_NOT_OK', ged.CORE, + self.acc_is_not_ok) def on_wizard_window_destroy(self, widget): page = self.notebook.get_current_page() @@ -3348,6 +3355,13 @@ del gajim.connections[self.account] if self.account in gajim.config.get_per('accounts'): gajim.config.del_per('accounts', self.account) + gajim.ged.remove_event_handler('NEW_ACC_CONNECTED', ged.CORE, + self.new_acc_connected) + gajim.ged.remove_event_handler('NEW_ACC_NOT_CONNECTED', ged.CORE, + self.new_acc_not_connected) + gajim.ged.remove_event_handler('ACC_OK', ged.CORE, self.acc_is_ok) + gajim.ged.remove_event_handler('ACC_NOT_OK', ged.CORE, + self.acc_is_not_ok) del gajim.interface.instances['account_creation_wizard'] def on_register_server_features_button_clicked(self, widget): @@ -3581,11 +3595,14 @@ self.progressbar.pulse() return True # loop forever - def new_acc_connected(self, form, is_form, ssl_msg, ssl_err, ssl_cert, - ssl_fingerprint): + def new_acc_connected(self, account, array): """ Connection to server succeded, present the form to the user """ + # We receive events from all accounts from GED + if account != self.account: + return + form, is_form, ssl_msg, ssl_err, ssl_cert, ssl_fingerprint = array if self.update_progressbar_timeout_id is not None: gobject.source_remove(self.update_progressbar_timeout_id) self.back_button.show() @@ -3618,10 +3635,13 @@ else: self.notebook.set_current_page(4) # show form page - def new_acc_not_connected(self, reason): + def new_acc_not_connected(self, account, reason): """ Account creation failed: connection to server failed """ + # We receive events from all accounts from GED + if account != self.account: + return if self.account not in gajim.connections: return if self.update_progressbar_timeout_id is not None: @@ -3640,20 +3660,26 @@ self.finish_label.set_markup(finish_text) self.notebook.set_current_page(6) # show finish page - def acc_is_ok(self, config): + def acc_is_ok(self, account, config): """ Account creation succeeded """ + # We receive events from all accounts from GED + if account != self.account: + return self.create_vars(config) self.show_finish_page() if self.update_progressbar_timeout_id is not None: gobject.source_remove(self.update_progressbar_timeout_id) - def acc_is_not_ok(self, reason): + def acc_is_not_ok(self, account, reason): """ Account creation failed """ + # We receive events from all accounts from GED + if account != self.account: + return self.back_button.show() self.cancel_button.show() self.go_online_checkbutton.hide() diff -r 49bd9f5cf408 -r a1c34520ec0d src/gui_interface.py --- a/src/gui_interface.py Tue Jan 19 22:23:19 2010 +0100 +++ b/src/gui_interface.py Tue Jan 19 22:51:03 2010 +0100 @@ -695,31 +695,11 @@ gajim.interface.instances[account]['pep_services'].items_received( array[2]) - def handle_event_new_acc_connected(self, account, array): - #('NEW_ACC_CONNECTED', account, (infos, is_form, ssl_msg, ssl_err, - # ssl_cert, ssl_fingerprint)) - if 'account_creation_wizard' in self.instances: - self.instances['account_creation_wizard'].new_acc_connected(array[0], - array[1], array[2], array[3], array[4], array[5]) - - def handle_event_new_acc_not_connected(self, account, array): - #('NEW_ACC_NOT_CONNECTED', account, (reason)) - if 'account_creation_wizard' in self.instances: - self.instances['account_creation_wizard'].new_acc_not_connected(array) - def handle_event_acc_ok(self, account, array): #('ACC_OK', account, (config)) - if 'account_creation_wizard' in self.instances: - self.instances['account_creation_wizard'].acc_is_ok(array) - if self.remote_ctrl: self.remote_ctrl.raise_signal('NewAccount', (account, array)) - def handle_event_acc_not_ok(self, account, array): - #('ACC_NOT_OK', account, (reason)) - if 'account_creation_wizard' in self.instances: - self.instances['account_creation_wizard'].acc_is_not_ok(array) - def handle_event_quit(self, p1, p2): self.roster.quit_gtkgui_interface() @@ -2010,10 +1990,7 @@ 'REGISTER_AGENT_INFO': [self.handle_event_register_agent_info], 'AGENT_INFO_ITEMS': [self.handle_event_agent_info_items], 'QUIT': [self.handle_event_quit], - 'NEW_ACC_CONNECTED': [self.handle_event_new_acc_connected], - 'NEW_ACC_NOT_CONNECTED': [self.handle_event_new_acc_not_connected], 'ACC_OK': [self.handle_event_acc_ok], - 'ACC_NOT_OK': [self.handle_event_acc_not_ok], 'MYVCARD': [self.handle_event_myvcard], 'VCARD': [self.handle_event_vcard], 'LAST_STATUS_TIME': [self.handle_event_last_status_time],

1 0

gajim: use GED for disco.py
by Yann Leboulanger 19 Jan '10

19 Jan '10

changeset 49bd9f5cf408 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=49bd9f5cf408 description: use GED for disco.py diffstat: src/disco.py | 45 ++++++++++++++++++++++++++++++++++++++++----- src/gui_interface.py | 30 ------------------------------ 2 files changed, 40 insertions(+), 35 deletions(-) diffs (168 lines): diff -r 5df538abe459 -r 49bd9f5cf408 src/disco.py --- a/src/disco.py Tue Jan 19 22:06:00 2010 +0100 +++ b/src/disco.py Tue Jan 19 22:23:19 2010 +0100 @@ -62,6 +62,7 @@ from common import xmpp from common.exceptions import GajimGeneralException from common import helpers +from common import ged # Dictionary mapping category, type pairs to browser class, image pairs. # This is a function, so we can call it after the classes are declared. @@ -254,6 +255,24 @@ self._info = CacheDictionary(0, getrefresh = False) self._subscriptions = CacheDictionary(5, getrefresh=False) self._cbs = {} + gajim.ged.register_event_handler('AGENT_ERROR_INFO', ged.CORE, + self.agent_info_error) + gajim.ged.register_event_handler('AGENT_ERROR_ITEMS', ged.CORE, + self.agent_items_error) + gajim.ged.register_event_handler('AGENT_INFO_ITEMS', ged.CORE, + self.agent_items) + gajim.ged.register_event_handler('AGENT_INFO_INFO', ged.CORE, + self.agent_info) + + def __del__(self): + gajim.ged.remove_event_handler('AGENT_ERROR_INFO', ged.CORE, + self.agent_info_error) + gajim.ged.remove_event_handler('AGENT_ERROR_ITEMS', ged.CORE, + self.agent_items_error) + gajim.ged.remove_event_handler('AGENT_INFO_ITEMS', ged.CORE, + self.agent_items) + gajim.ged.remove_event_handler('AGENT_INFO_INFO', ged.CORE, + self.agent_info) def cleanup(self): self._items.cleanup() @@ -383,10 +402,15 @@ self._cbs[cbkey] = [cb] gajim.connections[self.account].discoverItems(jid, node) - def agent_info(self, jid, node, identities, features, data): + def agent_info(self, account, array): """ Callback for when we receive an agent's info + array is (agent, node, identities, features, data) """ + # We receive events from all accounts from GED + if account != self.account: + return + jid, node, identities, features, data = array addr = get_agent_address(jid, node) # Store in cache @@ -401,10 +425,15 @@ if cbkey in self._cbs: del self._cbs[cbkey] - def agent_items(self, jid, node, items): + def agent_items(self, account, array): """ Callback for when we receive an agent's items + array is (agent, node, items) """ + # We receive events from all accounts from GED + if account != self.account: + return + jid, node, items = array addr = get_agent_address(jid, node) # Store in cache @@ -419,11 +448,14 @@ if cbkey in self._cbs: del self._cbs[cbkey] - def agent_info_error(self, jid): + def agent_info_error(self, account, jid): """ Callback for when a query fails. Even after the browse and agents namespaces """ + # We receive events from all accounts from GED + if account != self.account: + return addr = get_agent_address(jid) # Call callbacks @@ -435,11 +467,14 @@ if cbkey in self._cbs: del self._cbs[cbkey] - def agent_items_error(self, jid): + def agent_items_error(self, account, jid): """ Callback for when a query fails. Even after the browse and agents namespaces """ + # We receive events from all accounts from GED + if account != self.account: + return addr = get_agent_address(jid) # Call callbacks @@ -1003,7 +1038,7 @@ self.window.progressbar.show() self._pulse_timeout = gobject.timeout_add(250, self._pulse_timeout_cb) self.cache.get_items(self.jid, self.node, self._agent_items, - force = force, args = (force,)) + force=force, args=(force,)) def _pulse_timeout_cb(self, *args): """ diff -r 5df538abe459 -r 49bd9f5cf408 src/gui_interface.py --- a/src/gui_interface.py Tue Jan 19 22:06:00 2010 +0100 +++ b/src/gui_interface.py Tue Jan 19 22:23:19 2010 +0100 @@ -661,20 +661,6 @@ notify.popup(event_type, jid, account, 'unsubscribed', path, event_type, jid) - def handle_event_agent_info_error(self, account, agent): - #('AGENT_ERROR_INFO', account, (agent)) - try: - gajim.connections[account].services_cache.agent_info_error(agent) - except AttributeError: - return - - def handle_event_agent_items_error(self, account, agent): - #('AGENT_ERROR_INFO', account, (agent)) - try: - gajim.connections[account].services_cache.agent_items_error(agent) - except AttributeError: - return - def handle_event_agent_removed(self, account, agent): # remove transport's contacts from treeview jid_list = gajim.contacts.get_jid_list(account) @@ -708,19 +694,6 @@ array[0] == our_jid: gajim.interface.instances[account]['pep_services'].items_received( array[2]) - try: - gajim.connections[account].services_cache.agent_items(array[0], - array[1], array[2]) - except AttributeError: - return - - def handle_event_agent_info_info(self, account, array): - #('AGENT_INFO_INFO', account, (agent, node, identities, features, data)) - try: - gajim.connections[account].services_cache.agent_info(array[0], - array[1], array[2], array[3], array[4]) - except AttributeError: - return def handle_event_new_acc_connected(self, account, array): #('NEW_ACC_CONNECTED', account, (infos, is_form, ssl_msg, ssl_err, @@ -2033,12 +2006,9 @@ 'SUBSCRIBED': [self.handle_event_subscribed], 'UNSUBSCRIBED': [self.handle_event_unsubscribed], 'SUBSCRIBE': [self.handle_event_subscribe], - 'AGENT_ERROR_INFO': [self.handle_event_agent_info_error], - 'AGENT_ERROR_ITEMS': [self.handle_event_agent_items_error], 'AGENT_REMOVED': [self.handle_event_agent_removed], 'REGISTER_AGENT_INFO': [self.handle_event_register_agent_info], 'AGENT_INFO_ITEMS': [self.handle_event_agent_info_items], - 'AGENT_INFO_INFO': [self.handle_event_agent_info_info], 'QUIT': [self.handle_event_quit], 'NEW_ACC_CONNECTED': [self.handle_event_new_acc_connected], 'NEW_ACC_NOT_CONNECTED': [self.handle_event_new_acc_not_connected],

1 0

gajim: add ged.py file
by Yann Leboulanger 19 Jan '10

19 Jan '10

changeset 5df538abe459 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5df538abe459 description: add ged.py file diffstat: src/common/ged.py | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diffs (68 lines): diff -r 577530a024bb -r 5df538abe459 src/common/ged.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/common/ged.py Tue Jan 19 22:06:00 2010 +0100 @@ -0,0 +1,64 @@ +# -*- coding: utf-8 -*- + +## This file is part of Gajim. +## +## 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 3 only. +## +## 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 +## 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/>. +## + +''' +Global Events Dispatcher module. + +:author: Mateusz Biliński <mateusz(a)bilinski.it> +:since: 8th August 2008 +:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> +:license: GPL +''' + +import logging +log = logging.getLogger('gajim.common.ged') + +PRECORE = 30 +CORE = 40 +POSTCORE = 50 + +class GlobalEventsDispatcher(object): + + def __init__(self): + self.handlers = {} + + def register_event_handler(self, event_name, priority, handler): + if event_name in self.handlers: + handlers_list = self.handlers[event_name] + i = 0 + for i,h in enumerate(handlers_list): + if priority < h[0]: + break + + handlers_list.insert(i, (priority, handler)) + else: + self.handlers[event_name] = [(priority, handler)] + + def remove_event_handler(self, event_name, priority, handler): + if event_name in self.handlers: + try: + self.handlers[event_name].remove((priority, handler)) + except ValueError, error: + log.warn('''Function (%s) with priority "%s" never registered + as handler of event "%s". Couldn\'t remove. Error: %s''' + %(handler, priority, event_name, error)) + + def raise_event(self, event_name, *args, **kwargs): + log.debug('%s\nArgs: %s'%(event_name, str(args))) + if event_name in self.handlers: + for priority, handler in self.handlers[event_name]: + handler(*args, **kwargs)

1 0

gajim: import ged from plugin-system branch
by Yann Leboulanger 19 Jan '10

19 Jan '10

changeset 577530a024bb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=577530a024bb description: import ged from plugin-system branch diffstat: src/common/connection.py | 2 +- src/common/gajim.py | 2 + src/gui_interface.py | 65 ++++++++++++++++++++++------------------------- 3 files changed, 33 insertions(+), 36 deletions(-) diffs (168 lines): diff -r 16666da7cd22 -r 577530a024bb src/common/connection.py --- a/src/common/connection.py Mon Jan 18 17:16:06 2010 +0100 +++ b/src/common/connection.py Tue Jan 19 21:32:45 2010 +0100 @@ -169,7 +169,7 @@ """ Always passes account name as first param """ - gajim.interface.dispatch(event, self.name, data) + gajim.ged.raise_event(event, self.name, data) def _reconnect(self): """ diff -r 16666da7cd22 -r 577530a024bb src/common/gajim.py --- a/src/common/gajim.py Mon Jan 18 17:16:06 2010 +0100 +++ b/src/common/gajim.py Tue Jan 19 21:32:45 2010 +0100 @@ -67,6 +67,8 @@ connections = {} # 'account name': 'account (connection.Connection) instance' ipython_window = None +ged = None # Global Events Dispatcher + log = logging.getLogger('gajim') import logger diff -r 16666da7cd22 -r 577530a024bb src/gui_interface.py --- a/src/gui_interface.py Mon Jan 18 17:16:06 2010 +0100 +++ b/src/gui_interface.py Tue Jan 19 21:32:45 2010 +0100 @@ -85,6 +85,7 @@ import profile_window import config from threading import Thread +from common import ged gajimpaths = common.configpaths.gajimpaths config_filename = gajimpaths['CONFIG_FILE'] @@ -1817,7 +1818,7 @@ # ('PEP_CONFIG', account, (node, form)) if 'pep_services' in self.instances[account]: self.instances[account]['pep_services'].config(data[0], data[1]) - + def handle_event_roster_item_exchange(self, account, data): # data = (action in [add, delete, modify], exchange_list, jid_from) dialogs.RosterItemExchangeWindow(account, data[0], data[1], data[2]) @@ -2016,17 +2017,7 @@ if pm_ctrl and hasattr(pm_ctrl, "update_contact"): pm_ctrl.update_contact() - def register_handler(self, event, handler): - if event not in self.handlers: - self.handlers[event] = [] - - if handler not in self.handlers[event]: - self.handlers[event].append(handler) - - def unregister_handler(self, event, handler): - self.handlers[event].remove(handler) - - def register_handlers(self): + def create_core_handlers_list(self): self.handlers = { 'ROSTER': [self.handle_event_roster], 'WARNING': [self.handle_event_warning], @@ -2118,21 +2109,17 @@ 'PEP_RECEIVED': [self.handle_event_pep_received], 'CAPS_RECEIVED': [self.handle_event_caps_received] } - - def dispatch(self, event, account, data): + + def register_core_handlers(self): """ - Dispatch an network event to the event handlers of this class. Return - true if it could be dispatched to alteast one handler + Register core handlers in Global Events Dispatcher (GED). + + This is part of rewriting whole events handling system to use GED. """ - if event not in self.handlers: - log.warning('Unknown event %s dispatched to GUI: %s' % (event, data)) - return False - else: - log.debug('Event %s distpached to GUI: %s' % (event, data)) - for handler in self.handlers[event]: - handler(account, data) - return len(self.handlers[event]) - + for event_name, event_handlers in self.handlers.iteritems(): + for event_handler in event_handlers: + gajim.ged.register_event_handler(event_name, ged.CORE, + event_handler) ################################################################################ ### Methods dealing with gajim.events @@ -2800,13 +2787,15 @@ listener.disconnect(self.music_track_changed_signal) self.music_track_changed_signal = None - def music_track_changed(self, unused_listener, music_track_info, account=None): + def music_track_changed(self, unused_listener, music_track_info, + account=None): if not account: accounts = gajim.connections.keys() else: accounts = [account] - - is_paused = hasattr(music_track_info, 'paused') and music_track_info.paused == 0 + + is_paused = hasattr(music_track_info, 'paused') and \ + music_track_info.paused == 0 if not music_track_info or is_paused: artist = title = source = '' else: @@ -2833,7 +2822,7 @@ def format_gdkcolor (gdkcolor): return format_rgb (*gdkcolor_to_rgb (gdkcolor)) - + # get style colors and create string for dvipng dummy = gtk.Invisible() dummy.ensure_style() @@ -3177,8 +3166,8 @@ except Exception: pass gobject.timeout_add_seconds(5, remote_init) - - + + def __init__(self): gajim.interface = self gajim.thread_interface = ThreadInterface @@ -3276,7 +3265,13 @@ self.handle_event_file_error) gajim.proxy65_manager = proxy65_manager.Proxy65Manager(gajim.idlequeue) gajim.default_session_type = ChatControlSession - self.register_handlers() + + # Creating Global Events Dispatcher + from common import ged + gajim.ged = ged.GlobalEventsDispatcher() + self.create_core_handlers_list() + self.register_core_handlers() + if gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'active') \ and gajim.HAVE_ZEROCONF: gajim.connections[gajim.ZEROCONF_ACC_NAME] = \ @@ -3421,8 +3416,8 @@ self.last_ftwindow_update = 0 self.music_track_changed_signal = None - - + + class PassphraseRequest: def __init__(self, keyid): self.keyid = keyid @@ -3503,7 +3498,7 @@ def thread_function(func, func_args, callback, callback_args): output = func(*func_args) gobject.idle_add(callback, output, *callback_args) - + Thread(target=thread_function, args=(func, func_args, callback, callback_args)).start()

1 0

← Newer
1
2
3
4
5
6
7
...
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2010