changeset 42d118f04b78 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=42d118f04b78
description: merge from default

diffstat:

 .hgignore                                           |     1 +
 ChangeLog                                           |    54 +
 Makefile.am                                         |     9 +
 README.html                                         |     4 +-
 THANKS.artists                                      |     2 +
 TODO.pep                                            |     8 -
 configure.ac                                        |     2 +-
 data/glade/account_creation_wizard_window.glade     |   169 +-
 data/glade/accounts_window.glade                    |  1400 +++--
 data/glade/chat_control_popup_menu.glade            |   103 -
 data/glade/contact_context_menu.glade               |   421 +
 data/glade/input_dialog.glade                       |   269 +-
 data/glade/join_groupchat_window.glade              |   633 +-
 data/glade/manage_proxies_window.glade              |   137 +-
 data/glade/message_window.glade                     |   324 +-
 data/glade/preferences_window.glade                 |   603 +-
 data/glade/privacy_list_window.glade                |    14 +
 data/glade/roster_contact_context_menu.glade        |   360 -
 data/glade/roster_item_exchange_window.glade        |    34 +-
 data/glade/roster_window.glade                      |     4 +-
 data/glade/service_discovery_window.glade           |    45 +-
 data/glade/voip_call_received_dialog.glade          |    39 +
 data/glade/zeroconf_contact_context_menu.glade      |   142 -
 data/iconsets/crystal/16x16/away.png                |       
 data/iconsets/crystal/16x16/chat.png                |       
 data/iconsets/crystal/16x16/closed.png              |       
 data/iconsets/crystal/16x16/connecting.gif          |       
 data/iconsets/crystal/16x16/dnd.png                 |       
 data/iconsets/crystal/16x16/error.png               |       
 data/iconsets/crystal/16x16/event.gif               |       
 data/iconsets/crystal/16x16/invisible.png           |       
 data/iconsets/crystal/16x16/muc_active.png          |       
 data/iconsets/crystal/16x16/muc_inactive.png        |       
 data/iconsets/crystal/16x16/not_in_roster.png       |       
 data/iconsets/crystal/16x16/offline.png             |       
 data/iconsets/crystal/16x16/online.png              |       
 data/iconsets/crystal/16x16/opened.png              |       
 data/iconsets/crystal/16x16/requested.png           |       
 data/iconsets/crystal/16x16/xa.png                  |       
 data/iconsets/crystal/32x32/muc_active.png          |       
 data/iconsets/crystal/32x32/muc_inactive.png        |       
 data/iconsets/crystal/48x48/offline.png             |       
 data/iconsets/crystal/48x48/online.png              |       
 data/iconsets/gossip/16x16/away.png                 |       
 data/iconsets/gossip/16x16/chat.png                 |       
 data/iconsets/gossip/16x16/closed.png               |       
 data/iconsets/gossip/16x16/connecting.gif           |       
 data/iconsets/gossip/16x16/dnd.png                  |       
 data/iconsets/gossip/16x16/error.png                |       
 data/iconsets/gossip/16x16/event.png                |       
 data/iconsets/gossip/16x16/invisible.png            |       
 data/iconsets/gossip/16x16/muc_active.png           |       
 data/iconsets/gossip/16x16/muc_inactive.png         |       
 data/iconsets/gossip/16x16/not_in_roster.png        |       
 data/iconsets/gossip/16x16/offline.png              |       
 data/iconsets/gossip/16x16/online.png               |       
 data/iconsets/gossip/16x16/opened.png               |       
 data/iconsets/gossip/16x16/requested.png            |       
 data/iconsets/gossip/16x16/xa.png                   |       
 data/iconsets/gossip/32x32/muc_active.png           |       
 data/iconsets/gossip/32x32/muc_inactive.png         |       
 data/iconsets/gossip/48x48/offline.png              |       
 data/iconsets/gossip/48x48/online.png               |       
 data/iconsets/nuvola/16x16/away.png                 |       
 data/iconsets/nuvola/16x16/chat.png                 |       
 data/iconsets/nuvola/16x16/closed.png               |       
 data/iconsets/nuvola/16x16/connecting.png           |       
 data/iconsets/nuvola/16x16/dnd.png                  |       
 data/iconsets/nuvola/16x16/error.png                |       
 data/iconsets/nuvola/16x16/event.gif                |       
 data/iconsets/nuvola/16x16/invisible.png            |       
 data/iconsets/nuvola/16x16/muc_active.png           |       
 data/iconsets/nuvola/16x16/muc_inactive.png         |       
 data/iconsets/nuvola/16x16/not_in_roster.png        |       
 data/iconsets/nuvola/16x16/offline.png              |       
 data/iconsets/nuvola/16x16/online.png               |       
 data/iconsets/nuvola/16x16/opened.png               |       
 data/iconsets/nuvola/16x16/requested.png            |       
 data/iconsets/nuvola/16x16/xa.png                   |       
 data/iconsets/nuvola/32x32/muc_active.png           |       
 data/iconsets/nuvola/32x32/muc_inactive.png         |       
 data/iconsets/nuvola/48x48/offline.png              |       
 data/iconsets/nuvola/48x48/online.png               |       
 data/iconsets/simplebulb/16x16/away.png             |       
 data/iconsets/simplebulb/16x16/chat.png             |       
 data/iconsets/simplebulb/16x16/closed.png           |       
 data/iconsets/simplebulb/16x16/connecting.png       |       
 data/iconsets/simplebulb/16x16/dnd.png              |       
 data/iconsets/simplebulb/16x16/error.png            |       
 data/iconsets/simplebulb/16x16/event.png            |       
 data/iconsets/simplebulb/16x16/invisible.png        |       
 data/iconsets/simplebulb/16x16/muc_active.png       |       
 data/iconsets/simplebulb/16x16/muc_inactive.png     |       
 data/iconsets/simplebulb/16x16/not_in_roster.png    |       
 data/iconsets/simplebulb/16x16/offline.png          |       
 data/iconsets/simplebulb/16x16/online.png           |       
 data/iconsets/simplebulb/16x16/opened.png           |       
 data/iconsets/simplebulb/16x16/requested.png        |       
 data/iconsets/simplebulb/16x16/xa.png               |       
 data/iconsets/simplebulb/32x32/muc_active.png       |       
 data/iconsets/simplebulb/32x32/muc_inactive.png     |       
 data/iconsets/simplebulb/48x48/offline.png          |       
 data/iconsets/simplebulb/48x48/online.png           |       
 data/iconsets/stellar/16x16/away.png                |       
 data/iconsets/stellar/16x16/chat.png                |       
 data/iconsets/stellar/16x16/closed.png              |       
 data/iconsets/stellar/16x16/connecting.gif          |       
 data/iconsets/stellar/16x16/dnd.png                 |       
 data/iconsets/stellar/16x16/error.png               |       
 data/iconsets/stellar/16x16/event.gif               |       
 data/iconsets/stellar/16x16/invisible.png           |       
 data/iconsets/stellar/16x16/muc_active.png          |       
 data/iconsets/stellar/16x16/muc_inactive.png        |       
 data/iconsets/stellar/16x16/not_in_roster.png       |       
 data/iconsets/stellar/16x16/offline.png             |       
 data/iconsets/stellar/16x16/online.png              |       
 data/iconsets/stellar/16x16/opened.png              |       
 data/iconsets/stellar/16x16/requested.png           |       
 data/iconsets/stellar/16x16/xa.png                  |       
 data/iconsets/stellar/32x32/muc_active.png          |       
 data/iconsets/stellar/32x32/muc_inactive.png        |       
 data/iconsets/stellar/48x48/offline.png             |       
 data/iconsets/stellar/48x48/online.png              |       
 data/iconsets/wroop/16x16/away.png                  |       
 data/iconsets/wroop/16x16/chat.png                  |       
 data/iconsets/wroop/16x16/closed.png                |       
 data/iconsets/wroop/16x16/connecting.gif            |       
 data/iconsets/wroop/16x16/dnd.png                   |       
 data/iconsets/wroop/16x16/error.png                 |       
 data/iconsets/wroop/16x16/event.gif                 |       
 data/iconsets/wroop/16x16/invisible.png             |       
 data/iconsets/wroop/16x16/muc_active.png            |       
 data/iconsets/wroop/16x16/muc_inactive.png          |       
 data/iconsets/wroop/16x16/not_in_roster.png         |       
 data/iconsets/wroop/16x16/offline.png               |       
 data/iconsets/wroop/16x16/online.png                |       
 data/iconsets/wroop/16x16/opened.png                |       
 data/iconsets/wroop/16x16/requested.png             |       
 data/iconsets/wroop/16x16/xa.png                    |       
 data/iconsets/wroop/32x32/away.png                  |       
 data/iconsets/wroop/32x32/chat.png                  |       
 data/iconsets/wroop/32x32/dnd.png                   |       
 data/iconsets/wroop/32x32/error.png                 |       
 data/iconsets/wroop/32x32/invisible.png             |       
 data/iconsets/wroop/32x32/muc_active.png            |       
 data/iconsets/wroop/32x32/muc_inactive.png          |       
 data/iconsets/wroop/32x32/not_in_roster.png         |       
 data/iconsets/wroop/32x32/offline.png               |       
 data/iconsets/wroop/32x32/online.png                |       
 data/iconsets/wroop/32x32/requested.png             |       
 data/iconsets/wroop/32x32/xa.png                    |       
 data/iconsets/wroop/48x48/away.png                  |       
 data/iconsets/wroop/48x48/chat.png                  |       
 data/iconsets/wroop/48x48/dnd.png                   |       
 data/iconsets/wroop/48x48/error.png                 |       
 data/iconsets/wroop/48x48/invisible.png             |       
 data/iconsets/wroop/48x48/muc_active.png            |       
 data/iconsets/wroop/48x48/muc_inactive.png          |       
 data/iconsets/wroop/48x48/not_in_roster.png         |       
 data/iconsets/wroop/48x48/offline.png               |       
 data/iconsets/wroop/48x48/online.png                |       
 data/iconsets/wroop/48x48/requested.png             |       
 data/iconsets/wroop/48x48/xa.png                    |       
 data/other/servers.xml                              |    12 +
 data/pixmaps/cam_active.png                         |       
 data/pixmaps/cam_inactive.png                       |       
 data/pixmaps/mic_active.png                         |       
 data/pixmaps/mic_inactive.png                       |       
 doc/epydoc.conf                                     |    29 +
 epydoc.conf                                         |    29 -
 gajim.nsi                                           |    43 +-
 po/be.po                                            |  5630 
+++++++++++++-----------
 po/[email protected]                                      |  5537 
+++++++++++++----------
 po/bg.po                                            |  5358 
+++++++++++++----------
 po/br.po                                            |  5533 
+++++++++++++-----------
 po/cs.po                                            |  3865 +++++++++-------
 po/da.po                                            |  5511 
+++++++++++++----------
 po/de.po                                            |  4438 ++++++++++--------
 po/el.po                                            |  5565 
+++++++++++++-----------
 po/en_GB.po                                         |  5425 
+++++++++++++----------
 po/eo.po                                            |  5646 
+++++++++++++-----------
 po/es.po                                            |  5139 
++++++++++++----------
 po/eu.po                                            |  5646 
+++++++++++++-----------
 po/fr.po                                            |  5279 
++++++++++++----------
 po/gl.po                                            |  5654 
+++++++++++++-----------
 po/hr.po                                            |  5274 
++++++++++++----------
 po/it.po                                            |  5583 
+++++++++++++-----------
 po/lt.po                                            |  5541 
+++++++++++++----------
 po/nb.po                                            |  5357 
+++++++++++++----------
 po/nl.po                                            |  5582 
+++++++++++++-----------
 po/no.po                                            |  5357 
+++++++++++++----------
 po/pl.po                                            |  3850 +++++++++-------
 po/pt.po                                            |  5529 
+++++++++++++-----------
 po/pt_BR.po                                         |  4202 +++++++++--------
 po/ru.po                                            |  4897 
+++++++++++---------
 po/sk.po                                            |  4335 ++++++++++--------
 po/sr.po                                            |  5363 
+++++++++++++----------
 po/[email protected]                                       |  5361 
+++++++++++++----------
 po/sv.po                                            |  4360 ++++++++++--------
 po/uk.po                                            |  4359 ++++++++++--------
 po/zh_CN.po                                         |  5512 
+++++++++++++----------
 scripts/dev/run-build-test.py                       |    22 +
 scripts/dev/run-pychecker.py                        |    14 -
 scripts/dev/run-pylint.py                           |    13 +
 setup_win32.py                                      |     1 +
 src/Makefile.am                                     |    10 +
 src/advanced.py                                     |   294 -
 src/advanced_configuration_window.py                |   288 +
 src/atom_window.py                                  |    16 +-
 src/chat_control.py                                 |   652 +-
 src/command_system/__init__.py                      |    20 +
 src/command_system/dispatching.py                   |    89 +
 src/command_system/errors.py                        |    41 +
 src/command_system/framework.py                     |   339 +
 src/command_system/implementation/__init__.py       |    19 +
 src/command_system/implementation/custom.py         |    86 +
 src/command_system/implementation/hosts.py          |    42 +
 src/command_system/implementation/middleware.py     |   120 +
 src/command_system/implementation/standard.py       |   251 +
 src/command_system/mapping.py                       |   360 +
 src/common/account.py                               |    32 +
 src/common/caps.py                                  |   493 +-
 src/common/check_paths.py                           |     6 +-
 src/common/config.py                                |    38 +-
 src/common/connection.py                            |   193 +-
 src/common/connection_handlers.py                   |   296 +-
 src/common/contacts.py                              |   691 +-
 src/common/crypto.py                                |     4 +-
 src/common/dbus_support.py                          |    13 +-
 src/common/defs.py                                  |     2 +-
 src/common/events.py                                |     5 +-
 src/common/fuzzyclock.py                            |   117 +-
 src/common/gajim.py                                 |    22 +-
 src/common/helpers.py                               |    97 +-
 src/common/i18n.py                                  |    18 +
 src/common/jingle.py                                |  1165 +++++
 src/common/kwalletbinding.py                        |    78 +
 src/common/latex.py                                 |    40 +-
 src/common/logger.py                                |   151 +-
 src/common/optparser.py                             |   227 +-
 src/common/passwords.py                             |    66 +-
 src/common/proxy65_manager.py                       |     6 +
 src/common/pubsub.py                                |    51 +-
 src/common/resolver.py                              |     8 -
 src/common/sleepy.py                                |    20 +
 src/common/socks5.py                                |    14 +-
 src/common/stanza_session.py                        |    54 +-
 src/common/xmpp/__init__.py                         |     2 +-
 src/common/xmpp/auth_nb.py                          |    11 +-
 src/common/xmpp/bosh.py                             |     5 +-
 src/common/xmpp/c14n.py                             |     6 +-
 src/common/xmpp/dispatcher_nb.py                    |     5 +-
 src/common/xmpp/protocol.py                         |     8 +
 src/common/xmpp/roster_nb.py                        |    14 +-
 src/common/xmpp/simplexml.py                        |     3 +
 src/common/xmpp/stringprepare.py                    |   227 +
 src/common/xmpp/tls_nb.py                           |     6 +-
 src/common/xmpp/transports_nb.py                    |   132 +-
 src/common/xmpp_stringprep.py                       |   266 -
 src/common/zeroconf/client_zeroconf.py              |    53 +-
 src/common/zeroconf/connection_handlers_zeroconf.py |    41 +-
 src/common/zeroconf/connection_zeroconf.py          |    11 +-
 src/common/zeroconf/roster_zeroconf.py              |     4 +
 src/common/zeroconf/zeroconf_avahi.py               |   149 +-
 src/config.py                                       |   600 +-
 src/conversation_textview.py                        |   127 +-
 src/dataforms_widget.py                             |    36 +-
 src/dialogs.py                                      |   708 ++-
 src/disco.py                                        |    51 +-
 src/features_window.py                              |    16 +-
 src/filetransfers_window.py                         |     5 +-
 src/gajim-remote.py                                 |    46 +-
 src/gajim.py                                        |  3190 +-------------
 src/gajim_themes_window.py                          |     3 -
 src/groupchat_control.py                            |   633 +-
 src/gtkgui_helpers.py                               |    20 +-
 src/gui_interface.py                                |  3496 +++++++++++++++
 src/gui_menu_builder.py                             |   473 ++
 src/history_manager.py                              |     4 +-
 src/history_window.py                               |    18 +-
 src/htmltextview.py                                 |   211 +-
 src/message_control.py                              |     9 +-
 src/message_window.py                               |    41 +-
 src/music_track_listener.py                         |    34 +-
 src/notify.py                                       |    11 +-
 src/remote_control.py                               |    36 +-
 src/roster_window.py                                |   983 +---
 src/search_window.py                                |     4 +-
 src/session.py                                      |    20 +-
 src/systray.py                                      |     2 +-
 src/vcard.py                                        |    16 +-
 test/integration/__init__.py                        |     6 +
 test/integration/test_gui_event_integration.py      |   193 +
 test/integration/test_resolver.py                   |   102 +
 test/integration/test_roster.py                     |   205 +
 test/integration/test_xmpp_client_nb.py             |   171 +
 test/integration/test_xmpp_transports_nb.py         |   278 +
 test/lib/gajim_mocks.py                             |     4 +
 test/lib/xmpp_mocks.py                              |     1 -
 test/runtests.py                                    |    22 +-
 test/test_caps.py                                   |    63 -
 test/test_misc_interface.py                         |   224 -
 test/test_resolver.py                               |   102 -
 test/test_roster.py                                 |   210 -
 test/test_sessions.py                               |   210 -
 test/test_xmpp_client_nb.py                         |   171 -
 test/test_xmpp_dispatcher_nb.py                     |    99 -
 test/test_xmpp_transports_nb.py                     |   325 -
 test/unit/__init__.py                               |     5 +
 test/unit/test_account.py                           |    21 +
 test/unit/test_caps.py                              |   152 +
 test/unit/test_contacts.py                          |   129 +
 test/unit/test_gui_interface.py                     |   112 +
 test/unit/test_sessions.py                          |   214 +
 test/unit/test_xmpp_dispatcher_nb.py                |    99 +
 test/unit/test_xmpp_transports_nb.py                |    80 +
 316 files changed, 100614 insertions(+), 80482 deletions(-)

diffs (truncated from 355907 to 300 lines):

diff -r 0eebe6de4a8d -r 42d118f04b78 .hgignore
--- a/.hgignore Mon Aug 17 19:32:17 2009 +0200
+++ b/.hgignore Fri Nov 13 19:45:11 2009 +0100
@@ -1,4 +1,5 @@
 syntax: glob
+*.orig
 *.gmo
 *.in
 *.la
diff -r 0eebe6de4a8d -r 42d118f04b78 ChangeLog
--- a/ChangeLog Mon Aug 17 19:32:17 2009 +0200
+++ b/ChangeLog Fri Nov 13 19:45:11 2009 +0100
@@ -1,3 +1,57 @@
+Gajim 0.13 (XX November 2009)
+
+  * Improve gtkspell (fix memleak)
+  * BOSH connection
+  * Roster versioning
+  * Ability to send contacts
+  * GUI to send XHTML messages
+  * Improve sessions handling
+  * pubsub storage (for bookmarks)
+  * Ability to select account when joining a groupchat
+  * Better Gnome keyring support
+  * Ability to ignore occupants in groupchats
+  * Ability to show / hide self contact row
+  * Automatically go away when screensaver is enabled under windows
+  * Ability to enable / disable accounts
+  * better URL recognition
+  * groupchat autoreconnect
+  * Store passwords in KDE wallet if available
+  * Better MUC errors handling
+  * Fix sound player launch (don't create zombies anymore)
+  * Optional shell like completion
+  * New color theme
+
+Gajim 0.12.5 (08 August 2009)
+
+  * Don't depend on GTK 2.14
+
+Gajim 0.12.4 (07 August 2009)
+
+  * Fix History manager
+  * Fix file transfer proxy discovering at connection
+  * Improve filetransfer with IPv6
+  * Fix zeroconf when receiving badly encoded info
+
+Gajim 0.12.3 (12 June 2009)
+
+  * Fix PLAIN authentication (in particular with Gtalk
+  * fix PEP discovery
+
+Gajim 0.12.2 (07 June 2009)
+
+  * Better keepalive / ping behaviour
+  * Fix custom port handling
+  * Improve error messages handling
+  * Totem support for played music
+  * Fix SSL with some servers
+  * Handle XFCE notification-daemon
+  * Restore old behaviour of click on systray: left click to open events
+  * Network manager 0.7 support
+  * Move logs file under windows to $APPDATA/gajim
+  * Improve Kerberos support
+  * Many bugfixes here and there
+  * Add -c option to history_manager
+
 Gajim 0.12.1 (21 December 2008)
 
   * Fix filetransfer
diff -r 0eebe6de4a8d -r 42d118f04b78 Makefile.am
--- a/Makefile.am       Mon Aug 17 19:32:17 2009 +0200
+++ b/Makefile.am       Fri Nov 13 19:45:11 2009 +0100
@@ -57,3 +57,12 @@
        autom4te.cache \
        build \
        dist
+
+
+test:
+       python test/runtests.py
+.PHONY: test
+
+doc:
+       epydoc --config=doc/epydoc.conf
+.PHONY: doc
diff -r 0eebe6de4a8d -r 42d118f04b78 README.html
--- a/README.html       Mon Aug 17 19:32:17 2009 +0200
+++ b/README.html       Fri Nov 13 19:45:11 2009 +0100
@@ -37,8 +37,8 @@
 <li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can 
avoid compiling trayicon and gtkspell</li>
 <li>gnome-python-desktop (for GnomeKeyring support)</li>
 <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
-<li>D-Bus running to have gajim-remote working. Some distributions split 
dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.60 is 
required.</li>
-<li>python-dbus bindings</li>
+<li>D-Bus running to have gajim-remote working. Some distributions split 
dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is 
required.</li>
+<li>python-dbus bindings (>=0.80)</li>
 <li>python-sexy to have clickable URLs in chat windows</li>
 <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher 
is required</li>
 </ul>
diff -r 0eebe6de4a8d -r 42d118f04b78 THANKS.artists
--- a/THANKS.artists    Mon Aug 17 19:32:17 2009 +0200
+++ b/THANKS.artists    Fri Nov 13 19:45:11 2009 +0100
@@ -2,7 +2,9 @@
 Christophe Got
 Dennis Craven
 Guillaume Morin
+Gvorcek Spajreh
 Josef Vybíral
 Membris Khan
 Rederick Asher
 Jakub Szypulka
+
diff -r 0eebe6de4a8d -r 42d118f04b78 TODO.pep
--- a/TODO.pep  Mon Aug 17 19:32:17 2009 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-• configure access model when changing it in the combobox
-• PEP in status change
-
-Tune use cases:
-• on disconnection of an account set Tune to None
-
-Tooltips use cases:
-• Show PEP in GC tooltips
diff -r 0eebe6de4a8d -r 42d118f04b78 configure.ac
--- a/configure.ac      Mon Aug 17 19:32:17 2009 +0200
+++ b/configure.ac      Fri Nov 13 19:45:11 2009 +0100
@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-               [0.12.3.1-dev],[http://trac.gajim.org/],[gajim])
+               [0.13.0.1-dev],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
 
 AC_CONFIG_HEADER(config.h)
diff -r 0eebe6de4a8d -r 42d118f04b78 
data/glade/account_creation_wizard_window.glade
--- a/data/glade/account_creation_wizard_window.glade   Mon Aug 17 19:32:17 
2009 +0200
+++ b/data/glade/account_creation_wizard_window.glade   Fri Nov 13 19:45:11 
2009 +0100
@@ -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.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>
@@ -30,13 +30,14 @@
                   <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">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <widget class="GtkAlignment" id="alignment68">
                         <property name="visible">True</property>
@@ -49,25 +50,26 @@
                             <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="label" translatable="yes">I 
already have an account I want to _use</property>
+                                <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</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="label" translatable="yes">I 
want to _register for a new account</property>
+                                <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                                 <property 
name="group">use_existing_account_radiobutton</property>
                               </widget>
@@ -105,8 +107,8 @@
                 <property name="visible">True</property>
               </widget>
               <packing>
+                <property name="tab_fill">False</property>
                 <property name="type">tab</property>
-                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
@@ -124,12 +126,13 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkTable" id="table27">
                     <property name="visible">True</property>
-                    <property name="n_rows">2</property>
+                    <property name="n_rows">3</property>
                     <property name="n_columns">4</property>
                     <property name="column_spacing">12</property>
                     <property name="row_spacing">6</property>
@@ -154,21 +157,21 @@
                         <property 
name="mnemonic_widget">password_entry</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkCheckButton" 
id="save_password_checkbutton">
+                        <property name="label" translatable="yes">Save 
pass_word</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="tooltip" translatable="yes">If 
checked, Gajim will remember the password for this account</property>
-                        <property name="label" translatable="yes">Save 
pass_word</property>
                         <property name="use_underline">True</property>
                         <property name="focus_on_click">False</property>
-                        <property name="response_id">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                         <signal name="toggled" 
handler="on_save_password_checkbutton_toggled"/>
@@ -176,8 +179,8 @@
                       <packing>
                         <property name="left_attach">2</property>
                         <property name="right_attach">4</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
@@ -192,8 +195,8 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
@@ -225,10 +228,6 @@
                     <child>
                       <widget class="GtkComboBoxEntry" 
id="server_comboboxentry">
                         <property name="visible">True</property>
-                        <child internal-child="entry">
-                          <widget class="GtkEntry" id="comboboxentry-entry1">
-                          </widget>
-                        </child>
                       </widget>
                       <packing>
                         <property name="left_attach">3</property>
@@ -237,6 +236,26 @@
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkCheckButton" 
id="anonymous_checkbutton1">
+                        <property name="label" translatable="yes">Anon_ymous 
authentication</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>
+                        <signal name="toggled" 
handler="on_anonymous_checkbutton1_toggled"/>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">4</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to