Commits February 2013

commits@gajim.org

3 participants
86 discussions

gajim: [Knuckles] shown Gajim when we try to run it while it is ...
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 962da38dadfa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=962da38dadfa description: [Knuckles] shown Gajim when we try to run it while it is already running. Fixes #7274 diffstat: src/gajim.py | 18 ++++++++++++++++++ src/remote_control.py | 13 +++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diffs (52 lines): diff -r b67ec3e9a5b8 -r 962da38dadfa src/gajim.py --- a/src/gajim.py Fri Dec 07 17:05:20 2012 +0100 +++ b/src/gajim.py Sun Dec 09 11:51:36 2012 +0100 @@ -359,7 +359,25 @@ # Assume Gajim is running. return True +def show_remote_gajim_roster(): + try: + import dbus + + OBJ_PATH = '/org/gajim/dbus/RemoteObject' + INTERFACE = 'org.gajim.dbus.RemoteInterface' + SERVICE = 'org.gajim.dbus' + + # Attempt to call show_roster + dbus.Interface(dbus.SessionBus().get_object(SERVICE, OBJ_PATH), INTERFACE).__getattr__("show_roster")() + + return True + except Exception: + return False + if pid_alive(): + if (show_remote_gajim_roster()): + print("Gajim is already running, bringing the roster to front...") + sys.exit(0) pix = gtkgui_helpers.get_icon_pixmap('gajim', 48) gtk.window_set_default_icon(pix) # set the icon to all newly opened wind pritext = _('Gajim is already running') diff -r b67ec3e9a5b8 -r 962da38dadfa src/remote_control.py --- a/src/remote_control.py Fri Dec 07 17:05:20 2012 +0100 +++ b/src/remote_control.py Sun Dec 09 11:51:36 2012 +0100 @@ -698,6 +698,19 @@ win.window.focus(long(time())) @dbus.service.method(INTERFACE, in_signature='', out_signature='') + def show_roster(self): + """ + Show the roster window + """ + win = gajim.interface.roster.window + win.present() + # preserve the 'steal focus preservation' + if self._is_first(): + win.window.focus(gtk.get_current_event_time()) + else: + win.window.focus(long(time())) + + @dbus.service.method(INTERFACE, in_signature='', out_signature='') def toggle_ipython(self): """ Show/hide the ipython window

1 0

gajim: prevent traceback
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset b67ec3e9a5b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b67ec3e9a5b8 description: prevent traceback diffstat: src/common/xmpp/client_nb.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 19a769bf5e48 -r b67ec3e9a5b8 src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Sat Nov 24 02:19:56 2012 -0400 +++ b/src/common/xmpp/client_nb.py Fri Dec 07 17:05:20 2012 +0100 @@ -93,7 +93,8 @@ if 'NonBlockingNonSASL' in self.__dict__: self.NonBlockingNonSASL.PlugOut() if 'SASL' in self.__dict__: - if self.SASL.startsasl == 'failure-in-process': + if 'startsasl' in self.SASL.__dict__ and \ + self.SASL.startsasl == 'failure-in-process': sasl_failed = True self.SASL.startsasl = 'failure' self._on_start_sasl()

1 0

gajim: prevent connection to be called when there is no connection
by Jefry Lagrange 13 Feb '13

13 Feb '13

changeset eb5e9e1d717e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=eb5e9e1d717e description: prevent connection to be called when there is no connection diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2672b6652c4e -r eb5e9e1d717e src/common/connection.py --- a/src/common/connection.py Fri Nov 23 11:44:03 2012 +0400 +++ b/src/common/connection.py Fri Nov 23 21:38:36 2012 -0400 @@ -1669,7 +1669,7 @@ self._stun_servers = self._hosts = [i for i in result_array] def _request_privacy(self): - if not gajim.account_is_connected(self.name): + if not gajim.account_is_connected(self.name) or not self.connection: return iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '') id_ = self.connection.getAnID()

1 0

gajim: Resolve GtkWarning: IA__gtk_tree_view_expand_row: asserti...
by Jefry Lagrange 13 Feb '13

13 Feb '13

changeset 19a769bf5e48 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=19a769bf5e48 description: Resolve GtkWarning: IA__gtk_tree_view_expand_row: assertion tree_view->priv->model != NULL diffstat: src/groupchat_control.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r eb5e9e1d717e -r 19a769bf5e48 src/groupchat_control.py --- a/src/groupchat_control.py Fri Nov 23 21:38:36 2012 -0400 +++ b/src/groupchat_control.py Sat Nov 24 02:19:56 2012 -0400 @@ -1821,7 +1821,8 @@ fake_jid) if nick == self.nick: # we became online self.got_connected() - self.list_treeview.expand_row((self.model.get_path(role_iter)), False) + if self.list_treeview.get_model(): + self.list_treeview.expand_row((self.model.get_path(role_iter)), False) if self.is_continued: self.draw_banner_text() return iter_

1 0

gajim: ManageBookmarksWindow. Remove unused function
by Fomin Denis 13 Feb '13

13 Feb '13

changeset 2672b6652c4e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2672b6652c4e description: ManageBookmarksWindow. Remove unused function diffstat: src/config.py | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diffs (23 lines): diff -r a1aa5635e322 -r 2672b6652c4e src/config.py --- a/src/config.py Tue Nov 20 13:00:57 2012 +0400 +++ b/src/config.py Fri Nov 23 11:44:03 2012 +0400 @@ -3192,19 +3192,6 @@ # select root iter self.selection.select_iter(self.treestore.get_iter_root()) - def on_bookmarks_treeview_button_press_event(self, widget, event): - (model, iter_) = self.selection.get_selected() - if not iter_: - # Removed a bookmark before - return - - if model.iter_parent(iter_): - # The currently selected node is a bookmark - return not self.check_valid_bookmark() - - def on_manage_bookmarks_window_destroy(self, widget, event): - del gajim.interface.instances['manage_bookmarks'] - def on_add_bookmark_button_clicked(self, widget): """ Add a new bookmark

1 0

gajim: hide 'bookmark_ button' if private storage not supported
by Fomin Denis 13 Feb '13

13 Feb '13

changeset 577a45b6306b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=577a45b6306b description: hide 'bookmark_ button' if private storage not supported diffstat: src/groupchat_control.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r b579b4cf66f9 -r 577a45b6306b src/groupchat_control.py --- a/src/groupchat_control.py Sun Nov 18 23:46:43 2012 +0400 +++ b/src/groupchat_control.py Tue Nov 20 11:29:13 2012 +0400 @@ -327,8 +327,10 @@ if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'): img = self.xml.get_object('image7') img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU) - - widget.show() + if not gajim.connections[self.account].private_storage_supported: + widget.hide() + else: + widget.show() widget = self.xml.get_object('list_treeview') id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded)

1 0

gajim: hide 'bookmark_ button' if private storage not supported....
by Fomin Denis 13 Feb '13

13 Feb '13

changeset a1aa5635e322 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a1aa5635e322 description: hide 'bookmark_ button' if private storage not supported.part 2 diffstat: src/groupchat_control.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diffs (30 lines): diff -r 577a45b6306b -r a1aa5635e322 src/groupchat_control.py --- a/src/groupchat_control.py Tue Nov 20 11:29:13 2012 +0400 +++ b/src/groupchat_control.py Tue Nov 20 13:00:57 2012 +0400 @@ -327,10 +327,11 @@ if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'): img = self.xml.get_object('image7') img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU) - if not gajim.connections[self.account].private_storage_supported: - widget.hide() - else: - widget.show() + widget.set_sensitive( + gajim.connections[self.account].private_storage_supported or \ + (gajim.connections[self.account].pubsub_supported and \ + gajim.connections[self.account].pubsub_publish_options_supported)) + widget.show() widget = self.xml.get_object('list_treeview') id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded) @@ -842,7 +843,9 @@ if self.contact.jid in gajim.config.get_per('accounts', self.account, 'minimized_gc').split(' '): minimize_menuitem.set_active(True) - if not gajim.connections[self.account].private_storage_supported: + conn = gajim.connections[self.account] + if not conn.private_storage_supported and (not conn.pubsub_supported or \ + not conn.pubsub_publish_options_supported): bookmark_room_menuitem.set_sensitive(False) if gajim.gc_connected[self.account][self.room_jid]: c = gajim.contacts.get_gc_contact(self.account, self.room_jid,

1 0

gajim: prevent traceback
by Fomin Denis 13 Feb '13

13 Feb '13

changeset b579b4cf66f9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b579b4cf66f9 description: prevent traceback diffstat: src/common/helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r bdef21a83e15 -r b579b4cf66f9 src/common/helpers.py --- a/src/common/helpers.py Mon Nov 12 17:21:26 2012 +0400 +++ b/src/common/helpers.py Sun Nov 18 23:46:43 2012 +0400 @@ -1429,7 +1429,7 @@ except Exception: proxy = None p = gajim.config.get('global_proxy') - if p: + if p and p in gajim.config.get_per('proxies'): proxy = {} proxyptr = gajim.config.get_per('proxies', p) if not proxyptr:

1 0

gajim: Add 'roster_tooltip_populate' gui extension point
by Fomin Denis 13 Feb '13

13 Feb '13

changeset e184286eec1b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e184286eec1b description: Add 'roster_tooltip_populate' gui extension point diffstat: src/tooltips.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 66471f38503c -r e184286eec1b src/tooltips.py --- a/src/tooltips.py Thu Nov 08 12:09:13 2012 +0100 +++ b/src/tooltips.py Sun Nov 11 22:03:08 2012 +0400 @@ -489,7 +489,7 @@ table_size = 4 else: self.avatar_image.set_from_pixbuf(None) - vcard_table = gtk.Table(table_size, 1) + vcard_table = gtk.Table(1,table_size) vcard_table.set_property('column-spacing', 2) vcard_table.set_homogeneous(False) vcard_current_row = 1 @@ -685,7 +685,10 @@ self.avatar_image.set_alignment(0, 0) if table_size == 4: vcard_table.attach(self.avatar_image, 3, 4, 2, - vcard_current_row + 1, gtk.FILL, gtk.FILL | gtk.EXPAND, 3, 3) + vcard_current_row + 1, gtk.FILL, gtk.FILL | gtk.EXPAND, 3, 3) + + gajim.plugin_manager.gui_extension_point('roster_tooltip_populate', + self, contacts, vcard_table) self.win.add(vcard_table) def update_last_time(self, last_time):

1 0

gajim: Add 'gc_tooltip_populate' gui extension point
by Fomin Denis 13 Feb '13

13 Feb '13

changeset bdef21a83e15 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bdef21a83e15 description: Add 'gc_tooltip_populate' gui extension point diffstat: src/tooltips.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r e184286eec1b -r bdef21a83e15 src/tooltips.py --- a/src/tooltips.py Sun Nov 11 22:03:08 2012 +0400 +++ b/src/tooltips.py Mon Nov 12 17:21:26 2012 +0400 @@ -444,6 +444,8 @@ self.avatar_image.set_alignment(0, 0) vcard_table.attach(self.avatar_image, 3, 4, 2, vcard_current_row + 1, gtk.FILL, gtk.FILL | gtk.EXPAND, 3, 3) + gajim.plugin_manager.gui_extension_point('gc_tooltip_populate', + self, contact, vcard_table) self.win.add(vcard_table) class RosterTooltip(NotificationAreaTooltip):

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2013