Commits October 2009

commits@gajim.org

6 participants
172 discussions

gajim: Improve common/caps.py test coverage.
by Stephan Erb 27 Oct '09

27 Oct '09

changeset bf9a131cbc1c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bf9a131cbc1c description: Improve common/caps.py test coverage. diffstat: src/common/caps.py | 44 +++++----------------- src/common/optparser.py | 2 +- test/test_caps.py | 104 +++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 94 insertions(+), 56 deletions(-) diffs (260 lines): diff -r f500f0a0598e -r bf9a131cbc1c src/common/caps.py --- a/src/common/caps.py Sun Oct 25 20:00:42 2009 +0100 +++ b/src/common/caps.py Sun Oct 25 21:17:32 2009 +0100 @@ -29,45 +29,20 @@ 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. + It is application-wide, that is there's one object for all connections. + Goals: * handle storing/retrieving info from database * cache info in memory * expose simple interface + Properties: * one object for all connections (move to logger.py?) * store info efficiently (a set() of urls -- we can assume there won't be too much of these, ensure that (X,Y,Z1) and (X,Y,Z2) has different features. - - Connections with other objects: (TODO) - - Interface: - - # object creation - >>> cc=CapsCache(logger_object) - - >>> caps = ('sha-1', '66/0NaeaBKkwk85efJTGmU47vXI=') - >>> muc = 'http://jabber.org/protocol/muc' - >>> chatstates = 'http://jabber.org/protocol/chatstates' - - # setting data - >>> cc[caps].identities = [{'category':'client', 'type':'pc'}] - >>> cc[caps].features = [muc] - - # retrieving data - >>> muc in cc[caps].features - True - >>> chatstates in cc[caps].features - False - >>> cc[caps].identities - [{'category': 'client', 'type': 'pc'}] - >>> x = cc[caps] # more efficient if making several queries for one set of caps - ATypicalBlackBoxObject - >>> muc in x.features - True - ''' def __init__(self, logger=None): ''' Create a cache for entity capabilities. ''' @@ -86,12 +61,14 @@ # TODO: maybe put all known xmpp namespace strings here # (strings given in xmpppy)? __names = {} - def __init__(ciself, hash_method, hash_): + + def __init__(self, hash_method, hash_, logger): # cached into db self.hash_method = hash_method self.hash = hash_ self._features = [] self._identities = [] + self._logger = logger # not cached into db: # have we sent the query? @@ -106,8 +83,7 @@ def _set_features(self, value): self._features = [] for feature in value: - self._features.append(self.__names.setdefault(feature, - feature)) + self._features.append(self.__names.setdefault(feature, feature)) features = property(_get_features, _set_features) def _get_identities(self): @@ -137,7 +113,7 @@ # NOTE: self refers to CapsCache object, not to CacheItem self.identities=identities self.features=features - self.logger.add_caps_entry(self.hash_method, self.hash, + self._logger.add_caps_entry(self.hash_method, self.hash, identities, features) self.__CacheItem = CacheItem @@ -153,7 +129,7 @@ # start logging data from the net self.logger = logger - def load_from_db(self): + def initialize_from_db(self): # get data from logger... if self.logger is not None: for hash_method, hash_, identities, features in \ @@ -169,7 +145,7 @@ hash_method, hash_ = caps - x = self.__CacheItem(hash_method, hash_) + x = self.__CacheItem(hash_method, hash_, self.logger) self.__cache[(hash_method, hash_)] = x return x diff -r f500f0a0598e -r bf9a131cbc1c src/common/optparser.py --- a/src/common/optparser.py Sun Oct 25 20:00:42 2009 +0100 +++ b/src/common/optparser.py Sun Oct 25 21:17:32 2009 +0100 @@ -216,7 +216,7 @@ gajim.logger.init_vars() gajim.config.set('version', new_version) - gajim.capscache.load_from_db() + gajim.capscache.initialize_from_db() def update_config_x_to_09(self): # Var name that changed: diff -r f500f0a0598e -r bf9a131cbc1c test/test_caps.py --- a/test/test_caps.py Sun Oct 25 20:00:42 2009 +0100 +++ b/test/test_caps.py Sun Oct 25 21:17:32 2009 +0100 @@ -6,36 +6,45 @@ import lib lib.setup_env() -from common import gajim -from common import xmpp from common import helpers - +from common.contacts import Contact from common.caps import CapsCache from mock import Mock -class MockLogger(Mock): - def __init__(self, *args): - Mock.__init__(self, *args) - -class TestCapsCache(unittest.TestCase): + +class CommonCapsTest(unittest.TestCase): + def setUp(self): - self.logger = MockLogger() - self.cc = CapsCache(self.logger) - self.caps_method = 'sha-1' - self.caps_hash = 'zaQfb22o0UCwYDIk8KZOnoZTnrs=' + self.caps_hash = 'RNzJvJnTWqczirzu+YF4V8am9ro=' self.caps = (self.caps_method, self.caps_hash) - self.identity = {'category': 'client', 'type': 'pc'} + + self.node = "http://gajim.org" + self.identity = {'category': 'client', 'type': 'pc', 'name':'Gajim'} self.muc = 'http://jabber.org/protocol/muc' self.chatstates = 'http://jabber.org/protocol/chatstates' self.identities = [self.identity] self.features = [self.muc] + + +class TestCapsCache(CommonCapsTest): + + def setUp(self): + CommonCapsTest.setUp(self) - def test_examples(self): - '''tests the examples given in common/caps.py''' + # Simulate a filled db + db_caps_cache = [ + (self.caps_method, self.caps_hash, self.identities, self.features), + (self.caps_method, self.caps_hash, self.identities, self.features)] + self.logger = Mock(returnValues={"iter_caps_data":db_caps_cache}) + + self.cc = CapsCache(self.logger) + + def test_set_retrieve(self): + ''' Test basic set / retrieve cycle ''' self.cc[self.caps].identities = self.identities self.cc[self.caps].features = self.features @@ -43,19 +52,72 @@ self.assert_(self.muc in self.cc[self.caps].features) self.assert_(self.chatstates not in self.cc[self.caps].features) - id = self.cc[self.caps].identities + identities = self.cc[self.caps].identities - self.assertEqual(1, len(id)) + self.assertEqual(1, len(identities)) - id = id[0] - self.assertEqual('client', id['category']) - self.assertEqual('pc', id['type']) + identity = identities[0] + self.assertEqual('client', identity['category']) + self.assertEqual('pc', identity['type']) + + def test_update(self): + ''' Test caps update gets logged into db ''' + + item = self.cc[self.caps] + item.update(self.identities, self.features) + + self.logger.mockCheckCall(0, "add_caps_entry", self.caps_method, + self.caps_hash, self.identities, self.features) + + def test_initialize_from_db(self): + ''' Read cashed dummy data from db ''' + self.assertEqual(self.cc[self.caps].queried, 0) + self.cc.initialize_from_db() + self.assertEqual(self.cc[self.caps].queried, 2) + def test_preload_triggering_query(self): + ''' Make sure that preload issues a disco ''' + connection = Mock() + + self.cc.preload(connection, "test(a)gajim.org", self.node, + self.caps_method, self.caps_hash) + + connection.mockCheckCall(0, "discoverInfo", 'test(a)gajim.org', + 'http://gajim.org#RNzJvJnTWqczirzu+YF4V8am9ro=') + + def test_no_preload_query_if_cashed(self): + ''' Preload must not send a query if the data is already cached ''' + connection = Mock() + + self.cc.initialize_from_db() + self.cc.preload(connection, "test(a)gajim.org", self.node, + self.caps_method, self.caps_hash) + + self.assertEqual(0, len(connection.mockGetAllCalls())) + + def test_is_supported(self): + contact = Contact(caps_node=self.node, + caps_hash_method=self.caps_method, + caps_hash=self.caps_hash) + + self.assertTrue(self.cc.is_supported(contact, self.chatstates), + msg="Assume everything is supported, if we don't have caps") + + self.cc.initialize_from_db() + + self.assertFalse(self.cc.is_supported(contact, self.chatstates), + msg="Must return false on unsupported feature") + + self.assertTrue(self.cc.is_supported(contact, self.muc), + msg="Must return True on supported feature") + def test_hash(self): '''tests the hash computation''' computed_hash = helpers.compute_caps_hash(self.identities, self.features) + self.assertEqual(self.caps_hash, computed_hash) - self.assertEqual(self.caps_hash, computed_hash) + + if __name__ == '__main__': unittest.main()

1 0

gajim: Ignore .orig files generated by 'hg revert'
by Stephan Erb 27 Oct '09

27 Oct '09

changeset f500f0a0598e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f500f0a0598e description: Ignore .orig files generated by 'hg revert' diffstat: .hgignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (9 lines): diff -r 79f7a171e627 -r f500f0a0598e .hgignore --- a/.hgignore Sat Oct 24 20:49:34 2009 +0200 +++ b/.hgignore Sun Oct 25 20:00:42 2009 +0100 @@ -1,4 +1,5 @@ syntax: glob +*.orig *.gmo *.in *.la

1 0

gajim: Remove unused imports.
by Stephan Erb 27 Oct '09

27 Oct '09

changeset 79f7a171e627 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=79f7a171e627 description: Remove unused imports. diffstat: test/lib/xmpp_mocks.py | 1 - test/test_roster.py | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diffs (22 lines): diff -r 74e990ccea24 -r 79f7a171e627 test/lib/xmpp_mocks.py --- a/test/lib/xmpp_mocks.py Sat Oct 24 20:49:16 2009 +0200 +++ b/test/lib/xmpp_mocks.py Sat Oct 24 20:49:34 2009 +0200 @@ -7,7 +7,6 @@ from mock import Mock from common.xmpp import idlequeue -from common.xmpp.plugin import PlugIn IDLEQUEUE_INTERVAL = 0.2 # polling interval. 200ms is used in Gajim as default IDLEMOCK_TIMEOUT = 30 # how long we wait for an event diff -r 74e990ccea24 -r 79f7a171e627 test/test_roster.py --- a/test/test_roster.py Sat Oct 24 20:49:16 2009 +0200 +++ b/test/test_roster.py Sat Oct 24 20:49:34 2009 +0200 @@ -9,7 +9,6 @@ from gajim_mocks import * from common import gajim -from common import zeroconf import roster_window gajim.get_jid_from_account = lambda acc: 'myjid@' + acc

1 0

gajim: Remove unused import and apply naming convention.
by Stephan Erb 27 Oct '09

27 Oct '09

changeset 74e990ccea24 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=74e990ccea24 description: Remove unused import and apply naming convention. diffstat: src/common/caps.py | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diffs (83 lines): diff -r 2759e2f1b048 -r 74e990ccea24 src/common/caps.py --- a/src/common/caps.py Sat Oct 24 14:22:10 2009 +0200 +++ b/src/common/caps.py Sat Oct 24 20:49:16 2009 +0200 @@ -23,7 +23,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -from itertools import * import gajim import helpers @@ -89,31 +88,31 @@ __names = {} def __init__(ciself, hash_method, hash_): # cached into db - ciself.hash_method = hash_method - ciself.hash = hash_ - ciself._features = [] - ciself._identities = [] + self.hash_method = hash_method + self.hash = hash_ + self._features = [] + self._identities = [] # not cached into db: # have we sent the query? # 0 == not queried # 1 == queried # 2 == got the answer - ciself.queried = 0 + self.queried = 0 - def _get_features(ciself): - return ciself._features + def _get_features(self): + return self._features - def _set_features(ciself, value): - ciself._features = [] + def _set_features(self, value): + self._features = [] for feature in value: - ciself._features.append(ciself.__names.setdefault(feature, + self._features.append(self.__names.setdefault(feature, feature)) features = property(_get_features, _set_features) - def _get_identities(ciself): + def _get_identities(self): list_ = [] - for i in ciself._identities: + for i in self._identities: # transforms it back in a dict d = dict() d['category'] = i[0] @@ -125,20 +124,20 @@ d['name'] = i[3] list_.append(d) return list_ - def _set_identities(ciself, value): - ciself._identities = [] + def _set_identities(self, value): + self._identities = [] for identity in value: # dict are not hashable, so transform it into a tuple t = (identity['category'], identity.get('type'), identity.get('xml:lang'), identity.get('name')) - ciself._identities.append(ciself.__names.setdefault(t, t)) + self._identities.append(self.__names.setdefault(t, t)) identities = property(_get_identities, _set_identities) - def update(ciself, identities, features): + def update(self, identities, features): # NOTE: self refers to CapsCache object, not to CacheItem - ciself.identities=identities - ciself.features=features - self.logger.add_caps_entry(ciself.hash_method, ciself.hash, + self.identities=identities + self.features=features + self.logger.add_caps_entry(self.hash_method, self.hash, identities, features) self.__CacheItem = CacheItem

1 0

gajim: Remove commented code. We have have version control for this
by Stephan Erb 27 Oct '09

27 Oct '09

changeset 2759e2f1b048 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2759e2f1b048 description: Remove commented code. We have have version control for this diffstat: src/roster_window.py | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diffs (21 lines): diff -r dc0a3cd06f47 -r 2759e2f1b048 src/roster_window.py --- a/src/roster_window.py Sat Oct 24 14:08:13 2009 +0200 +++ b/src/roster_window.py Sat Oct 24 14:22:10 2009 +0200 @@ -5148,17 +5148,6 @@ zeroconf_properties_menuitem.connect('activate', self.on_zeroconf_properties, account) - #gc_sub_menu = gtk.Menu() # gc is always a submenu - #join_group_chat_menuitem.set_submenu(gc_sub_menu) - #self.add_bookmarks_list(gc_sub_menu, account) - #new_message_menuitem.connect('activate', - # self.on_new_message_menuitem_activate, account) - - # make some items insensitive if account is offline - #if gajim.connections[account].connected < 2: - # for widget in [join_group_chat_menuitem, new_message_menuitem]: - # widget.set_sensitive(False) - # new_message_menuitem.set_sensitive(False) return account_context_menu

1 0

gajim: Create refactoring branch
by Stephan Erb 27 Oct '09

27 Oct '09

changeset dc0a3cd06f47 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dc0a3cd06f47 description: Create refactoring branch

1 0

gajim: we depend on python-dbus >= 0.80. announce that in README...
by Yann Leboulanger 27 Oct '09

27 Oct '09

changeset 1fb2379f141d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1fb2379f141d description: we depend on python-dbus >= 0.80. announce that in README.html. Fixes #5361 diffstat: README.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 2e70ef831f12 -r 1fb2379f141d README.html --- a/README.html Tue Oct 27 20:50:20 2009 +0100 +++ b/README.html Tue Oct 27 23:00:23 2009 +0100 @@ -37,8 +37,8 @@ <li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li> <li>gnome-python-desktop (for GnomeKeyring support)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> -<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.60 is required.</li> -<li>python-dbus bindings</li> +<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li> +<li>python-dbus bindings (>=0.80)</li> <li>python-sexy to have clickable URLs in chat windows</li> <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li> </ul>

1 0

gajim: sometimes, a girl can sign in too
by Yann Leboulanger 27 Oct '09

27 Oct '09

changeset 2e70ef831f12 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2e70ef831f12 description: sometimes, a girl can sign in too diffstat: po/fr.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 59d3d109ab43 -r 2e70ef831f12 po/fr.po --- a/po/fr.po Tue Oct 27 19:36:36 2009 +0100 +++ b/po/fr.po Tue Oct 27 20:50:20 2009 +0100 @@ -9278,7 +9278,7 @@ #: ../src/notify.py:252 #, python-format msgid "%(nickname)s Signed In" -msgstr "%(nickname)s s'est connecté" +msgstr "%(nickname)s s'est connecté(e)" #: ../src/notify.py:260 #, python-format

1 0

gajim: Merge changes from default branch into osx_newbuildsys br...
by Jonathan Schleifer 27 Oct '09

27 Oct '09

changeset 8a9a048e0112 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8a9a048e0112 description: Merge changes from default branch into osx_newbuildsys branch. diffstat: data/glade/chat_control_popup_menu.glade | 103 ------ data/glade/contact_context_menu.glade | 421 ++++++++++++++++++++++++++ data/glade/roster_contact_context_menu.glade | 360 ---------------------- data/glade/zeroconf_contact_context_menu.glade | 169 ---------- po/de.po | 6 +- src/chat_control.py | 143 +-------- src/common/connection_handlers.py | 10 +- src/config.py | 6 +- src/gajim.py | 12 +- src/groupchat_control.py | 2 +- src/gui_menu_builder.py | 465 +++++++++++++++++++++++++++++ src/message_control.py | 2 +- src/message_window.py | 26 + src/roster_window.py | 491 +------------------------------ src/systray.py | 2 +- 15 files changed, 950 insertions(+), 1268 deletions(-) diffs (truncated from 2465 to 300 lines): diff -r d64a07b0043f -r 8a9a048e0112 data/glade/chat_control_popup_menu.glade --- a/data/glade/chat_control_popup_menu.glade Tue Oct 20 13:41:20 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> - -<glade-interface> - <widget class="GtkMenu" id="chat_control_popup_menu"> - <child> - <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">_Add to Roster</property> - <property name="use_underline">True</property> - <signal name="activate" handler="_on_add_to_roster_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image1372"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="send_file_menuitem"> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Send _File</property> - <property name="use_underline">True</property> - <signal name="activate" handler="_on_send_file_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image1371"> - <property name="visible">True</property> - <property name="stock">gtk-save</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="convert_to_groupchat"> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Invite _Contacts</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image4"> - <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> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem2"> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="toggle_gpg_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Toggle Open_PGP Encryption</property> - <property name="use_underline">True</property> - <signal name="activate" handler="_on_toggle_gpg_menuitem_activate"/> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="toggle_e2e_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">Toggle End to End Encryption</property> - <property name="use_underline">True</property> - <signal name="activate" handler="_on_toggle_e2e_menuitem_activate"/> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="information_menuitem"> - <property name="no_show_all">True</property> - <property name="label">gtk-info</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="history_menuitem"> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">_History</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1370"> - <property name="visible">True</property> - <property name="stock">gtk-justify-fill</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - </widget> -</glade-interface> diff -r d64a07b0043f -r 8a9a048e0112 data/glade/contact_context_menu.glade --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/glade/contact_context_menu.glade Tue Oct 27 20:20:10 2009 +0100 @@ -0,0 +1,421 @@ +<?xml version="1.0"?> +<glade-interface> +  +  + <widget class="GtkMenu" id="contact_context_menu"> + <child> + <widget class="GtkImageMenuItem" id="start_chat_menuitem"> + <property name="label" translatable="yes">Start _Chat</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-jump-to</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="send_single_message_menuitem"> + <property name="label" translatable="yes">Send Single _Message...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="stock">gtk-new</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="send_file_menuitem"> + <property name="label" translatable="yes">Send _File...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="stock">gtk-save</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="invite_menuitem"> + <property name="label" translatable="yes">In_vite to</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="convert_to_groupchat_menuitem"> + <property name="label" translatable="yes">Invite _Contacts</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkSeparatorMenuItem" id="encryption_separator"> + <property name="visible">True</property> + </widget> + </child> + <child> + <widget class="GtkCheckMenuItem" id="toggle_gpg_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Toggle Open_PGP Encryption</property> + <property name="use_underline">True</property> + </widget> + </child> + <child> + <widget class="GtkCheckMenuItem" id="toggle_e2e_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Toggle End to End Encryption</property> + <property name="use_underline">True</property> + </widget> + </child> + <child> + <widget class="GtkSeparatorMenuItem" id="menuitem3"> + <property name="visible">True</property> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="send_custom_status_menuitem"> + <property name="label" translatable="yes">Send Cus_tom Status</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child> + <widget class="GtkMenu" id="menu5"> + <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> + </widget> + </child> + <child internal-child="image"> + <widget class="GtkImage" id="image6"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="execute_command_menuitem"> + <property name="label" translatable="yes">E_xecute Command...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image7"> + <property name="visible">True</property> + <property name="stock">gtk-execute</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="manage_contact"> + <property name="label" translatable="yes">_Manage Contact</property> + <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="use_underline">True</property> + <property name="use_stock">False</property> + <child> + <widget class="GtkMenu" id="menu2"> + <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> + <child> + <widget class="GtkImageMenuItem" id="rename_menuitem"> + <property name="label" translatable="yes">_Rename...</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image9"> + <property name="visible">True</property> + <property name="stock">gtk-refresh</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="edit_groups_menuitem"> + <property name="label" translatable="yes">Edit _Groups...</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image10"> + <property name="visible">True</property> + <property name="stock">gtk-edit</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="assign_openpgp_key_menuitem"> + <property name="label" translatable="yes">Assign Open_PGP Key...</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <signal name="activate" handler="on_assign_openpgp_key_menuitem_activate"/> + <child internal-child="image"> + <widget class="GtkImage" id="image11"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-authentication</property>

1 0

gajim: [Stepan Kasal] fix italic detection with //. Fixes #4217
by Yann Leboulanger 27 Oct '09

27 Oct '09

changeset 59d3d109ab43 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=59d3d109ab43 description: [Stepan Kasal] fix italic detection with //. Fixes #4217 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 444fcb260a0c -r 59d3d109ab43 src/gajim.py --- a/src/gajim.py Tue Oct 27 19:02:14 2009 +0100 +++ b/src/gajim.py Tue Oct 27 19:36:36 2009 +0100 @@ -2646,7 +2646,7 @@ #detects eg. *b* *bold* *bold bold* test *bold* *bold*! (*bold*) #doesn't detect (it's a feature :P) * bold* *bold * * bold * test*bold* formatting = r'|(?<!\w)' r'\*[^\s*]' r'([^*]*[^\s*])?' r'\*(?!\w)|'\ - r'(?<!\w|\<)' r'/[^\s/]' r'([^/]*[^\s/])?' r'/(?!\w)|'\ + r'(?<!\S)' r'/[^\s/]' r'([^/]*[^\s/])?' r'/(?!\S)|'\ r'(?<!\w)' r'_[^\s_]' r'([^_]*[^\s_])?' r'_(?!\w)' latex = r'|\$\$[^$\\]*?([\]\[0-9A-Za-z()|+*/-]|[\\][\]\[0-9A-Za-z()|{}$])(.*?[^\\])?\$\$'

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
18
Older →

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 October 2009