Commits July 2008

commits@gajim.org

7 participants
229 discussions

[commit-gajim] r10069 - trunk/src
by asterix＠gajim.org 29 Jul '08

29 Jul '08

Author: asterix Date: 2008-07-29 09:23:56 +0200 (Tue, 29 Jul 2008) New Revision: 10069 Modified: trunk/src/chat_control.py Log: don't require python2.5 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-29 07:20:12 UTC (rev 10068) +++ trunk/src/chat_control.py 2008-07-29 07:23:56 UTC (rev 10069) @@ -1326,9 +1326,12 @@ source = gobject.markup_escape_text(source) if artist or title: - artist = artist if artist else _('Unknown Artist') - title = title if title else _('Unknown Title') - source = source if source else _('Unknown Source') + if not artist: + artist = _('Unknown Artist') + if not title: + title = _('Unknown Title') + if not source: + source = _('Unknown Source') if HAVE_MARKUP_TOOLTIPS: self._tune_image.set_tooltip_markup(

1 0

[commit-gajim] r10068 - trunk/src
by asterix＠gajim.org 29 Jul '08

29 Jul '08

Author: asterix Date: 2008-07-29 09:20:12 +0200 (Tue, 29 Jul 2008) New Revision: 10068 Modified: trunk/src/chat_control.py Log: don't require python2.5 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-29 07:11:39 UTC (rev 10067) +++ trunk/src/chat_control.py 2008-07-29 07:20:12 UTC (rev 10068) @@ -1231,13 +1231,15 @@ mood = gobject.markup_escape_text(mood) text = gobject.markup_escape_text(text) - self._mood_image.set_tooltip_markup( - '%s%s%s' % (mood, - '\n' if text is not '' else '', text)) + markup = '%s' % mood + if text != '': + text += '\n' + text + self._mood_image.set_tooltip_markup(markup) else: - self._mood_tooltip.set_tip( - self._mood_image, '%s%s%s' % (mood, - '\n' if text is not '' else '', text)) + markup = mood + if text != '': + text += '\n' + text + self._mood_tooltip.set_tip(self._mood_image, markup) self._mood_image.show() else: self._mood_image.hide() @@ -1281,18 +1283,21 @@ subactivity) text = gobject.markup_escape_text(text) - self._activity_image.set_tooltip_markup( - '%s%s%s%s%s' % (activity, - ': ' if subactivity is not '' else '', - subactivity, - '\n' if text is not '' else '', text)) + markup = '' + activity + if subactivity != '': + markup += ': ' + subactivity + markup += '' + if text != '': + markup += '\n' + text + self._activity_image.set_tooltip_markup(markup) else: + markup = activity + if subactivity != '': + markup += ': ' + subactivity + if text != '': + markup += '\n' + text self._activity_tooltip.set_tip( - self._activity_image, '%s%s%s%s%s' % ( - activity, - ': ' if subactivity is not '' else '', - subactivity, - '\n' if text is not '' else '', text)) + self._activity_image, markup) self._activity_image.show() else:

1 0

[commit-gajim] r10067 - trunk/src/common
by asterix＠gajim.org 29 Jul '08

29 Jul '08

Author: asterix Date: 2008-07-29 09:11:39 +0200 (Tue, 29 Jul 2008) New Revision: 10067 Modified: trunk/src/common/pep.py Log: don't require python2.5 Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-07-29 07:08:56 UTC (rev 10066) +++ trunk/src/common/pep.py 2008-07-29 07:11:39 UTC (rev 10067) @@ -375,8 +375,11 @@ return item = xmpp.Node('mood', {'xmlns': xmpp.NS_MOOD}) if mood != '': - item.addChild(mood, namespace = 'http://gajim.org/moods' \ - if mood in GAJIM_MOODS else None) + if mood in GAJIM_MOODS: + ns = 'http://gajim.org/moods' + else: + ns = None + item.addChild(mood, namespace = ns) if message != '': i = item.addChild('text') i.addData(message)

1 0

[commit-gajim] r10066 - trunk/src
by asterix＠gajim.org 29 Jul '08

29 Jul '08

Author: asterix Date: 2008-07-29 09:08:56 +0200 (Tue, 29 Jul 2008) New Revision: 10066 Modified: trunk/src/tooltips.py Log: don't require python2.5 Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-07-29 06:59:14 UTC (rev 10065) +++ trunk/src/tooltips.py 2008-07-29 07:08:56 UTC (rev 10066) @@ -589,18 +589,16 @@ activity = act_plain = \ contact.activity['activity'].strip() activity = gobject.markup_escape_text(activity) - activity = ACTIVITIES[activity]['category'] \ - if act_plain in ACTIVITIES else activity + if act_plain in ACTIVITIES: + activity = ACTIVITIES[activity]['category'] activity_string = _('Activity:') + ' %s' % activity if contact.activity.has_key('subactivity'): activity_sub = \ contact.activity['subactivity'].strip() + if act_plain in ACTIVITIES and activity_sub in \ + ACTIVITIES[act_plain]: + activity_sub = ACTIVITIES[act_plain][activity_sub] activity_sub = \ - ACTIVITIES[act_plain][activity_sub] \ - if act_plain in ACTIVITIES and \ - activity_sub in ACTIVITIES[act_plain] \ - else activity_sub - activity_sub = \ gobject.markup_escape_text(activity_sub) activity_string += ' (%s)' % activity_sub else:

1 0

[commit-gajim] r10065 - trunk/src
by asterix＠gajim.org 29 Jul '08

29 Jul '08

Author: asterix Date: 2008-07-29 08:59:14 +0200 (Tue, 29 Jul 2008) New Revision: 10065 Modified: trunk/src/dialogs.py Log: don't require python2.5 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-29 06:56:27 UTC (rev 10064) +++ trunk/src/dialogs.py 2008-07-29 06:59:14 UTC (rev 10065) @@ -500,7 +500,10 @@ self.mood_buttons[con.mood['mood']]. \ set_active(True) - self.entry.set_sensitive(True if self.mood else False) + if self.mood: + self.entry.set_sensitive(True) + else: + self.entry.set_sensitive(False) if 'text' in con.mood: self.entry.set_text(con.mood['text'])

1 0

[commit-gajim] r10064 - trunk/data/glade
by asterix＠gajim.org 29 Jul '08

29 Jul '08

Author: asterix Date: 2008-07-29 08:56:27 +0200 (Tue, 29 Jul 2008) New Revision: 10064 Modified: trunk/data/glade/change_activity_dialog.glade Log: added tooltips to activities dialog Modified: trunk/data/glade/change_activity_dialog.glade =================================================================== --- trunk/data/glade/change_activity_dialog.glade 2008-07-29 06:42:34 UTC (rev 10063) +++ trunk/data/glade/change_activity_dialog.glade 2008-07-29 06:56:27 UTC (rev 10064) @@ -63,6 +63,7 @@ <child> <widget class="GtkImage" id="working_image"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Working</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -105,6 +106,7 @@ <child> <widget class="GtkImage" id="eating_image"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Eating</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -148,6 +150,7 @@ <child> <widget class="GtkImage" id="exercising_image"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Exercising</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -191,6 +194,7 @@ <child> <widget class="GtkImage" id="relaxing_image"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Relaxing</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -234,6 +238,7 @@ <child> <widget class="GtkImage" id="talking_image"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Talking</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -277,6 +282,7 @@ <child> <widget class="GtkImage" id="doing_chores_image"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Doing Chores</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -320,6 +326,7 @@ <child> <widget class="GtkImage" id="inactive_image"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Inactive</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -363,6 +370,7 @@ <child> <widget class="GtkImage" id="traveling_image"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Traveling</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -406,6 +414,7 @@ <child> <widget class="GtkImage" id="having_appointment_image"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Having an Appointment</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -449,6 +458,7 @@ <child> <widget class="GtkImage" id="drinking_image"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Drinking</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -492,6 +502,7 @@ <child> <widget class="GtkImage" id="grooming_image"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Grooming</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget>

1 0

[commit-gajim] r10063 - in trunk/src: . common
by asterix＠gajim.org 29 Jul '08

29 Jul '08

Author: asterix Date: 2008-07-29 08:42:34 +0200 (Tue, 29 Jul 2008) New Revision: 10063 Modified: trunk/src/common/config.py trunk/src/gajim.py trunk/src/roster_window.py Log: restore autoconnect_as option. Correctly use 80 char width Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-07-29 06:40:09 UTC (rev 10062) +++ trunk/src/common/config.py 2008-07-29 06:42:34 UTC (rev 10063) @@ -277,7 +277,8 @@ 'autopriority_dnd': [ opt_int, 20], 'autopriority_invisible': [ opt_int, 10], 'autoconnect': [ opt_bool, False, '', True ], - 'dont_restore_last_status': [ opt_bool, False, _('If enabled, don\'t restore the last status that was used.') ], + 'autoconnect_as': [ opt_str, 'online', _('Status used to autoconnect as. Can be online, chat, away, xa, dnd, invisible. NOTE: this option is used only if restore_last_status is disabled'), True ], + 'restore_last_status': [ opt_bool, False, _('If enabled, restore the last status that was used.') ], 'autoreconnect': [ opt_bool, True ], 'active': [ opt_bool, True], 'proxy': [ opt_str, '', '', True ], Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-29 06:40:09 UTC (rev 10062) +++ trunk/src/gajim.py 2008-07-29 06:42:34 UTC (rev 10063) @@ -2775,18 +2775,27 @@ def autoconnect(self): '''auto connect at startup''' # dict of account that want to connect sorted by status + shows = {} for a in gajim.connections: if gajim.config.get_per('accounts', a, 'autoconnect'): - if not gajim.config.get_per('accounts', a, - 'dont_restore_last_status'): - self.roster.send_status(a, - gajim.config.get_per('accounts', - a, 'last_status'), - helpers.from_one_line( - gajim.config.get_per('accounts', - a, 'last_status_msg'))) + if gajim.config.get_per('accounts', a, 'restore_last_status'): + self.roster.send_status(a, gajim.config.get_per('accounts', a, + 'last_status'), helpers.from_one_line(gajim.config.get_per( + 'accounts', a, 'last_status_msg'))) + continue + show = gajim.config.get_per('accounts', a, 'autoconnect_as') + if not show in gajim.SHOW_LIST: + continue + if not show in shows: + shows[show] = [a] else: - self.roster.send_status(a, 'online', '') + shows[show].append(a) + for show in shows: + message = self.roster.get_status_message(show) + if message is None: + continue + for a in shows[show]: + self.roster.send_status(a, show, message) return False def show_systray(self): Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-29 06:40:09 UTC (rev 10062) +++ trunk/src/roster_window.py 2008-07-29 06:42:34 UTC (rev 10063) @@ -1936,10 +1936,8 @@ child_iterA = self._get_account_iter(account, self.model) if status != 'offline': if to is None: - gajim.config.set_per('accounts', account, - 'last_status', status) - gajim.config.set_per('accounts', account, - 'last_status_msg', + gajim.config.set_per('accounts', account, 'last_status', status) + gajim.config.set_per('accounts', account, 'last_status_msg', helpers.to_one_line(txt)) if gajim.connections[account].connected < 2: self.set_connecting_state(account)

1 0

[commit-gajim] r10062 - trunk/src/common
by asterix＠gajim.org 29 Jul '08

29 Jul '08

Author: asterix Date: 2008-07-29 08:40:09 +0200 (Tue, 29 Jul 2008) New Revision: 10062 Modified: trunk/src/common/gajim.py Log: typo Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2008-07-29 06:17:35 UTC (rev 10061) +++ trunk/src/common/gajim.py 2008-07-29 06:40:09 UTC (rev 10062) @@ -174,7 +174,7 @@ 'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE, xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED, 'msglog', 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_GAMING, - xmpp.NS_MOOD, NS_ACTIVITY, xmpp.NS_NICK] + xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK] # Optional features gajim supports per account gajim_optional_features = {}

1 0

[commit-gajim] r10061 - trunk/src/common
by asterix＠gajim.org 29 Jul '08

29 Jul '08

Author: asterix Date: 2008-07-29 08:17:35 +0200 (Tue, 29 Jul 2008) New Revision: 10061 Modified: trunk/src/common/gajim.py Log: add NS_TUNE, ACTIVITY and NICK to features list Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2008-07-29 06:15:41 UTC (rev 10060) +++ trunk/src/common/gajim.py 2008-07-29 06:17:35 UTC (rev 10061) @@ -168,15 +168,13 @@ HAVE_GPG = 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, - xmpp.NS_MUC_CONFIG, xmpp.NS_COMMANDS, - xmpp.NS_DISCO_INFO, 'ipv6', 'jabber:iq:gateway', xmpp.NS_LAST, - xmpp.NS_PRIVACY, xmpp.NS_PRIVATE, xmpp.NS_REGISTER, - xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED, - 'msglog', 'sslc2s', 'stringprep', xmpp.NS_PING, - xmpp.NS_TIME_REVISED, xmpp.NS_GAMING] +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, + xmpp.NS_MUC_CONFIG, xmpp.NS_COMMANDS, xmpp.NS_DISCO_INFO, 'ipv6', + 'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE, + xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED, 'msglog', + 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_GAMING, + xmpp.NS_MOOD, NS_ACTIVITY, xmpp.NS_NICK] # Optional features gajim supports per account gajim_optional_features = {}

1 0

[commit-gajim] r10060 - in trunk/src: . common
by asterix＠gajim.org 29 Jul '08

29 Jul '08

Author: asterix Date: 2008-07-29 08:15:41 +0200 (Tue, 29 Jul 2008) New Revision: 10060 Modified: trunk/src/common/config.py trunk/src/common/helpers.py trunk/src/common/pep.py trunk/src/roster_window.py Log: remove publish_mood, publish_activity and publish_nick options. Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-07-29 02:34:29 UTC (rev 10059) +++ trunk/src/common/config.py 2008-07-29 06:15:41 UTC (rev 10060) @@ -326,10 +326,7 @@ 'use_env_http_proxy' : [opt_bool, False], 'answer_receipts' : [opt_bool, True, _('Answer to receipt requests')], 'request_receipt' : [opt_bool, True, _('Sent receipt requests')], - 'publish_mood': [opt_bool, True], - 'publish_activity': [opt_bool, True], 'publish_tune': [opt_bool, False], - 'publish_nick': [opt_bool, True], 'subscribe_mood': [opt_bool, True], 'subscribe_activity': [opt_bool, True], 'subscribe_tune': [opt_bool, True], Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-07-29 02:34:29 UTC (rev 10059) +++ trunk/src/common/helpers.py 2008-07-29 06:15:41 UTC (rev 10060) @@ -1333,20 +1333,14 @@ accounts = [a for a in gajim.connections] for a in accounts: gajim.gajim_optional_features[a] = [] - if gajim.config.get_per('accounts', a, 'publish_mood'): - gajim.gajim_optional_features[a].append(xmpp.NS_MOOD) if gajim.config.get_per('accounts', a, 'subscribe_mood'): gajim.gajim_optional_features[a].append(xmpp.NS_MOOD + '+notify') - if gajim.config.get_per('accounts', a, 'publish_activity'): - gajim.gajim_optional_features[a].append(xmpp.NS_ACTIVITY) if gajim.config.get_per('accounts', a, 'subscribe_activity'): gajim.gajim_optional_features[a].append(xmpp.NS_ACTIVITY + '+notify') if gajim.config.get_per('accounts', a, 'publish_tune'): gajim.gajim_optional_features[a].append(xmpp.NS_TUNE) if gajim.config.get_per('accounts', a, 'subscribe_tune'): gajim.gajim_optional_features[a].append(xmpp.NS_TUNE + '+notify') - if gajim.config.get_per('accounts', a, 'publish_nick'): - gajim.gajim_optional_features[a].append(xmpp.NS_NICK) if gajim.config.get_per('accounts', a, 'subscribe_nick'): gajim.gajim_optional_features[a].append(xmpp.NS_NICK + '+notify') if gajim.config.get('outgoing_chat_state_notifactions') != 'disabled': Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-07-29 02:34:29 UTC (rev 10059) +++ trunk/src/common/pep.py 2008-07-29 06:15:41 UTC (rev 10060) @@ -371,7 +371,7 @@ contact.contact_name = '' def user_send_mood(account, mood, message = ''): - if not gajim.config.get_per('accounts', account, 'publish_mood'): + if not gajim.connections[account].pep_supported: return item = xmpp.Node('mood', {'xmlns': xmpp.NS_MOOD}) if mood != '': @@ -384,7 +384,7 @@ gajim.connections[account].send_pb_publish('', xmpp.NS_MOOD, item, '0') def user_send_activity(account, activity, subactivity = '', message = ''): - if not gajim.config.get_per('accounts', account, 'publish_activity'): + if not gajim.connections[account].pep_supported: return item = xmpp.Node('activity', {'xmlns': xmpp.NS_ACTIVITY}) if activity != '': @@ -425,8 +425,7 @@ gajim.connections[account].send_pb_publish('', xmpp.NS_TUNE, item, '0') def user_send_nickname(account, nick): - if not (gajim.config.get_per('accounts', account, 'publish_nick') and \ - gajim.connections[account].pep_supported): + if not gajim.connections[account].pep_supported: return item = xmpp.Node('nick', {'xmlns': xmpp.NS_NICK}) item.addData(nick) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-29 02:34:29 UTC (rev 10059) +++ trunk/src/roster_window.py 2008-07-29 06:15:41 UTC (rev 10060) @@ -4869,10 +4869,6 @@ pep_menuitem = xml.get_widget('pep_menuitem') if gajim.connections[account].pep_supported: - have_mood = gajim.config.get_per('accounts', account, - 'publish_mood') - have_activity = gajim.config.get_per('accounts', account, - 'publish_activity') have_tune = gajim.config.get_per('accounts', account, 'publish_tune') pep_submenu = gtk.Menu() @@ -4881,25 +4877,19 @@ pep_submenu.append(item) item.set_active(have_tune) item.connect('toggled', self.on_publish_tune_toggled, account) - if have_mood: - item = gtk.CheckMenuItem(_('Mood')) - pep_submenu.append(item) - item.set_active(len(gajim.connections[account].mood) > 0) - item.connect('activate', self.on_change_mood_activate, account) - if have_activity: - item = gtk.CheckMenuItem(_('Activity')) - pep_submenu.append(item) - item.set_active(len(gajim.connections[account].activity) > 0) - item.connect('activate', self.on_change_activity_activate, - account) + item = gtk.CheckMenuItem(_('Mood')) + pep_submenu.append(item) + item.set_active(len(gajim.connections[account].mood) > 0) + item.connect('activate', self.on_change_mood_activate, account) + item = gtk.CheckMenuItem(_('Activity')) + pep_submenu.append(item) + item.set_active(len(gajim.connections[account].activity) > 0) + item.connect('activate', self.on_change_activity_activate, account) pep_config = gtk.ImageMenuItem(_('Configure Services...')) - if have_mood or have_activity or have_tune: - item = gtk.SeparatorMenuItem() - pep_submenu.append(item) - pep_config.set_sensitive(True) - else: - pep_config.set_sensitive(False) + item = gtk.SeparatorMenuItem() + pep_submenu.append(item) + pep_config.set_sensitive(True) pep_submenu.append(pep_config) pep_config.connect('activate', self.on_pep_services_menuitem_activate, account)

1 0

← Newer
1
2
3
4
5
6
7
...
23
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 July 2008