changeset 72730fbb5184 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=72730fbb5184
description: merge from trunk
diffstat:
.hgtags | 2 +
ChangeLog | 31 +
Makefile.am | 14 +-
README.html | 4 +-
autogen.sh | 2 +-
data/gui/accounts_window.ui | 205 +-
data/gui/chat_control.ui | 2 +-
data/gui/contact_context_menu.ui | 2 +-
data/gui/history_window.ui | 21 +-
data/gui/plugins_window.ui | 398 +-
data/gui/preferences_window.ui | 136 +-
data/gui/roster_window.ui | 14 +-
debian/README.Debian | 2 -
debian/changelog | 33 +
debian/control | 6 +-
debian/copyright | 4 +-
debian/docs | 2 +-
debian/install | 1 +
debian/patches/00_debian-copying.diff | 21 -
debian/patches/01_configure-ac.diff | 33 -
debian/patches/series | 2 -
debian/rules | 6 +-
gajim.nsi | 28 +-
plugins/Makefile.am | 12 +-
plugins/acronyms_expander/acronyms_expander.py | 6 +-
plugins/banner_tweaks/__init__.py | 2 -
plugins/banner_tweaks/config_dialog.ui | 75 -
plugins/banner_tweaks/manifest.ini | 10 -
plugins/banner_tweaks/plugin.py | 201 -
plugins/dbus_plugin/plugin.py | 3 +
plugins/events_dump/plugin.py | 1 +
plugins/ftp_manager/__init__.py | 1 -
plugins/ftp_manager/config_dialog.ui | 281 -
plugins/ftp_manager/ftp_manager.py | 460 -
plugins/ftp_manager/manifest.ini | 7 -
plugins/google_translation/__init__.py | 1 -
plugins/google_translation/manifest.ini | 8 -
plugins/google_translation/plugin.py | 118 -
plugins/length_notifier/__init__.py | 2 -
plugins/length_notifier/config_dialog.ui | 152 -
plugins/length_notifier/length_notifier.py | 155 -
plugins/length_notifier/manifest.ini | 9 -
plugins/new_events_example/plugin.py | 2 +
plugins/roster_buttons/plugin.py | 4 +-
plugins/roster_buttons/roster_buttons.ui | 8 +-
plugins/snarl_notifications/plugin.py | 4 +
plugins/triggers/__init__.py | 1 -
plugins/triggers/config_dialog.ui | 900 ---
plugins/triggers/manifest.ini | 7 -
plugins/triggers/triggers.py | 637 --
plugins/whiteboard/__init__.py | 1 -
plugins/whiteboard/brush_tool.png | Bin
plugins/whiteboard/line_tool.png | Bin
plugins/whiteboard/manifest.ini | 7 -
plugins/whiteboard/oval_tool.png | Bin
plugins/whiteboard/plugin.py | 477 -
plugins/whiteboard/whiteboard.png | Bin
plugins/whiteboard/whiteboard_widget.py | 419 -
plugins/whiteboard/whiteboard_widget.ui | 192 -
po/de.po | 4447 ++++++++--------
po/fr.po | 6526 ++++++++++++++---------
po/ja.po | 5834 +++++++++-----------
po/ru.po | 4075 +++++++-------
po/uk.po | 3400 ++++++------
po/zh_TW.po | 5358 ++++++++++--------
scripts/dev/plugins_translate | 95 +
setup_win32.py | 9 +-
src/chat_control.py | 340 +-
src/command_system/implementation/execute.py | 2 +-
src/command_system/implementation/standard.py | 19 +-
src/common/commands.py | 9 +-
src/common/config.py | 24 +-
src/common/connection.py | 364 +-
src/common/connection_handlers.py | 175 +-
src/common/connection_handlers_events.py | 276 +-
src/common/contacts.py | 68 +-
src/common/defs.py | 2 +-
src/common/events.py | 10 +-
src/common/gajim.py | 37 +-
src/common/ged.py | 13 +-
src/common/gnupg.py | 2 +-
src/common/helpers.py | 177 +-
src/common/jingle.py | 5 +-
src/common/jingle_rtp.py | 21 +-
src/common/jingle_session.py | 7 +-
src/common/jingle_transport.py | 7 +-
src/common/logger.py | 106 +-
src/common/optparser.py | 11 +-
src/common/protocol/bytestream.py | 110 +-
src/common/proxy65_manager.py | 15 +-
src/common/pubsub.py | 7 +-
src/common/stanza_session.py | 12 +-
src/common/xmpp/__init__.py | 1 +
src/common/xmpp/auth_nb.py | 186 +-
src/common/xmpp/bosh.py | 18 +-
src/common/xmpp/client_nb.py | 13 +-
src/common/xmpp/dispatcher_nb.py | 40 +
src/common/xmpp/protocol.py | 116 +-
src/common/xmpp/roster_nb.py | 16 +-
src/common/xmpp/smacks.py | 130 +
src/common/xmpp/stringprepare.py | 4 +-
src/common/xmpp/tls_nb.py | 3 +-
src/common/zeroconf/client_zeroconf.py | 103 +-
src/common/zeroconf/connection_zeroconf.py | 64 +-
src/common/zeroconf/zeroconf_bonjour.py | 2 +-
src/config.py | 73 +-
src/conversation_textview.py | 16 +-
src/dialogs.py | 98 +-
src/features_window.py | 139 +-
src/filetransfers_window.py | 132 +-
src/gajim.py | 73 +-
src/groupchat_control.py | 136 +-
src/groups.py | 1 -
src/gtkgui_helpers.py | 1 +
src/gui_interface.py | 216 +-
src/gui_menu_builder.py | 6 +-
src/history_window.py | 8 +-
src/htmltextview.py | 99 +-
src/message_control.py | 33 +-
src/message_window.py | 20 +
src/notify.py | 178 +-
src/plugins/gui.py | 4 +-
src/plugins/plugin.py | 55 +-
src/plugins/pluginmanager.py | 37 +-
src/plugins/plugins_i18n.py | 41 +
src/remote_control.py | 21 +-
src/roster_window.py | 178 +-
src/secrets.py | 2 +-
src/session.py | 129 +-
src/tooltips.py | 1 +
src/upower_listener.py | 50 +
test/unit/test_contacts.py | 8 +-
test/unit/test_xmpp_smacks.py | 133 +
133 files changed, 19069 insertions(+), 20210 deletions(-)
diffs (truncated from 73300 to 300 lines):
diff -r e472bdfe92b4 -r 72730fbb5184 .hgtags
--- a/.hgtags Tue Dec 27 23:47:00 2011 -0500
+++ b/.hgtags Thu Dec 29 11:39:02 2011 +0100
@@ -4,3 +4,5 @@
7752eadd1f8c31a3dc282c15d87767a7ba1bd217 gajim-0.12-alpha1
a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1
91ceabbf74309d7bbd79b43552b89768842b4e8a gajim-0.14.1
+db4ecb0d1f187578732ceb2fa9beab0591125341 gajim-0.15-alpha1
+50d609e2b30b4eaded2af345580fdd7125d4e179 gajim-0.15-beta1
diff -r e472bdfe92b4 -r 72730fbb5184 ChangeLog
--- a/ChangeLog Tue Dec 27 23:47:00 2011 -0500
+++ b/ChangeLog Thu Dec 29 11:39:02 2011 +0100
@@ -1,3 +1,34 @@
+Gajim 0.15 (XX XX 2011)
+
+ * Plugin system
+ * Whiteboard (via a plugin)
+ * Message archiving
+ * Stream managment
+ * IBB
+ * Nested roster group
+ * Roster filtrering
+ * UPower support
+ * GPG support for windows
+
+Gajim 0.14.4 (22 July 2011)
+
+ * Fix translation issue
+ * other minor fixes
+
+Gajim 0.14.3 (19 June 2011)
+
+ * Fix history viewer
+ * Fix closing roster window
+ * Prevent some erros with metacontacts
+
+Gajim 0.14.2 (07 June 2011)
+
+ * Fix CPU usage when testing file transfer proxies
+ * Fix invalid XML char regex
+ * Fix subscription request window handling
+ * Fix URL display in chat message banner
+ * Other minor bugfixes
+
Gajim 0.14.1 (26 October 2010)
* Fix changing account name
diff -r e472bdfe92b4 -r 72730fbb5184 Makefile.am
--- a/Makefile.am Tue Dec 27 23:47:00 2011 -0500
+++ b/Makefile.am Thu Dec 29 11:39:02 2011 +0100
@@ -1,20 +1,12 @@
-SUBDIRS = src data plugins po icons
+SUBDIRS = src data po icons plugins
ACLOCAL_AMFLAGS = -I m4
bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote
-docfilesdir = $(docdir)
-docfiles_DATA = README \
- README.html \
- ChangeLog \
- COPYING \
- THANKS \
- THANKS.artists \
- AUTHORS
-
EXTRA_DIST = \
- $(docfiles_DATA) \
+ README.html \
+ THANKS.artists \
autogen.sh \
intltool-extract.in \
intltool-merge.in \
diff -r e472bdfe92b4 -r 72730fbb5184 README.html
--- a/README.html Tue Dec 27 23:47:00 2011 -0500
+++ b/README.html Thu Dec 29 11:39:02 2011 +0100
@@ -72,7 +72,7 @@
</ul>
<p>steps to compile gajim:</p>
<pre>
- $ sh autogen.sh
+ $ ./autogen.sh
$ ./configure
$ make
</pre>
@@ -95,7 +95,7 @@
<h2>Miscellaneous</h2>
<h3>XML & Debugging</h3>
-<p>If you want to see the xml stanzas and/or help us debugging
+<p>If you want to see the xml stanzas and/or help us debugging
you're advised to enable verbose via advanced configuration window.
If you don't want to make this permanent, execute gajim with --verbose
everytime you want to have verbose output.</p>
diff -r e472bdfe92b4 -r 72730fbb5184 autogen.sh
--- a/autogen.sh Tue Dec 27 23:47:00 2011 -0500
+++ b/autogen.sh Thu Dec 29 11:39:02 2011 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
- gajimversion="0.14.0.1"
+ gajimversion="0.15-beta2"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
diff -r e472bdfe92b4 -r 72730fbb5184 data/gui/accounts_window.ui
--- a/data/gui/accounts_window.ui Tue Dec 27 23:47:00 2011 -0500
+++ b/data/gui/accounts_window.ui Thu Dec 29 11:39:02 2011 +0100
@@ -63,13 +63,42 @@
</child>
<child>
<object class="GtkButton" id="add_button">
- <property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">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="use_stock">True</property>
<signal name="clicked" handler="on_add_button_clicked"/>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-add</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Add</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -78,13 +107,42 @@
</child>
<child>
<object class="GtkButton" id="remove_button">
- <property name="label">gtk-remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">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="use_stock">True</property>
<signal name="clicked" handler="on_remove_button_clicked"/>
+ <child>
+ <object class="GtkAlignment" id="alignment7">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox7">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label26">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Delete</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -99,52 +157,37 @@
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<signal name="clicked" handler="on_rename_button_clicked"/>
<child>
- <object class="GtkHBox" id="hbox8">
+ <object class="GtkAlignment" id="alignment6">
<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="spacing">6</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <object class="GtkLabel" id="label26">
+ <object class="GtkHBox" id="hbox8">
<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="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="rename_image">
+ <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-missing-image</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label25">
+ <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">Re_name</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="rename_image">
- <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-missing-image</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label25">
- <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">Re_name</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label27">
- <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>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
</child>
</object>
</child>
@@ -451,48 +494,70 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkVBox" id="vbox13">
<property name="visible">True</property>
+ <property
name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label28">
+ <object class="GtkHBox" id="hbox2">
<property
name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">_Client Cert File:</property>
- <property
name="use_underline">True</property>
- <property
name="mnemonic_widget">cert_entry1</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel"
id="label28">
+ <property
name="visible">True</property>
+ <property
name="xalign">0</property>
+ <property name="label"
translatable="yes">_Client Cert File:</property>
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
