changeset c476f455dfa3 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=c476f455dfa3
description: merge outstanding branches
diffstat:
Makefile.am | 2 +-
configure.ac | 5 +
data/gui/groups_post_window.ui | 4 +-
data/gui/plugins_window.ui | 644 ++++++++++++++++++++++++
data/gui/roster_window.ui | 19 +-
plugins/Makefile.am | 10 +
plugins/acronyms_expander.py | 102 +++
plugins/banner_tweaks/__init__.py | 2 +
plugins/banner_tweaks/config_dialog.ui | 75 ++
plugins/banner_tweaks/plugin.py | 205 +++++++
plugins/dbus_plugin/__init__.py | 1 +
plugins/dbus_plugin/plugin.py | 738 +++++++++++++++++++++++++++
plugins/events_dump/__init__.py | 1 +
plugins/events_dump/plugin.py | 129 ++++
plugins/google_translation/__init__.py | 1 +
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 | 161 ++++++
plugins/new_events_example/__init__.py | 1 +
plugins/new_events_example/plugin.py | 147 +++++
plugins/roster_buttons/__init__.py | 4 +
plugins/roster_buttons/plugin.py | 86 +++
plugins/roster_buttons/roster_buttons.ui | 70 ++
plugins/snarl_notifications/PySnarl.py | 772 +++++++++++++++++++++++++++++
plugins/snarl_notifications/__init__.py | 1 +
plugins/snarl_notifications/plugin.py | 90 +++
src/Makefile.am | 3 +-
src/chat_control.py | 24 +-
src/common/check_paths.py | 9 +
src/common/config.py | 3 +
src/common/configpaths.py | 8 +-
src/common/connection_handlers.py | 496 +++++++++++------
src/common/gajim.py | 5 +
src/common/ged.py | 6 +-
src/common/nec.py | 134 +++++
src/common/xmpp/protocol.py | 2 +-
src/gajim-remote-plugin.py | 548 ++++++++++++++++++++
src/gajim-remote.py | 2 +-
src/groupchat_control.py | 4 +
src/gui_interface.py | 179 ++---
src/message_control.py | 2 +-
src/message_window.py | 6 +-
src/plugins/__init__.py | 30 +
src/plugins/gui.py | 220 ++++++++
src/plugins/helpers.py | 140 +++++
src/plugins/plugin.py | 234 ++++++++
src/plugins/pluginmanager.py | 456 +++++++++++++++++
src/pycallgraph.py | 410 +++++++++++++++
src/pylint.rc | 310 +++++++++++
src/remote_control.py | 26 +
src/roster_window.py | 8 +
src/session.py | 5 +
src/vcard.py | 30 +-
test/test_pluginmanager.py | 93 +++
55 files changed, 6624 insertions(+), 311 deletions(-)
diffs (truncated from 7670 to 300 lines):
diff -r 1d5b9526126e -r c476f455dfa3 Makefile.am
--- a/Makefile.am Sun Aug 08 07:24:35 2010 +0000
+++ b/Makefile.am Sun Aug 08 11:34:27 2010 +0200
@@ -1,4 +1,4 @@
-SUBDIRS = src data po icons
+SUBDIRS = src data plugins po icons
ACLOCAL_AMFLAGS = -I m4
diff -r 1d5b9526126e -r c476f455dfa3 configure.ac
--- a/configure.ac Sun Aug 08 07:24:35 2010 +0000
+++ b/configure.ac Sun Aug 08 11:34:27 2010 +0200
@@ -65,14 +65,17 @@
instead of DATADIR/gajim/src.])]
,
AC_SUBST([gajim_srcdir], [\${pkgpythondir}])
+AC_SUBST([gajim_pluginsdir], [\${pkgpythondir}])
,
AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src])
+AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins])
)
AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}")
AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}")
AS_AC_EXPAND(DOCDIR, "${docdir}")
AS_AC_EXPAND(LOCALEDIR, "${localedir}")
+AS_AC_EXPAND(GAJIM_PLUGINSDIR, "${gajim_pluginsdir}")
AC_SUBST(VERSION)
AC_SUBST(PACKAGE)
@@ -94,6 +97,7 @@
scripts/gajim-remote:scripts/gajim.in
scripts/gajim-history-manager:scripts/gajim.in
po/Makefile.in
+ plugins/Makefile
])
AC_OUTPUT
echo "
@@ -101,6 +105,7 @@
Installation:
Prefix ........... ${prefix}
Python modules ... ${GAJIM_SRCDIR}
+ Plugins .. ....... ${GAJIM_PLUGINSDIR}
Documentation .... ${DOCDIR}
Others ........... ${PKGDATADIR}
*****************************"
diff -r 1d5b9526126e -r c476f455dfa3 data/gui/groups_post_window.ui
--- a/data/gui/groups_post_window.ui Sun Aug 08 07:24:35 2010 +0000
+++ b/data/gui/groups_post_window.ui Sun Aug 08 11:34:27 2010 +0200
@@ -20,7 +20,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">From</property>
+ <property name="label" translatable="yes">From:</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -31,7 +31,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Subject</property>
+ <property name="label" translatable="yes">Subject:</property>
</object>
<packing>
<property name="top_attach">1</property>
diff -r 1d5b9526126e -r c476f455dfa3 data/gui/plugins_window.ui
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/data/gui/plugins_window.ui Sun Aug 08 11:34:27 2010 +0200
@@ -0,0 +1,644 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkWindow" id="plugins_window">
+ <property name="width_request">650</property>
+ <property name="height_request">500</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Plugins</property>
+ <property name="default_width">650</property>
+ <property name="default_height">500</property>
+ <signal name="destroy" handler="on_plugins_window_destroy"/>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkNotebook" id="plugins_notebook">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkHPaned" id="hpaned1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="position">250</property>
+ <property name="position_set">True</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkTreeView"
id="installed_plugins_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="plugin_name_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">&lt;empty&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Version:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="plugin_version_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes"><empty></property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ <property name="label"
translatable="yes">Authors:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="plugin_authors_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label"
translatable="yes"><empty></property>
+ <property name="wrap_mode">word-char</property>
+ <property name="selectable">True</property>
+ <property name="ellipsize">end</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Homepage:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLinkButton"
id="plugin_homepage_linkbutton">
+ <property name="label" translatable="yes">homepage
url</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <property name="focus_on_click">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Descrition:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTextView"
id="plugin_description_textview">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="pixels_above_lines">6</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">word</property>
+ <property name="left_margin">6</property>
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
