changeset f2def8625d2b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f2def8625d2b description: merge from default branch
diffstat: README.html | 1 - autogen.sh | 2 +- configure.ac | 4 +- 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/plugins_window.glade | 608 ---- 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 | 444 --- 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 | 144 + data/gui/account_creation_wizard_window.ui | 899 ++++++ data/gui/accounts_window.ui | 1423 +++++++++ data/gui/add_new_contact_window.ui | 391 ++ data/gui/adhoc_commands_window.ui | 434 ++ data/gui/advanced_configuration_window.ui | 153 + data/gui/advanced_menuitem_menu.ui | 78 + 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 | 340 ++ data/gui/change_mood_dialog.ui | 352 ++ data/gui/change_password_dialog.ui | 143 + data/gui/change_status_message_dialog.ui | 316 ++ data/gui/chat_context_menu.ui | 111 + data/gui/chat_control.ui | 831 +++++ 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 | 392 ++ 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 | 133 + data/gui/gc_occupants_menu.ui | 188 + data/gui/groupchat_control.ui | 428 ++ data/gui/groups_post_window.ui | 138 + data/gui/history_manager.ui | 350 ++ data/gui/history_window.ui | 234 + 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 | 77 + data/gui/passphrase_dialog.ui | 115 + data/gui/plugins_window.ui | 644 ++++ 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 | 455 +++ 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 | 34 + 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 | 130 + 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 | 41 + data/gui/zeroconf_information_window.ui | 399 ++ data/other/cacerts.pem | 45 + gajim.nsi | 8 +- plugins/banner_tweaks/config_dialog.glade | 73 - plugins/banner_tweaks/config_dialog.ui | 75 + plugins/banner_tweaks/plugin.py | 26 +- plugins/length_notifier/config_dialog.glade | 152 - plugins/length_notifier/config_dialog.ui | 152 + plugins/length_notifier/length_notifier.py | 22 +- plugins/roster_buttons/plugin.py | 16 +- plugins/roster_buttons/roster_buttons.glade | 64 - plugins/roster_buttons/roster_buttons.ui | 70 + po/cs.po | 2735 +++++++----------- src/adhoc_commands.py | 10 +- src/advanced_configuration_window.py | 16 +- src/atom_window.py | 8 +- src/chat_control.py | 134 +- src/common/account.py | 3 + src/common/check_paths.py | 269 +- src/common/config.py | 1 + src/common/configpaths.py | 140 +- src/common/connection.py | 13 +- src/common/connection_handlers.py | 16 +- src/common/contacts.py | 10 + src/common/defs.py | 2 +- src/common/gajim.py | 1 - src/common/ged.py | 17 +- src/common/helpers.py | 31 +- src/common/logger.py | 12 + src/common/optparser.py | 2 + src/common/pep.py | 49 + src/common/resolver.py | 2 +- src/common/socks5.py | 2 +- src/config.py | 671 ++-- src/conversation_textview.py | 26 +- src/dataforms_widget.py | 22 +- src/dialogs.py | 616 ++- src/disco.py | 71 +- src/features_window.py | 12 +- src/filetransfers_window.py | 28 +- src/gajim-remote.py | 2 - src/gajim.py | 14 +- src/gajim_themes_window.py | 42 +- src/groupchat_control.py | 90 +- src/groups.py | 8 +- src/gtkgui_helpers.py | 18 +- src/gui_interface.py | 106 +- src/gui_menu_builder.py | 56 +- src/history_manager.py | 36 +- src/history_window.py | 34 +- src/message_control.py | 4 +- src/message_textview.py | 23 + src/message_window.py | 37 +- src/negotiation.py | 8 +- src/plugins/gui.py | 8 +- src/profile_window.py | 32 +- src/roster_window.py | 136 +- src/search_window.py | 8 +- src/statusicon.py | 16 +- src/vcard.py | 98 +- test/lib/__init__.py | 2 +- 196 files changed, 26092 insertions(+), 29586 deletions(-) diffs (truncated from 63441 to 300 lines): diff -r 4cc397deae6d -r f2def8625d2b README.html --- a/README.html Tue Jan 19 16:37:14 2010 +0100 +++ b/README.html Mon Feb 08 22:25:41 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 4cc397deae6d -r f2def8625d2b autogen.sh --- a/autogen.sh Tue Jan 19 16:37:14 2010 +0100 +++ b/autogen.sh Mon Feb 08 22:25:41 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 4cc397deae6d -r f2def8625d2b configure.ac --- a/configure.ac Tue Jan 19 16:37:14 2010 +0100 +++ b/configure.ac Mon Feb 08 22:25:41 2010 +0100 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.13.10.1-dev],[http://trac.gajim.org/],[gajim]) + [0.13.10.2-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) @@ -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 4cc397deae6d -r f2def8625d2b data/Makefile.am --- a/data/Makefile.am Tue Jan 19 16:37:14 2010 +0100 +++ b/data/Makefile.am Mon Feb 08 22:25:41 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 4cc397deae6d -r f2def8625d2b data/glade/Makefile.am --- a/data/glade/Makefile.am Tue Jan 19 16:37: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 4cc397deae6d -r f2def8625d2b data/glade/account_context_menu.glade --- a/data/glade/account_context_menu.glade Tue Jan 19 16:37: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"> -<!--*- mode: xml -*--> -<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 4cc397deae6d -r f2def8625d2b data/glade/account_creation_wizard_window.glade --- a/data/glade/account_creation_wizard_window.glade Tue Jan 19 16:37:14 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,886 +0,0 @@ -<?xml version="1.0"?> -<glade-interface> - <!-- interface-requires gtk+ 2.16 --> - <!-- interface-naming-policy toplevel-contextual --> - <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> _______________________________________________ Commits mailing list [email protected] http://lists.gajim.org/cgi-bin/listinfo/commits
