gajim: Merge default branch into osx_newbuildsys branch.

changeset b765732974a5 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=b765732974a5 description: Merge default branch into osx_newbuildsys branch.

diffstat:

configure.ac | 2 +- data/glade/input_dialog.glade | 269 +- data/glade/manage_proxies_window.glade | 137 +- po/ru.po | 3537 +++++++++++++++++--------------- po/uk.po | 2813 ++++++++++++++------------ src/common/check_paths.py | 16 + src/common/config.py | 3 +- src/common/connection.py | 11 +- src/common/connection_handlers.py | 121 +- src/common/contacts.py | 9 + src/common/defs.py | 2 +- src/common/gajim.py | 1 + src/common/kwalletbinding.py | 78 + src/common/logger.py | 137 + src/common/optparser.py | 37 + src/common/passwords.py | 66 +- src/common/xmpp/__init__.py | 2 +- src/common/xmpp/auth_nb.py | 11 +- src/common/xmpp/bosh.py | 5 +- src/common/xmpp/client_nb.py | 8 +- src/common/xmpp/roster_nb.py | 39 +- src/common/xmpp/tls_nb.py | 6 +- src/common/xmpp/transports_nb.py | 10 +- src/common/zeroconf/client_zeroconf.py | 3 + src/common/zeroconf/connection_zeroconf.py | 5 + src/config.py | 14 +- src/conversation_textview.py | 11 +- src/dialogs.py | 131 +- src/features_window.py | 9 +- src/gajim.py | 32 +- src/groupchat_control.py | 111 +- src/roster_window.py | 62 +- 32 files changed, 4304 insertions(+), 3394 deletions(-)

diffs (truncated from 18487 to 300 lines):

diff -r 693e4cdeb587 -r b765732974a5 configure.ac --- a/configure.ac Tue Jul 07 22:48:02 2009 +0200 +++ b/configure.ac Sun Jul 19 21:56:34 2009 +0200 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.12.1.5-dev],[http://trac.gajim.org/%5D,%5Bgajim]) + [0.12.3.1-dev],[http://trac.gajim.org/%5D,%5Bgajim]) AC_PREREQ([2.59]) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_SRCDIR(src) diff -r 693e4cdeb587 -r b765732974a5 data/glade/input_dialog.glade --- a/data/glade/input_dialog.glade Tue Jul 07 22:48:02 2009 +0200 +++ b/data/glade/input_dialog.glade Sun Jul 19 21:56:34 2009 +0200 @@ -1,160 +1,113 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0"?> <glade-interface> - -<widget class="GtkDialog" id="input_dialog"> - <property name="border_width">6</property> - <property name="title" translatable="yes"></property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <property name="has_separator">False</property> - <signal name="destroy" handler="on_input_dialog_destroy" last_modification_time="Sat, 18 Nov 2006 20:23:21 GMT"/> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox10"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area9"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="cancelbutton"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-6</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="okbutton"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-ok</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox76"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkHBox" id="hbox2960"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkImage" id="image507"> - <property name="visible">True</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="input_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="activates_default">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - + <!-- interface-requires gtk+ 2.12 --> + <!-- interface-naming-policy toplevel-contextual --> + <widget class="GtkDialog" id="input_dialog"> + <property name="border_width">6</property> + <property name="type_hint">dialog</property> + <property name="has_separator">False</property> + <signal name="delete_event" handler="on_input_dialog_delete_event"/> + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox10"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkVBox" id="vbox"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">6</property> + <child> + <widget class="GtkHBox" id="hbox2960"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> + <widget class="GtkImage" id="image507"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon-size">6</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label"> + <property name="visible">True</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="input_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area9"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <widget class="GtkButton" id="cancelbutton"> + <property name="label">gtk-cancel</property> + <property name="response_id">-6</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="okbutton"> + <property name="label">gtk-ok</property> + <property name="response_id">-5</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </widget> + </child> + </widget> </glade-interface> diff -r 693e4cdeb587 -r b765732974a5 data/glade/manage_proxies_window.glade --- a/data/glade/manage_proxies_window.glade Tue Jul 07 22:48:02 2009 +0200 +++ b/data/glade/manage_proxies_window.glade Sun Jul 19 21:56:34 2009 +0200 @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--*- mode: xml -*--> +<?xml version="1.0"?> <glade-interface> + <!-- interface-requires gtk+ 2.12 --> + <!-- interface-naming-policy toplevel-contextual --> <widget class="GtkWindow" id="manage_proxies_window"> <property name="border_width">12</property> <property name="title" translatable="yes">Manage Proxy Profiles</property> @@ -22,9 +22,9 @@