Commits August 2011

commits@gajim.org

3 participants
99 discussions

gajim: plugins window redesign
by Fomin Denis 25 Aug '11

25 Aug '11

changeset c7f703507a15 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c7f703507a15 description: plugins window redesign diffstat: data/gui/plugins_window.ui | 398 ++++++---------------------------- plugins/ftp_manager/config_dialog.ui | 2 +- 2 files changed, 77 insertions(+), 323 deletions(-) diffs (truncated from 491 to 300 lines): diff -r 175f23cb3ff5 -r c7f703507a15 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Wed Aug 24 16:39:49 2011 +0200 +++ b/data/gui/plugins_window.ui Thu Aug 25 12:58:39 2011 +0300 @@ -25,24 +25,82 @@ <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"> + <object class="GtkAlignment" id="alignment1"> <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> + <property name="xalign">0</property> <child> - <object class="GtkTreeView" id="installed_plugins_treeview"> + <object class="GtkVBox" id="vbox6"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="orientation">vertical</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">never</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="position">0</property> + </packing> + </child> + <child> + <object class="GtkAspectFrame" id="aspectframe1"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <property name="xalign">0</property> + <child> + <object class="GtkButton" id="install_plugin_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="on_install_plugin_button_clicked"/> + <child> + <object class="GtkHBox" id="hbox8"> + <property name="visible">True</property> + <child> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-apply</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="configure_plugin_button_label2"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Install from zip</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> </object> </child> </object> <packing> <property name="resize">False</property> - <property name="shrink">True</property> + <property name="shrink">False</property> </packing> </child> <child> @@ -166,7 +224,6 @@ <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> @@ -181,15 +238,7 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> + <placeholder/> </child> </object> <packing> @@ -220,58 +269,21 @@ </packing> </child> <child> - <object class="GtkHButtonBox" id="hbuttonbox2"> + <object class="GtkHButtonBox" id="hbuttonbox3"> <property name="visible">True</property> <property name="spacing">5</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="install_plugin_button"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="on_install_plugin_button_clicked"/> - <child> - <object class="GtkHBox" id="hbox13"> - <property name="visible">True</property> - <child> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="stock">gtk-apply</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="install_plugin_button_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Install</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkButton" id="uninstall_plugin_button"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="receives_default">True</property> <signal name="clicked" handler="on_uninstall_plugin_button_clicked"/> <child> - <object class="GtkHBox" id="hbox11"> + <object class="GtkHBox" id="hbox6"> <property name="visible">True</property> <child> - <object class="GtkImage" id="image1"> + <object class="GtkImage" id="image5"> <property name="visible">True</property> <property name="stock">gtk-cancel</property> </object> @@ -280,7 +292,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="uninstall_plugin_button_label"> + <object class="GtkLabel" id="uninstall_plugin_button_label1"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Uninstall</property> @@ -305,10 +317,10 @@ <property name="receives_default">True</property> <signal name="clicked" handler="on_configure_plugin_button_clicked"/> <child> - <object class="GtkHBox" id="hbox12"> + <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> <child> - <object class="GtkImage" id="image2"> + <object class="GtkImage" id="image6"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> </object> @@ -317,7 +329,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="configure_plugin_button_label"> + <object class="GtkLabel" id="configure_plugin_button_label1"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Configure</property> @@ -359,264 +371,6 @@ </packing> </child> <child> - <object class="GtkHPaned" id="hpaned2"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTreeView" id="treeview2"> - <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="vbox4"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkHBox" id="hbox6"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="plugin_name_label1"> - <property name="visible">True</property> - <property name="label" translatable="yes"><empty></property> - <property name="selectable">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment3"> - <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="hbox7"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label3"> - <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_label1"> - <property name="visible">True</property> - <property name="label" translatable="yes"><empty></property> - <property name="selectable">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - </object>

1 0

gajim: fix var name
by Yann Leboulanger 24 Aug '11

24 Aug '11

changeset b20793bde31b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b20793bde31b description: fix var name diffstat: src/common/logger.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (18 lines): diff -r 175f23cb3ff5 -r b20793bde31b src/common/logger.py --- a/src/common/logger.py Wed Aug 24 16:39:49 2011 +0200 +++ b/src/common/logger.py Thu Aug 25 00:03:03 2011 +0200 @@ -1121,11 +1121,11 @@ obj.conn.last_history_time[obj.jid] = time.mktime(obj.timestamp) except exceptions.PysqliteOperationalError, e: - self.conn.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) + obj.conn.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') sectext = _('The database file (%s) cannot be read. Try to ' 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup) ' 'or remove it (all history will be lost).') % \ LOG_DB_PATH - self.conn.dispatch('DB_ERROR', (pritext, sectext)) \ No newline at end of file + obj.conn.dispatch('DB_ERROR', (pritext, sectext))

1 0

gajim: start transfer when we get a candidate-error, but we foun...
by Yann Leboulanger 24 Aug '11

24 Aug '11

changeset 505b0680b4cb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=505b0680b4cb description: start transfer when we get a candidate-error, but we found a remote usable streamhost diffstat: src/common/jingle_ft.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (21 lines): diff -r 9be7d754233a -r 505b0680b4cb src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Aug 24 10:42:16 2011 +0200 +++ b/src/common/jingle_ft.py Wed Aug 24 23:53:36 2011 +0200 @@ -167,12 +167,16 @@ if content.getTag('transport').getTag('candidate-error'): self.nominated_cand['peer-cand'] = False if self.state == STATE_CAND_SENT_PENDING_REPLY: - #self.state = STATE_CAND_SENT_AND_RECEIVED if not self.nominated_cand['our-cand'] and \ not self.nominated_cand['peer-cand']: if not self.weinitiate: return self.session.transport_replace() + else: + response = stanza.buildReply('result') + self.session.connection.connection.send(response) + self.start_transfer() + raise xmpp.NodeProcessed else: self.state = STATE_CAND_RECEIVED_PENDING_REPLY

1 0

gajim: install triggers plugin
by Yann Leboulanger 24 Aug '11

24 Aug '11

changeset 175f23cb3ff5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=175f23cb3ff5 description: install triggers plugin diffstat: plugins/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0b1d01195a97 -r 175f23cb3ff5 plugins/Makefile.am --- a/plugins/Makefile.am Wed Aug 24 16:14:07 2011 +0200 +++ b/plugins/Makefile.am Wed Aug 24 16:39:49 2011 +0200 @@ -3,7 +3,7 @@ gajimpluginsdir = $(gajim_pluginsdir) -installedplugins = acronyms_expander banner_tweaks ftp_manager length_notifier whiteboard +installedplugins = acronyms_expander banner_tweaks ftp_manager length_notifier triggers whiteboard installedpluginsfiles = $(wildcard ${srcdir}/${p}/*.py ${srcdir}/${p}/manifest.ini ${srcdir}/${p}/*.ui ${srcdir}/${p}/*.png)

1 0

gajim: import ChangeLog from 0.14 branch
by Yann Leboulanger 24 Aug '11

24 Aug '11

changeset 0b1d01195a97 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0b1d01195a97 description: import ChangeLog from 0.14 branch diffstat: ChangeLog | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diffs (26 lines): diff -r a9cfb6324807 -r 0b1d01195a97 ChangeLog --- a/ChangeLog Wed Aug 24 16:02:06 2011 +0200 +++ b/ChangeLog Wed Aug 24 16:14:07 2011 +0200 @@ -1,3 +1,22 @@ +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

1 0

gajim: fix missing file
by Yann Leboulanger 24 Aug '11

24 Aug '11

changeset a9cfb6324807 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a9cfb6324807 description: fix missing file diffstat: debian/install | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (5 lines): diff -r 5deec3983b7b -r a9cfb6324807 debian/install --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/install Wed Aug 24 16:02:06 2011 +0200 @@ -0,0 +1,1 @@ +debian/gajim.xpm usr/share/pixmaps

1 0

gajim: update debian forlder for latest 0.14 versions
by Yann Leboulanger 24 Aug '11

24 Aug '11

changeset 5deec3983b7b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5deec3983b7b description: update debian forlder for latest 0.14 versions diffstat: debian/changelog | 24 ++++++++++++++++++++++++ debian/control | 2 +- debian/patches/00_debian-copying.diff | 10 ++++++---- 3 files changed, 31 insertions(+), 5 deletions(-) diffs (73 lines): diff -r 42afa88e890e -r 5deec3983b7b debian/changelog --- a/debian/changelog Wed Aug 24 11:58:06 2011 +0200 +++ b/debian/changelog Wed Aug 24 15:59:27 2011 +0200 @@ -1,3 +1,27 @@ +gajim (0.14.4-1) unstable; urgency=low + + * New upstream release. Closes: #637071 + * Fixes weird error. Closes: #632226 + * Stop suggesting unused python-sexy. Closes: #633301 + * Modify 00_debian-copying.diff to also not install ChangeLog file. + dh_changelogs will do it. + + -- Yann Leboulanger <asterix(a)lagaule.org> Fri, 22 Jul 2011 12:56:30 +0200 + +gajim (0.14.3-1) unstable; urgency=low + + * New upstream release. + * Fix closing roster window. Closes: #630315 + + -- Yann Leboulanger <asterix(a)lagaule.org> Sun, 19 Jun 2011 21:46:09 +0200 + +gajim (0.14.2-1) unstable; urgency=low + + * New upstream release. + * Fix CPU usage when testing file transfer proxies. Closes: #626576 + + -- Yann Leboulanger <asterix(a)lagaule.org> Tue, 07 Jun 2011 19:30:43 +0200 + gajim (0.14.1-1) unstable; urgency=low [ Yann Leboulanger ] diff -r 42afa88e890e -r 5deec3983b7b debian/control --- a/debian/control Wed Aug 24 11:58:06 2011 +0200 +++ b/debian/control Wed Aug 24 15:59:27 2011 +0200 @@ -12,7 +12,7 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.16.0), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl (>= 0.9), python-crypto -Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly +Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly Description: Jabber client written in PyGTK Gajim is a Jabber client. It has a tabbed user interface with normal chats, group chats, and has many features such as, TLS, GPG, SSL, multiple accounts, diff -r 42afa88e890e -r 5deec3983b7b debian/patches/00_debian-copying.diff --- a/debian/patches/00_debian-copying.diff Wed Aug 24 11:58:06 2011 +0200 +++ b/debian/patches/00_debian-copying.diff Wed Aug 24 15:59:27 2011 +0200 @@ -3,20 +3,22 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -8,7 +8,6 @@ +@@ -7,8 +7,6 @@ + docfilesdir = $(docdir) docfiles_DATA = README \ README.html \ - ChangeLog \ +- ChangeLog \ - COPYING \ THANKS \ THANKS.artists \ AUTHORS --- a/Makefile.in +++ b/Makefile.in -@@ -299,7 +299,6 @@ +@@ -298,8 +298,6 @@ + docfilesdir = $(docdir) docfiles_DATA = README \ README.html \ - ChangeLog \ +- ChangeLog \ - COPYING \ THANKS \ THANKS.artists \

1 0

gajim: update debian folder for latest 0.14 versions
by Yann Leboulanger 24 Aug '11

24 Aug '11

changeset d385ff48bf3b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d385ff48bf3b description: update debian folder for latest 0.14 versions diffstat: debian/changelog | 17 +++++++++++++++++ debian/control | 2 +- debian/patches/00_debian-copying.diff | 10 ++++++---- 3 files changed, 24 insertions(+), 5 deletions(-) diffs (66 lines): diff -r 9476e66272c3 -r d385ff48bf3b debian/changelog --- a/debian/changelog Fri Jul 22 13:16:01 2011 +0200 +++ b/debian/changelog Wed Aug 24 15:59:06 2011 +0200 @@ -1,3 +1,20 @@ +gajim (0.14.4-1) unstable; urgency=low + + * New upstream release. Closes: #637071 + * Fixes weird error. Closes: #632226 + * Stop suggesting unused python-sexy. Closes: #633301 + * Modify 00_debian-copying.diff to also not install ChangeLog file. + dh_changelogs will do it. + + -- Yann Leboulanger <asterix(a)lagaule.org> Fri, 22 Jul 2011 12:56:30 +0200 + +gajim (0.14.3-1) unstable; urgency=low + + * New upstream release. + * Fix closing roster window. Closes: #630315 + + -- Yann Leboulanger <asterix(a)lagaule.org> Sun, 19 Jun 2011 21:46:09 +0200 + gajim (0.14.2-1) unstable; urgency=low * New upstream release. diff -r 9476e66272c3 -r d385ff48bf3b debian/control --- a/debian/control Fri Jul 22 13:16:01 2011 +0200 +++ b/debian/control Wed Aug 24 15:59:06 2011 +0200 @@ -12,7 +12,7 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.16.0), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl (>= 0.9), python-crypto -Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly +Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly Description: Jabber client written in PyGTK Gajim is a Jabber client. It has a tabbed user interface with normal chats, group chats, and has many features such as, TLS, GPG, SSL, multiple accounts, diff -r 9476e66272c3 -r d385ff48bf3b debian/patches/00_debian-copying.diff --- a/debian/patches/00_debian-copying.diff Fri Jul 22 13:16:01 2011 +0200 +++ b/debian/patches/00_debian-copying.diff Wed Aug 24 15:59:06 2011 +0200 @@ -3,20 +3,22 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -8,7 +8,6 @@ +@@ -7,8 +7,6 @@ + docfilesdir = $(docdir) docfiles_DATA = README \ README.html \ - ChangeLog \ +- ChangeLog \ - COPYING \ THANKS \ THANKS.artists \ AUTHORS --- a/Makefile.in +++ b/Makefile.in -@@ -299,7 +299,6 @@ +@@ -298,8 +298,6 @@ + docfilesdir = $(docdir) docfiles_DATA = README \ README.html \ - ChangeLog \ +- ChangeLog \ - COPYING \ THANKS \ THANKS.artists \

1 0

gajim: improve loading of muc participand list speed by showing ...
by Yann Leboulanger 24 Aug '11

24 Aug '11

changeset 42afa88e890e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=42afa88e890e description: improve loading of muc participand list speed by showing it only when we get our presence (this means we are connected). Fixes #6950 diffstat: src/groupchat_control.py | 106 ++++++++++++++++++++-------------------------- 1 files changed, 46 insertions(+), 60 deletions(-) diffs (truncated from 328 to 300 lines): diff -r 8ea7be2dbd11 -r 42afa88e890e src/groupchat_control.py --- a/src/groupchat_control.py Wed Aug 24 11:04:31 2011 +0200 +++ b/src/groupchat_control.py Wed Aug 24 11:58:06 2011 +0200 @@ -418,10 +418,9 @@ #status_image, shown_nick, type, nickname, avatar self.columns = [gtk.Image, str, str, str, gtk.gdk.Pixbuf] - store = gtk.TreeStore(*self.columns) - store.set_sort_func(C_NICK, self.tree_compare_iters) - store.set_sort_column_id(C_NICK, gtk.SORT_ASCENDING) - self.list_treeview.set_model(store) + self.model = gtk.TreeStore(*self.columns) + self.model.set_sort_func(C_NICK, self.tree_compare_iters) + self.model.set_sort_column_id(C_NICK, gtk.SORT_ASCENDING) # columns column = gtk.TreeViewColumn() @@ -609,14 +608,13 @@ """ Iterate over all contact rows in the tree model """ - model = self.list_treeview.get_model() - role_iter = model.get_iter_root() + role_iter = self.model.get_iter_root() while role_iter: - contact_iter = model.iter_children(role_iter) + contact_iter = self.model.iter_children(role_iter) while contact_iter: - yield model[contact_iter] - contact_iter = model.iter_next(contact_iter) - role_iter = model.iter_next(role_iter) + yield self.model[contact_iter] + contact_iter = self.model.iter_next(contact_iter) + role_iter = self.model.iter_next(role_iter) def on_list_treeview_style_set(self, treeview, style): """ @@ -704,8 +702,7 @@ model[iter_][C_NICK] = model[iter_][C_NICK] def change_roster_style(self): - model = self.list_treeview.get_model() - model.foreach(self._change_style) + self.model.foreach(self._change_style) def repaint_themed_widgets(self): ChatControlBase.repaint_themed_widgets(self) @@ -1006,16 +1003,15 @@ autopopup = gajim.config.get('autopopup') autopopupaway = gajim.config.get('autopopupaway') iter_ = self.get_contact_iter(nick) - path = self.list_treeview.get_model().get_path(iter_) + path = self.model.get_path(iter_) if not autopopup or (not autopopupaway and \ gajim.connections[self.account].connected > 2): if no_queue: # We didn't have a queue: we change icons - model = self.list_treeview.get_model() state_images = \ gajim.interface.roster.get_appropriate_state_images( self.room_jid, icon_name='event') image = state_images['event'] - model[iter_][C_IMG] = image + self.model[iter_][C_IMG] = image if self.parent_win: self.parent_win.show_title() self.parent_win.redraw_tab(self) @@ -1031,16 +1027,15 @@ gajim.interface.roster.draw_contact(self.room_jid, self.account) def get_contact_iter(self, nick): - model = self.list_treeview.get_model() - role_iter = model.get_iter_root() + role_iter = self.model.get_iter_root() while role_iter: - user_iter = model.iter_children(role_iter) + user_iter = self.model.iter_children(role_iter) while user_iter: - if nick == model[user_iter][C_NICK].decode('utf-8'): + if nick == self.model[user_iter][C_NICK].decode('utf-8'): return user_iter else: - user_iter = model.iter_next(user_iter) - role_iter = model.iter_next(role_iter) + user_iter = self.model.iter_next(user_iter) + role_iter = self.model.iter_next(role_iter) return None def print_old_conversation(self, text, contact='', tim=None, xhtml = None, @@ -1303,6 +1298,8 @@ gajim.gc_connected[self.account][self.room_jid] = True ChatControlBase.got_connected(self) + self.list_treeview.set_model(self.model) + self.list_treeview.expand_all() # We don't redraw the whole banner here, because only icon change self._update_banner_state_image() if self.parent_win: @@ -1310,7 +1307,8 @@ gobject.idle_add(self.msg_textview.grab_focus) def got_disconnected(self): - self.list_treeview.get_model().clear() + self.list_treeview.set_model(None) + self.model.clear() nick_list = gajim.contacts.get_nick_list(self.account, self.room_jid) for nick in nick_list: # Update pm chat window @@ -1354,7 +1352,7 @@ return True def draw_roster(self): - self.list_treeview.get_model().clear() + self.model.clear() for nick in gajim.contacts.get_nick_list(self.account, self.room_jid): gc_contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) @@ -1387,7 +1385,6 @@ iter_ = self.get_contact_iter(nick) if not iter_: return - model = self.list_treeview.get_model() gc_contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) state_images = gajim.interface.jabber_state_images['16'] @@ -1434,13 +1431,12 @@ pixbuf2.get_property('height'), 0, 0, 1.0, 1.0, gtk.gdk.INTERP_HYPER, 127) image = gtk.image_new_from_pixbuf(pixbuf1) - model[iter_][C_IMG] = image - model[iter_][C_TEXT] = name + self.model[iter_][C_IMG] = image + self.model[iter_][C_TEXT] = name def draw_avatar(self, nick): if not gajim.config.get('show_avatars_in_roster'): return - model = self.list_treeview.get_model() iter_ = self.get_contact_iter(nick) if not iter_: return @@ -1450,19 +1446,18 @@ scaled_pixbuf = None else: scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster') - model[iter_][C_AVATAR] = scaled_pixbuf + self.model[iter_][C_AVATAR] = scaled_pixbuf def draw_role(self, role): role_iter = self.get_role_iter(role) if not role_iter: return - model = self.list_treeview.get_model() role_name = helpers.get_uf_role(role, plural=True) if gajim.config.get('show_contacts_number'): nbr_role, nbr_total = gajim.contacts.get_nb_role_total_gc_contacts( self.account, self.room_jid, role) role_name += ' (%s/%s)' % (repr(nbr_role), repr(nbr_total)) - model[role_iter][C_TEXT] = role_name + self.model[role_iter][C_TEXT] = role_name def draw_all_roles(self): for role in ('visitor', 'participant', 'moderator'): @@ -1766,7 +1761,6 @@ def add_contact_to_roster(self, nick, show, role, affiliation, status, jid=''): - model = self.list_treeview.get_model() role_name = helpers.get_uf_role(role, plural=True) resource = '' @@ -1782,11 +1776,11 @@ role_iter = self.get_role_iter(role) if not role_iter: - role_iter = model.append(None, + role_iter = self.model.append(None, [gajim.interface.jabber_state_images['16']['closed'], role, 'role', role_name, None] + [None] * self.nb_ext_renderers) self.draw_all_roles() - iter_ = model.append(role_iter, [None, nick, 'contact', name, None] + \ + iter_ = self.model.append(role_iter, [None, nick, 'contact', name, None] + \ [None] * self.nb_ext_renderers) if not nick in gajim.contacts.get_nick_list(self.account, self.room_jid): @@ -1811,26 +1805,24 @@ fake_jid) if nick == self.nick: # we became online self.got_connected() - self.list_treeview.expand_row((model.get_path(role_iter)), False) + self.list_treeview.expand_row((self.model.get_path(role_iter)), False) if self.is_continued: self.draw_banner_text() return iter_ def get_role_iter(self, role): - model = self.list_treeview.get_model() - role_iter = model.get_iter_root() + role_iter = self.model.get_iter_root() while role_iter: - role_name = model[role_iter][C_NICK].decode('utf-8') + role_name = self.model[role_iter][C_NICK].decode('utf-8') if role == role_name: return role_iter - role_iter = model.iter_next(role_iter) + role_iter = self.model.iter_next(role_iter) return None def remove_contact(self, nick): """ Remove a user from the contacts_list """ - model = self.list_treeview.get_model() iter_ = self.get_contact_iter(nick) if not iter_: return @@ -1838,10 +1830,10 @@ nick) if gc_contact: gajim.contacts.remove_gc_contact(self.account, gc_contact) - parent_iter = model.iter_parent(iter_) - model.remove(iter_) - if model.iter_n_children(parent_iter) == 0: - model.remove(parent_iter) + parent_iter = self.model.iter_parent(iter_) + self.model.remove(iter_) + if self.model.iter_n_children(parent_iter) == 0: + self.model.remove(parent_iter) def send_message(self, message, xhtml=None, process_commands=True): """ @@ -2296,8 +2288,7 @@ """ Make contact's popup menu """ - model = self.list_treeview.get_model() - nick = model[iter_][C_NICK].decode('utf-8') + nick = self.model[iter_][C_NICK].decode('utf-8') c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) fjid = self.room_jid + '/' + nick jid = c.jid @@ -2419,7 +2410,7 @@ item2.hide() item = xml.get_object('send_private_message_menuitem') - id_ = item.connect('activate', self.on_send_pm, model, iter_) + id_ = item.connect('activate', self.on_send_pm, self.model, iter_) self.handlers[id_] = item item = xml.get_object('send_file_menuitem') @@ -2458,14 +2449,13 @@ When an iter is activated (dubblick or single click if gnome is set this way """ - model = widget.get_model() if len(path) == 1: # It's a group if (widget.row_expanded(path)): widget.collapse_row(path) else: widget.expand_row(path, False) else: # We want to send a private message - nick = model[path][C_NICK].decode('utf-8') + nick = self.model[path][C_NICK].decode('utf-8') self._start_private_message(nick) def on_list_treeview_row_activated(self, widget, path, col=0): @@ -2489,18 +2479,16 @@ return if event.button == 3: # right click widget.get_selection().select_path(path) - model = widget.get_model() - iter_ = model.get_iter(path) + iter_ = self.model.get_iter(path) if len(path) == 2: self.mk_menu(event, iter_) return True elif event.button == 2: # middle click widget.get_selection().select_path(path) - model = widget.get_model() - iter_ = model.get_iter(path) + iter_ = self.model.get_iter(path) if len(path) == 2: - nick = model[iter_][C_NICK].decode('utf-8') + nick = self.model[iter_][C_NICK].decode('utf-8') self._start_private_message(nick) return True @@ -2509,9 +2497,8 @@ self.on_row_activated(widget, path) return True else: - model = widget.get_model() - iter_ = model.get_iter(path) - nick = model[iter_][C_NICK].decode('utf-8') + iter_ = self.model.get_iter(path) + nick = self.model[iter_][C_NICK].decode('utf-8') if not nick in gajim.contacts.get_nick_list(self.account, self.room_jid): # it's a group @@ -2542,7 +2529,6 @@

1 0

gajim: add UPnP-IGD feature to ask our router to forward port.
by Yann Leboulanger 24 Aug '11

24 Aug '11

changeset 8ea7be2dbd11 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8ea7be2dbd11 description: add UPnP-IGD feature to ask our router to forward port. diffstat: src/common/gajim.py | 9 ++++ src/common/protocol/bytestream.py | 82 ++++++++++++++++++++++++++++++++++++++- src/features_window.py | 7 +++ 3 files changed, 96 insertions(+), 2 deletions(-) diffs (139 lines): diff -r 0caab448976f -r 8ea7be2dbd11 src/common/gajim.py --- a/src/common/gajim.py Tue Aug 23 13:07:58 2011 +0200 +++ b/src/common/gajim.py Wed Aug 24 11:04:31 2011 +0200 @@ -179,6 +179,15 @@ except ImportError: HAVE_FARSIGHT = False + +HAVE_UPNP_IGD = True +try: + import gupnp.igd + gupnp_igd = gupnp.igd.Simple() +except ImportError: + HAVE_UPNP_IGD = False + + gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} gajim_common_features = [xmpp.NS_BYTESTREAM, xmpp.NS_SI, xmpp.NS_FILE, xmpp.NS_MUC, xmpp.NS_MUC_USER, xmpp.NS_MUC_ADMIN, xmpp.NS_MUC_OWNER, diff -r 0caab448976f -r 8ea7be2dbd11 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Aug 23 13:07:58 2011 +0200 +++ b/src/common/protocol/bytestream.py Wed Aug 24 11:04:31 2011 +0200 @@ -349,8 +349,8 @@ self._add_addiditional_streamhosts_to_query(query, file_props) self._add_local_ips_as_streamhosts_to_query(query, file_props) self._add_proxy_streamhosts_to_query(query, file_props) - - self.connection.send(iq) + self._add_upnp_igd_as_streamhost_to_query(query, file_props, iq) + # Upnp-igd is ascynchronous, so it will send the iq itself def _add_streamhosts_to_query(self, query, sender, port, hosts): for host in hosts: @@ -386,6 +386,84 @@ additional_hosts = [] self._add_streamhosts_to_query(query, sender, port, additional_hosts) + def _add_upnp_igd_as_streamhost_to_query(self, query, file_props, iq): + if not gajim.HAVE_UPNP_IGD: + self.connection.send(iq) + return + + def ip_is_local(ip): + if '.' not in ip: + # it's an IPv6 + return True + ip_s = ip.split('.') + ip_l = long(ip_s[0])<<24 | long(ip_s[1])<<16 | long(ip_s[2])<<8 | \ + long(ip_s[3]) + # 10/8 + if ip_l & (255<<24) == 10<<24: + return True + # 172.16/12 + if ip_l & (255<<24 | 240<<16) == (172<<24 | 16<<16): + return True + # 192.168 + if ip_l & (255<<24 | 255<<16) == (192<<24 | 168<<16): + return True + return False + + + my_ip = self.peerhost[0] + + if not ip_is_local(my_ip): + self.connection.send(iq) + return + + self.no_gupnp_reply_id = 0 + + def cleanup_gupnp(): + if self.no_gupnp_reply_id: + gobject.source_remove(self.no_gupnp_reply_id) + self.no_gupnp_reply_id = 0 + gajim.gupnp_igd.disconnect(self.ok_id) + gajim.gupnp_igd.disconnect(self.fail_id) + + def ok(s, proto, ext_ip, re, ext_port, local_ip, local_port, desc): + log.debug('Got GUPnP-IGD answer: external: %s:%s, internal: %s:%s', + ext_ip, ext_port, local_ip, local_port) + if local_port != gajim.config.get('file_transfers_port'): + sender = file_props['sender'] + receiver = file_props['receiver'] + sha_str = helpers.get_auth_sha(file_props['sid'], sender, + receiver) + listener = gajim.socks5queue.start_listener(local_port, sha_str, + self._result_socks5_sid, file_props['sid']) + if listener: + self._add_streamhosts_to_query(query, sender, ext_port, + [ext_ip]) + self.connection.send(iq) + cleanup_gupnp() + + def fail(s, error, proto, ext_ip, local_ip, local_port, desc): + log.debug('Got GUPnP-IGD error : %s', str(error)) + self.connection.send(iq) + cleanup_gupnp() + + def no_upnp_reply(): + log.debug('Got not GUPnP-IGD answer') + # stop trying to use it + gajim.HAVE_UPNP_IGD = False + self.no_gupnp_reply_id = 0 + self.connection.send(iq) + cleanup_gupnp() + return False + + + self.ok_id = gajim.gupnp_igd.connect('mapped-external-port', ok) + self.fail_id = gajim.gupnp_igd.connect('error-mapping-port', fail) + + port = gajim.config.get('file_transfers_port') + self.no_gupnp_reply_id = gobject.timeout_add_seconds(10, no_upnp_reply) + gajim.gupnp_igd.add_port('TCP', 0, my_ip, port, 3600, + 'Gajim file transfer') + def _add_proxy_streamhosts_to_query(self, query, file_props): proxyhosts = self._get_file_transfer_proxies_from_config(file_props) if proxyhosts: diff -r 0caab448976f -r 8ea7be2dbd11 src/features_window.py --- a/src/features_window.py Tue Aug 23 13:07:58 2011 +0200 +++ b/src/features_window.py Wed Aug 24 11:04:31 2011 +0200 @@ -107,6 +107,10 @@ _('Ability to start audio and video chat.'), _('Requires python-farsight and gstreamer-plugins-bad.'), _('Feature not available under Windows.')), + _('UPnP-IGD'): (self.gupnp_igd_available, + _('Ability to request your router to forward port for file transfer.'), + _('Requires python-gupnp-igd.'), + _('Feature not available under Windows.')), } # name, supported @@ -249,3 +253,6 @@ def farsight_available(self): return gajim.HAVE_FARSIGHT + + def gupnp_igd_available(self): + return gajim.HAVE_UPNP_IGD

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2011