Commits June 2007

commits@gajim.org

7 participants
163 discussions

[commit-gajim] r8338 - in trunk: data/glade src
by asterix＠gajim.org 28 Jun '07

28 Jun '07

Author: asterix Date: 2007-06-28 23:09:29 +0200 (Thu, 28 Jun 2007) New Revision: 8338 Modified: trunk/data/glade/preferences_window.glade trunk/src/config.py Log: make idle part of preference window insensitive if idle is not supported. fixes #2949 Modified: trunk/data/glade/preferences_window.glade =================================================================== --- trunk/data/glade/preferences_window.glade 2007-06-28 19:15:43 UTC (rev 8337) +++ trunk/data/glade/preferences_window.glade 2007-06-28 21:09:29 UTC (rev 8338) @@ -1322,7 +1322,7 @@ <property name="border_width">12</property> <property name="spacing">12</property> <child> - <widget class="GtkTable" id="table19"> + <widget class="GtkTable" id="autoaway_table"> <property name="visible">True</property> <property name="n_rows">2</property> <property name="n_columns">4</property> Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-06-28 19:15:43 UTC (rev 8337) +++ trunk/src/config.py 2007-06-28 21:09:29 UTC (rev 8338) @@ -398,6 +398,10 @@ self.auto_xa_message_entry.set_text(st) self.auto_xa_message_entry.set_sensitive(gajim.config.get('autoxa')) + from common import sleepy + if not sleepy.SUPPORTED: + self.xml.get_widget('autoaway_table').set_sensitive(False) + # ask_status when online / offline st = gajim.config.get('ask_online_status') self.xml.get_widget('prompt_online_status_message_checkbutton').\

1 0

[commit-gajim] r8337 - branches/e2e_encryption/src/common
by bct＠gajim.org 28 Jun '07

28 Jun '07

Author: bct Date: 2007-06-28 21:15:43 +0200 (Thu, 28 Jun 2007) New Revision: 8337 Modified: branches/e2e_encryption/src/common/config.py Log: new option for whether encrypted sessions should be logged by default Modified: branches/e2e_encryption/src/common/config.py =================================================================== --- branches/e2e_encryption/src/common/config.py 2007-06-28 10:42:24 UTC (rev 8336) +++ branches/e2e_encryption/src/common/config.py 2007-06-28 19:15:43 UTC (rev 8337) @@ -174,6 +174,7 @@ 'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')], 'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')], 'tabs_close_button': [opt_bool, True, _('Show close button in tab?')], + 'log_encrypted_sessions': [opt_bool, False, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')], 'chat_avatar_width': [opt_int, 52], 'chat_avatar_height': [opt_int, 52], 'roster_avatar_width': [opt_int, 32],

1 0

[commit-gajim] r8336 - in trunk: data/glade src
by roidelapluie＠gajim.org 28 Jun '07

28 Jun '07

Author: roidelapluie Date: 2007-06-28 12:42:24 +0200 (Thu, 28 Jun 2007) New Revision: 8336 Modified: trunk/data/glade/features_window.glade trunk/src/features_window.py Log: In features window, show description on select, not on double-click. See #2783. Modified: trunk/data/glade/features_window.glade =================================================================== --- trunk/data/glade/features_window.glade 2007-06-28 08:14:25 UTC (rev 8335) +++ trunk/data/glade/features_window.glade 2007-06-28 10:42:24 UTC (rev 8336) @@ -38,7 +38,7 @@ <property name="can_focus">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="headers_clickable">True</property> - <signal name="row_activated" handler="on_features_treeview_row_activated"/> + <signal name="cursor_changed" handler="on_features_treeview_cursor_changed"/> </widget> </child> </widget> Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2007-06-28 08:14:25 UTC (rev 8335) +++ trunk/src/features_window.py 2007-06-28 10:42:24 UTC (rev 8336) @@ -100,7 +100,9 @@ def on_close_button_clicked(self, widget): self.window.destroy() - def on_features_treeview_row_activated(self, widget, path, col): + def on_features_treeview_cursor_changed(self, widget): + selection = widget.get_selection() + path = selection.get_selected_rows()[1][0] available = self.model[path][1] feature = self.model[path][0] if os.name == 'nt':

1 0

[commit-gajim] r8335 - trunk/src/common
by liori＠gajim.org 28 Jun '07

28 Jun '07

Author: liori Date: 2007-06-28 10:14:25 +0200 (Thu, 28 Jun 2007) New Revision: 8335 Modified: trunk/src/common/caps.py Log: xmpppy doesn't raise exceptions! Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2007-06-27 23:26:07 UTC (rev 8334) +++ trunk/src/common/caps.py 2007-06-28 08:14:25 UTC (rev 8335) @@ -225,15 +225,14 @@ caps=presence.getTag('c') if not caps: return - try: - node, ver=caps['node'], caps['ver'] - except KeyError: + node, ver=caps['node'], caps['ver'] + if node is None or ver is None: # improper caps in stanza, ignoring return try: exts=caps['ext'].split(' ') - except KeyError: + except AttributeError: # no exts means no exts, a perfectly valid case exts=[]

1 0

[commit-gajim] r8334 - trunk/src/common
by liori＠gajim.org 27 Jun '07

27 Jun '07

Author: liori Date: 2007-06-28 01:26:07 +0200 (Thu, 28 Jun 2007) New Revision: 8334 Modified: trunk/src/common/contacts.py Log: contacts.py: get_contact_from_full_jid not to raise exceptions on bare jids Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-06-27 22:57:01 UTC (rev 8333) +++ trunk/src/common/contacts.py 2007-06-27 23:26:07 UTC (rev 8334) @@ -236,8 +236,12 @@ def get_contact_from_full_jid(self, account, jid): '''we will split the jid into bare jid and resource part, then get proper contact.''' - barejid, resource=jid.split('/',1) - return self.get_contact(account, barejid, resource) + try: + barejid, resource=jid.split('/',1) + return self.get_contact(account, barejid, resource) + except ValueError: # no resource causes split to fail + return None # how to handle that case? + def get_highest_prio_contact_from_contacts(self, contacts): if not contacts: return None

1 0

[commit-gajim] r8333 - trunk/src/common
by liori＠gajim.org 27 Jun '07

27 Jun '07

Author: liori Date: 2007-06-28 00:57:01 +0200 (Thu, 28 Jun 2007) New Revision: 8333 Modified: trunk/src/common/caps.py Log: Caps: removed debug module import Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2007-06-27 22:32:35 UTC (rev 8332) +++ trunk/src/common/caps.py 2007-06-27 22:57:01 UTC (rev 8333) @@ -18,7 +18,7 @@ import xmpp import xmpp.features_nb -from meta import VerboseClassType +#from meta import VerboseClassType class CapsCache(object): ''' This object keeps the mapping between caps data and real disco @@ -78,7 +78,7 @@ >>> cc[newcaps]['csn']+=chatstates # adding data as if ext was 'csn' # warning: no feature removal! ''' - __metaclass__ = VerboseClassType +# __metaclass__ = VerboseClassType def __init__(self, logger=None): ''' Create a cache for entity capabilities. ''' # our containers: @@ -94,7 +94,7 @@ self.__names = {} self.__cache = {} class CacheQuery(object): - __metaclass__ = VerboseClassType +# __metaclass__ = VerboseClassType def __init__(cqself, proxied): cqself.proxied=proxied @@ -104,7 +104,7 @@ class CacheItem(object): ''' TODO: logging data into db ''' - __metaclass__ = VerboseClassType +# __metaclass__ = VerboseClassType def __init__(ciself, node, version, ext=None): # cached into db ciself.node = node

1 0

[commit-gajim] r8332 - in trunk/src/common: . xmpp
by liori＠gajim.org 27 Jun '07

27 Jun '07

Author: liori Date: 2007-06-28 00:32:35 +0200 (Thu, 28 Jun 2007) New Revision: 8332 Modified: trunk/src/common/caps.py trunk/src/common/connection_handlers.py trunk/src/common/contacts.py trunk/src/common/xmpp/features_nb.py Log: Caps: querying caps disco node (no checking result yet) Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2007-06-27 12:38:00 UTC (rev 8331) +++ trunk/src/common/caps.py 2007-06-27 22:32:35 UTC (rev 8332) @@ -11,11 +11,15 @@ ## GNU General Public License for more details. ## -#import xmpp #import logger #import gajim from itertools import * +import gajim +import xmpp +import xmpp.features_nb +from meta import VerboseClassType + class CapsCache(object): ''' This object keeps the mapping between caps data and real disco features they represent, and provides simple way to query that info. @@ -74,6 +78,7 @@ >>> cc[newcaps]['csn']+=chatstates # adding data as if ext was 'csn' # warning: no feature removal! ''' + __metaclass__ = VerboseClassType def __init__(self, logger=None): ''' Create a cache for entity capabilities. ''' # our containers: @@ -89,6 +94,7 @@ self.__names = {} self.__cache = {} class CacheQuery(object): + __metaclass__ = VerboseClassType def __init__(cqself, proxied): cqself.proxied=proxied @@ -98,6 +104,7 @@ class CacheItem(object): ''' TODO: logging data into db ''' + __metaclass__ = VerboseClassType def __init__(ciself, node, version, ext=None): # cached into db ciself.node = node @@ -105,11 +112,8 @@ ciself.features = set() ciself.exts = {} - ciself.identities = [] - # reported as first... important? - ciself.category = None - ciself.type = None - ciself.name = None + # set of tuples: (category, type, name) + ciself.identities = set() ciself.cache = self @@ -121,21 +125,21 @@ ciself.queried = 0 def __iadd__(ciself, newfeature): - newfeature=self.cache.__names.setdefault(newfeature, newfeature) + newfeature=self.__names.setdefault(newfeature, newfeature) ciself.features.add(newfeature) def __getitem__(ciself, exts): - if len(ext)==0: - return self - if len(ext)==1: + if len(exts)==0: + return ciself + if len(exts)==1: ext=exts[0] if ext in ciself.exts: return ciself.exts[ext] x=CacheItem(ciself.node, ciself.version, ext) ciself.exts[ext]=x return x - proxied = [self] - proxied.extend(ciself[(e,)] for e in ext) + proxied = [ciself] + proxied.extend(ciself[(e,)] for e in exts) return CacheQuery(proxied) self.__CacheItem = CacheItem @@ -146,11 +150,11 @@ gajimcaps=self[(gajim, '0.11.1')] gajimcaps.category='client' gajimcaps.type='pc' - gajimcaps.features=set((common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, - common.xmpp.NS_FILE, common.xmpp.NS_MUC, common.xmpp.NS_COMMANDS, - common.xmpp.NS_DISCO_INFO, common.xmpp.NS_PING, common.xmpp.NS_TIME_REVISED)) - gajimcaps['cstates'].features=set((common.xmpp.NS_CHATSTATES,)) - gajimcaps['xhtml'].features=set((common.xmpp.NS_XHTML_IM,)) + gajimcaps.features=set((xmpp.NS_BYTESTREAM, xmpp.NS_SI, + xmpp.NS_FILE, xmpp.NS_MUC, xmpp.NS_COMMANDS, + xmpp.NS_DISCO_INFO, xmpp.NS_PING, xmpp.NS_TIME_REVISED)) + gajimcaps['cstates'].features=set((xmpp.NS_CHATSTATES,)) + gajimcaps['xhtml'].features=set((xmpp.NS_XHTML_IM,)) # TODO: older gajim versions @@ -171,34 +175,46 @@ node_version = caps[:2] if node_version in self.__cache: return self.__cache[node_version][caps[2]] - node, version = self.__names[caps[0]], caps[1] - x=self.__cache[(node, version)]=self.__CacheItem(node, version) + node, version = self.__names.setdefault(caps[0], caps[0]), caps[1] + x=self.__CacheItem(node, version) + self.__cache[(node, version)]=x return x - def preload(self, connection, jid, node, ver, exts): + def preload(self, con, jid, node, ver, exts): ''' Preload data about (node, ver, exts) caps using disco query to jid using proper connection. Don't query if the data is already in cache. ''' q=self[(node, ver, ())] + qq=q + def callback(identities, features): + try: + qq.identities=set( + (i['category'], i['type'], i.get('name')) + for i in identities) + qq.features=set(self.__names[f] for f in features) + qq.queried=2 + print 'Got features!' + print '%s/%s:' % (qq.node, qq.version) + print '%s\n%s' % (qq.identities, qq.features) + except KeyError: # improper answer, ignore + qq.queried=0 + if q.queried==0: # do query for bare node+version pair # this will create proper object q.queried=1 - def callback(identities, features): - q.queried=2 - # TODO: put features and identities - xmpp.discoverInfo(con, jid, node='%s#%s' % (node, ver), callback) + xmpp.features_nb.discoverInfo(con, jid, '%s#%s' % (node, ver), callback) for ext in exts: qq=q[ext] if qq.queried==0: # do query for node+version+ext triple qq.queried=1 - def callback(identities, features): - qq.queried=2 - # TODO: put features and identities - xmpp.discoverInfo(con, jid, node='%s#%s' % (node, ext)) + xmpp.features_nb.discoverInfo(con, jid, + '%s#%s' % (node, ext), callback) +capscache = CapsCache() + class ConnectionCaps(object): ''' This class highly depends on that it is a part of Connection class. ''' def _capsPresenceCB(self, con, presence): @@ -225,12 +241,12 @@ # for disco... so that disco will learn how to interpret # these caps - jid=presence.getFrom() + jid=str(presence.getFrom()) # start disco query... - gajim.capscache.preload(self, connection, jid, node, ver, exts) + capscache.preload(con, jid, node, ver, exts) - contact=gajim.contacts.get_contact_from_full_jid(self, jid) + contact=gajim.contacts.get_contact_from_full_jid(self.name, jid) if contact is None: return # TODO: a way to put contact not-in-roster into Contacts Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-06-27 12:38:00 UTC (rev 8331) +++ trunk/src/common/connection_handlers.py 2007-06-27 22:32:35 UTC (rev 8332) @@ -36,6 +36,7 @@ from common import atom from common.commands import ConnectionCommands from common.pubsub import ConnectionPubSub +from common.caps import ConnectionCaps STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible', 'error'] @@ -1162,7 +1163,7 @@ #('VCARD', {entry1: data, entry2: {entry21: data, ...}, ...}) self.dispatch('VCARD', vcard) -class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub): +class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub, ConnectionCaps): def __init__(self): ConnectionVcard.__init__(self) ConnectionBytestream.__init__(self) @@ -1982,6 +1983,7 @@ # that defines handlers con.RegisterHandler('message', self._messageCB) con.RegisterHandler('presence', self._presenceCB) + con.RegisterHandler('presence', self._capsPresenceCB) con.RegisterHandler('iq', self._vCardCB, 'result', common.xmpp.NS_VCARD) con.RegisterHandler('iq', self._rosterSetCB, 'set', Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-06-27 12:38:00 UTC (rev 8331) +++ trunk/src/common/contacts.py 2007-06-27 22:32:35 UTC (rev 8332) @@ -233,6 +233,11 @@ return contacts_instances return [] + def get_contact_from_full_jid(self, account, jid): + '''we will split the jid into bare jid and resource part, + then get proper contact.''' + barejid, resource=jid.split('/',1) + return self.get_contact(account, barejid, resource) def get_highest_prio_contact_from_contacts(self, contacts): if not contacts: return None Modified: trunk/src/common/xmpp/features_nb.py =================================================================== --- trunk/src/common/xmpp/features_nb.py 2007-06-27 12:38:00 UTC (rev 8331) +++ trunk/src/common/xmpp/features_nb.py 2007-06-27 22:32:35 UTC (rev 8332) @@ -71,6 +71,7 @@ cb(ret) _discover(disp, NS_DISCO_ITEMS, jid, node, _on_response) +# this one is def discoverInfo(disp,jid,node=None, cb=None): """ Query remote object about info that it publishes. Returns identities and features lists.""" """ According to JEP-0030:

1 0

[commit-gajim] r8331 - in trunk: data/glade src
by steve-e＠gajim.org 27 Jun '07

27 Jun '07

Author: steve-e Date: 2007-06-27 14:38:00 +0200 (Wed, 27 Jun 2007) New Revision: 8331 Modified: trunk/data/glade/features_window.glade trunk/src/features_window.py Log: Feature window cleanup, first part . See #2783 Modified: trunk/data/glade/features_window.glade =================================================================== --- trunk/data/glade/features_window.glade 2007-06-27 12:25:03 UTC (rev 8330) +++ trunk/data/glade/features_window.glade 2007-06-27 12:38:00 UTC (rev 8331) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> - + <glade-interface> <widget class="GtkWindow" id="features_window"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">12</property> <property name="title" translatable="yes">Features</property> - <property name="default_width">200</property> - <property name="default_height">350</property> + <property name="default_width">300</property> + <property name="default_height">525</property> <child> <widget class="GtkVBox" id="vbox1"> <property name="visible">True</property> @@ -17,7 +17,8 @@ <widget class="GtkLabel" id="label1"> <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">List of possible features in Gajim:</property> + <property name="label" translatable="yes"><b>List of possible features in Gajim:</b></property> + <property name="use_markup">True</property> </widget> <packing> <property name="expand">False</property> @@ -30,6 +31,7 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_OUT</property> <child> <widget class="GtkTreeView" id="features_treeview"> <property name="visible">True</property> @@ -45,6 +47,42 @@ </packing> </child> <child> + <widget class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="border_width">3</property> + <property name="label_xalign">0</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + <child> + <widget class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkLabel" id="feature_desc_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="wrap">True</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Description</b></property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + <child> <widget class="GtkHButtonBox" id="hbuttonbox1"> <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> @@ -57,12 +95,14 @@ <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">gtk-close</property> <property name="use_stock">True</property> + <property name="response_id">0</property> <signal name="clicked" handler="on_close_button_clicked"/> </widget> </child> </widget> <packing> <property name="expand">False</property> + <property name="pack_type">GTK_PACK_END</property> <property name="position">2</property> </packing> </child> Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2007-06-27 12:25:03 UTC (rev 8330) +++ trunk/src/features_window.py 2007-06-27 12:38:00 UTC (rev 8331) @@ -29,6 +29,7 @@ self.xml = gtkgui_helpers.get_glade('features_window.glade') self.window = self.xml.get_widget('features_window') treeview = self.xml.get_widget('features_treeview') + self.desc_label = self.xml.get_widget('feature_desc_label') # {name: (available_function, unix_text, windows_text)} self.features = { @@ -64,7 +65,7 @@ _('This feature is not available under Windows.')), _('Trayicon'): (self.trayicon_available, _('You need to install python-gnome2-extras or compile trayicon module from Gajim sources to use the trayicon.'), - _('You need PyGTK > 2.10 to use the trayicon.')), + _('You need PyGTK >= 2.10 to use the trayicon.')), _('Idle'): (self.idle_available, _('You need to compile idle module from Gajim sources to use it.'), _('You need to compile idle module from Gajim sources to use it.')), @@ -83,6 +84,7 @@ col = gtk.TreeViewColumn(_('Available')) treeview.append_column(col) cell = gtk.CellRendererToggle() + cell.set_property('sensitive', False) col.pack_start(cell) col.set_attributes(cell, active = 1) @@ -100,14 +102,12 @@ def on_features_treeview_row_activated(self, widget, path, col): available = self.model[path][1] - if available: - return feature = self.model[path][0] if os.name == 'nt': text = self.features[feature][2] else: text = self.features[feature][1] - dialogs.InformationDialog(_('Feature not available'), text) + self.desc_label.set_text(text) def pyopenssl_available(self): try:

1 0

[commit-gajim] r8330 - trunk/data/glade
by roidelapluie＠gajim.org 27 Jun '07

27 Jun '07

Author: roidelapluie Date: 2007-06-27 14:25:03 +0200 (Wed, 27 Jun 2007) New Revision: 8330 Modified: trunk/data/glade/roster_window.glade Log: Add icon to FAQ and Features menu entry in roster Modified: trunk/data/glade/roster_window.glade =================================================================== --- trunk/data/glade/roster_window.glade 2007-06-27 10:32:54 UTC (rev 8329) +++ trunk/data/glade/roster_window.glade 2007-06-27 12:25:03 UTC (rev 8330) @@ -258,12 +258,19 @@ </widget> </child> <child> - <widget class="GtkMenuItem" id="faq_menuitem"> + <widget class="GtkImageMenuItem" id="faq_menuitem"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Frequently Asked Questions (online)</property> <property name="label" translatable="yes">_FAQ</property> <property name="use_underline">True</property> <signal name="activate" handler="on_faq_menuitem_activate"/> + <child internal-child="image"> + <widget class="GtkImage" id="image_faq"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon_size">1</property> + </widget> + </child> </widget> </child> <child> @@ -272,12 +279,19 @@ </widget> </child> <child> - <widget class="GtkMenuItem" id="features_menuitem"> + <widget class="GtkImageMenuItem" id="features_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">Fea_tures</property> <property name="use_underline">True</property> <signal name="activate" handler="on_features_menuitem_activate"/> + <child internal-child="image"> + <widget class="GtkImage" id="image_features"> + <property name="visible">True</property> + <property name="stock">gtk-properties</property> + <property name="icon_size">1</property> + </widget> + </child> </widget> </child> <child>

1 0

[commit-gajim] r8329 - trunk/src
by steve-e＠gajim.org 27 Jun '07

27 Jun '07

Author: steve-e Date: 2007-06-27 12:32:54 +0200 (Wed, 27 Jun 2007) New Revision: 8329 Modified: trunk/src/roster_window.py Log: Redraw groups if we add/remove contacts. Fixes #3192 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-06-27 10:20:24 UTC (rev 8328) +++ trunk/src/roster_window.py 2007-06-27 10:32:54 UTC (rev 8329) @@ -354,6 +354,7 @@ elif not groups: groups = [_('General')] for group in groups: + self.draw_group(group, account) iterG = self.get_group_iter(group, account) if not iterG: IterAcct = self.get_account_iter(account) @@ -556,6 +557,8 @@ else: if gajim.groups[account].has_key(group): del gajim.groups[account][group] + else: + self.draw_group(group, account) # re-add children for child in children:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2007