changeset 2c459d0cb00b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2c459d0cb00b description: Merge default to jingle
diffstat: Makefile.am | 9 + README.html | 4 +- configure.ac | 2 +- data/glade/chat_control_popup_menu.glade | 123 - data/glade/contact_context_menu.glade | 421 +++ data/glade/roster_contact_context_menu.glade | 360 --- data/glade/zeroconf_contact_context_menu.glade | 169 - 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 | doc/epydoc.conf | 29 + epydoc.conf | 29 - gajim.nsi | 30 - po/be.po | 2988 ++++++++++++++------------- po/[email protected] | 2998 ++++++++++++++------------- po/bg.po | 2959 ++++++++++++++------------ po/br.po | 3001 ++++++++++++++------------- po/cs.po | 2943 ++++++++++++++------------ po/da.po | 2957 ++++++++++++++------------ po/de.po | 2994 ++++++++++++++------------- po/el.po | 3008 ++++++++++++++------------- po/en_GB.po | 2958 ++++++++++++++------------ po/eo.po | 2982 ++++++++++++++------------- po/es.po | 2944 ++++++++++++++------------ po/eu.po | 2986 ++++++++++++++------------- po/fr.po | 2962 ++++++++++++++------------ po/gl.po | 2982 ++++++++++++++------------- po/hr.po | 2961 ++++++++++++++------------ po/it.po | 2973 ++++++++++++++------------ po/lt.po | 2996 ++++++++++++++------------- po/nb.po | 2960 ++++++++++++++------------ po/nl.po | 3028 ++++++++++++++------------- po/no.po | 2960 ++++++++++++++------------ po/pl.po | 2951 ++++++++++++++------------ po/pt.po | 3005 ++++++++++++++------------- po/pt_BR.po | 2139 ++++++++++--------- po/ru.po | 2951 ++++++++++++++------------ po/sk.po | 2960 ++++++++++++++------------ po/sr.po | 2962 ++++++++++++++------------ po/[email protected] | 2964 ++++++++++++++------------ po/sv.po | 2959 ++++++++++++++------------ po/uk.po | 2963 ++++++++++++++------------ po/zh_CN.po | 2955 ++++++++++++++------------ scripts/dev/run-build-test.py | 22 + scripts/dev/run-pychecker.py | 14 - scripts/dev/run-pylint.py | 13 + src/advanced.py | 296 -- src/advanced_configuration_window.py | 288 ++ src/chat_control.py | 143 +- src/command_system/implementation/standard.py | 2 +- src/common/config.py | 1 + src/common/connection.py | 7 +- src/common/connection_handlers.py | 13 +- src/common/defs.py | 2 +- src/common/helpers.py | 4 +- src/common/optparser.py | 17 + src/common/zeroconf/client_zeroconf.py | 10 +- src/common/zeroconf/connection_zeroconf.py | 4 +- src/config.py | 8 +- src/dialogs.py | 100 +- src/gajim.py | 50 +- src/groupchat_control.py | 50 +- src/gui_menu_builder.py | 466 ++++ src/message_control.py | 2 +- src/message_window.py | 29 + src/roster_window.py | 552 +---- src/systray.py | 2 +- 164 files changed, 47874 insertions(+), 43746 deletions(-) diffs (truncated from 211391 to 300 lines): diff -r a4cc02820b66 -r 2c459d0cb00b Makefile.am --- a/Makefile.am Thu Oct 29 10:08:22 2009 +0100 +++ b/Makefile.am Thu Oct 29 10:19:58 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 a4cc02820b66 -r 2c459d0cb00b README.html --- a/README.html Thu Oct 29 10:08:22 2009 +0100 +++ b/README.html Thu Oct 29 10:19:58 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 a4cc02820b66 -r 2c459d0cb00b configure.ac --- a/configure.ac Thu Oct 29 10:08:22 2009 +0100 +++ b/configure.ac Thu Oct 29 10:19:58 2009 +0100 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.12.5.6-dev],[http://trac.gajim.org/],[gajim]) + [0.12.5.7-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) diff -r a4cc02820b66 -r 2c459d0cb00b data/glade/chat_control_popup_menu.glade --- a/data/glade/chat_control_popup_menu.glade Thu Oct 29 10:08:22 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ -<?xml version="1.0"?> -<glade-interface> - <!-- interface-requires gtk+ 2.16 --> - <!-- interface-naming-policy toplevel-contextual --> - <widget class="GtkMenu" id="chat_control_popup_menu"> - <child> - <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> - <property name="label">_Add to Roster</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <signal name="activate" handler="_on_add_to_roster_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image3"> - <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="send_file_menuitem"> - <property name="label">Send _File</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <signal name="activate" handler="_on_send_file_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="stock">gtk-save</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="convert_to_groupchat"> - <property name="label">Invite _Contacts</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem2"> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="toggle_gpg_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Toggle Open_PGP Encryption</property> - <property name="use_underline">True</property> - <signal name="activate" handler="_on_toggle_gpg_menuitem_activate"/> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="start_voip_menuitem"> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Start _Voice chat</property> - <property name="use_underline">True</property> - <signal name="activate" handler="_on_start_voip_menuitem_activate"/> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="stop_voip_menuitem"> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Stop _Voice chat</property> - <property name="use_underline">True</property> - <signal name="activate" handler="_on_stop_voip_menuitem_activate"/> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="toggle_e2e_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">Toggle End to End Encryption</property> - <property name="use_underline">True</property> - <signal name="activate" handler="_on_toggle_e2e_menuitem_activate"/> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="information_menuitem"> - <property name="label">gtk-info</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="history_menuitem"> - <property name="label">_History</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-justify-fill</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - </widget> -</glade-interface> diff -r a4cc02820b66 -r 2c459d0cb00b data/glade/contact_context_menu.glade --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/glade/contact_context_menu.glade Thu Oct 29 10:19:58 2009 +0100 @@ -0,0 +1,421 @@ +<?xml version="1.0"?> +<glade-interface> + <!-- interface-requires gtk+ 2.16 --> + <!-- interface-naming-policy toplevel-contextual --> + <widget class="GtkMenu" id="contact_context_menu"> + <child> + <widget class="GtkImageMenuItem" id="start_chat_menuitem"> + <property name="label" translatable="yes">Start _Chat</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-jump-to</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="send_single_message_menuitem"> + <property name="label" translatable="yes">Send Single _Message...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="stock">gtk-new</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="send_file_menuitem"> + <property name="label" translatable="yes">Send _File...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="stock">gtk-save</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="invite_menuitem"> + <property name="label" translatable="yes">In_vite to</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="convert_to_groupchat_menuitem"> + <property name="label" translatable="yes">Invite _Contacts</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkSeparatorMenuItem" id="encryption_separator"> + <property name="visible">True</property> + </widget> + </child> + <child> + <widget class="GtkCheckMenuItem" id="toggle_gpg_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Toggle Open_PGP Encryption</property> + <property name="use_underline">True</property> + </widget> + </child> + <child> + <widget class="GtkCheckMenuItem" id="toggle_e2e_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Toggle End to End Encryption</property> + <property name="use_underline">True</property> + </widget> + </child> + <child> + <widget class="GtkSeparatorMenuItem" id="menuitem3"> + <property name="visible">True</property> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="send_custom_status_menuitem"> + <property name="label" translatable="yes">Send Cus_tom Status</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child> + <widget class="GtkMenu" id="menu5"> + <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 internal-child="image"> + <widget class="GtkImage" id="image6"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="execute_command_menuitem"> + <property name="label" translatable="yes">E_xecute Command...</property> + <property name="visible">True</property> _______________________________________________ Commits mailing list [email protected] http://lists.gajim.org/cgi-bin/listinfo/commits
