Commits March 2007

commits@gajim.org

4 participants
62 discussions

[commit-gajim] r8060 - in trunk: data/glade src
by jim++＠gajim.org 31 Mar '07

31 Mar '07

Author: jim++ Date: 2007-03-31 15:40:23 +0200 (Sat, 31 Mar 2007) New Revision: 8060 Modified: trunk/data/glade/history_window.glade trunk/data/glade/vcard_information_window.glade trunk/src/history_window.py trunk/src/vcard.py Log: Move log_for_this_contact checkbutton from vcard dialog to history dialog. So you can NOT log some chatrooms. Fixes #2592. Modified: trunk/data/glade/history_window.glade =================================================================== --- trunk/data/glade/history_window.glade 2007-03-31 12:43:07 UTC (rev 8059) +++ trunk/data/glade/history_window.glade 2007-03-31 13:40:23 UTC (rev 8060) @@ -88,6 +88,25 @@ </child> <child> + <widget class="GtkCheckButton" id="log_history_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Log conversation history</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> <widget class="GtkExpander" id="search_expander"> <property name="visible">True</property> <property name="can_focus">True</property> Modified: trunk/data/glade/vcard_information_window.glade =================================================================== --- trunk/data/glade/vcard_information_window.glade 2007-03-31 12:43:07 UTC (rev 8059) +++ trunk/data/glade/vcard_information_window.glade 2007-03-31 13:40:23 UTC (rev 8060) @@ -433,25 +433,6 @@ </child> <child> - <widget class="GtkCheckButton" id="log_history_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Log conversation history</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> <widget class="GtkExpander" id="expander5"> <property name="visible">True</property> <property name="can_focus">True</property> Modified: trunk/src/history_window.py =================================================================== --- trunk/src/history_window.py 2007-03-31 12:43:07 UTC (rev 8059) +++ trunk/src/history_window.py 2007-03-31 13:40:23 UTC (rev 8060) @@ -126,6 +126,14 @@ self.calendar.select_month(gtk_month, y) self.calendar.select_day(d) self.add_lines_for_date(y, m, d) + + log = True + if self.jid in gajim.config.get_per('accounts', self.account, + 'no_log_for').split(' '): + log = False + checkbutton = xml.get_widget('log_history_checkbutton') + checkbutton.set_active(log) + checkbutton.connect('toggled', self.on_log_history_checkbutton_toggled) self.window.show_all() @@ -391,3 +399,20 @@ match_start_mark = self.history_buffer.create_mark('match_start', match_start_iter, True) self.history_textview.tv.scroll_to_mark(match_start_mark, 0, True) + + def on_log_history_checkbutton_toggled(self, widget): + # log conversation history? + oldlog = True + no_log_for = gajim.config.get_per('accounts', self.account, + 'no_log_for').split() + if self.jid in no_log_for: + oldlog = False + log = widget.get_active() + if not log and not self.jid in no_log_for: + no_log_for.append(self.jid) + if log and self.jid in no_log_for: + no_log_for.remove(self.jid) + if oldlog != log: + gajim.config.set_per('accounts', self.account, 'no_log_for', + ' '.join(no_log_for)) + Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2007-03-31 12:43:07 UTC (rev 8059) +++ trunk/src/vcard.py 2007-03-31 13:40:23 UTC (rev 8060) @@ -105,22 +105,6 @@ if event.keyval == gtk.keysyms.Escape: self.window.destroy() - def on_log_history_checkbutton_toggled(self, widget): - #log conversation history? - oldlog = True - no_log_for = gajim.config.get_per('accounts', self.account, - 'no_log_for').split() - if self.contact.jid in no_log_for: - oldlog = False - log = widget.get_active() - if not log and not self.contact.jid in no_log_for: - no_log_for.append(self.contact.jid) - if log and self.contact.jid in no_log_for: - no_log_for.remove(self.contact.jid) - if oldlog != log: - gajim.config.set_per('accounts', self.account, 'no_log_for', - ' '.join(no_log_for)) - def on_PHOTO_eventbox_button_press_event(self, widget, event): '''If right-clicked, show popup''' if event.button == 3: # right click @@ -298,14 +282,6 @@ tooltips.set_tip(eb, _("You are waiting contact's answer about your subscription request")) - log = True - if self.contact.jid in gajim.config.get_per('accounts', self.account, - 'no_log_for').split(' '): - log = False - checkbutton = self.xml.get_widget('log_history_checkbutton') - checkbutton.set_active(log) - checkbutton.connect('toggled', self.on_log_history_checkbutton_toggled) - resources = '%s (%s)' % (self.contact.resource, unicode( self.contact.priority)) uf_resources = self.contact.resource + _(' resource with priority ')\ @@ -385,22 +361,6 @@ if event.keyval == gtk.keysyms.Escape: self.window.destroy() - def on_log_history_checkbutton_toggled(self, widget): - #log conversation history? - oldlog = True - no_log_for = gajim.config.get_per('accounts', self.account, - 'no_log_for').split() - if self.contact.jid in no_log_for: - oldlog = False - log = widget.get_active() - if not log and not self.contact.jid in no_log_for: - no_log_for.append(self.contact.jid) - if log and self.contact.jid in no_log_for: - no_log_for.remove(self.contact.jid) - if oldlog != log: - gajim.config.set_per('accounts', self.account, 'no_log_for', - ' '.join(no_log_for)) - def on_PHOTO_eventbox_button_press_event(self, widget, event): '''If right-clicked, show popup''' if event.button == 3: # right click @@ -469,14 +429,6 @@ '</span></b>') self.xml.get_widget('local_jid_label').set_text(self.contact.jid) - log = True - if self.contact.jid in gajim.config.get_per('accounts', self.account, - 'no_log_for').split(' '): - log = False - checkbutton = self.xml.get_widget('log_history_checkbutton') - checkbutton.set_active(log) - checkbutton.connect('toggled', self.on_log_history_checkbutton_toggled) - resources = '%s (%s)' % (self.contact.resource, unicode( self.contact.priority)) uf_resources = self.contact.resource + _(' resource with priority ')\

1 0

[commit-gajim] r8059 - trunk/src
by asterix＠gajim.org 31 Mar '07

31 Mar '07

Author: asterix Date: 2007-03-31 14:43:07 +0200 (Sat, 31 Mar 2007) New Revision: 8059 Modified: trunk/src/dialogs.py Log: fix wrong var name. fixes #2750 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-03-31 12:22:38 UTC (rev 8058) +++ trunk/src/dialogs.py 2007-03-31 12:43:07 UTC (rev 8059) @@ -463,21 +463,21 @@ self.available_types = [] for acct in accounts: for j in gajim.contacts.get_jid_list(acct): - contact = gajim.contacts.get_first_contact_from_jid(acct, j) if gajim.jid_is_transport(j): - type_ = gajim.get_transport_name_from_jid(j) + type_ = gajim.get_transport_name_from_jid(j, False) if self.agents.has_key(type_): self.agents[type_].append(j) else: self.agents[type_] = [j] # Now add the one to which we can register for acct in accounts: - for type_ in gajim.connections[account].available_transports: + for type_ in gajim.connections[acct].available_transports: if type_ in self.agents: continue self.agents[type_] = [] - for jid_ in gajim.connections[account].available_transports[type_]: - self.agents[type_].append(jid_) + for jid_ in gajim.connections[acct].available_transports[type_]: + if not jid_ in self.agents[type_]: + self.agents[type_].append(jid_) self.available_types.append(type_) liststore = gtk.ListStore(str) self.group_comboboxentry.set_model(liststore)

1 0

[commit-gajim] r8058 - trunk/src
by jim++＠gajim.org 31 Mar '07

31 Mar '07

Author: jim++ Date: 2007-03-31 14:22:38 +0200 (Sat, 31 Mar 2007) New Revision: 8058 Modified: trunk/src/gajim.py Log: re-add r' Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-03-31 12:21:53 UTC (rev 8057) +++ trunk/src/gajim.py 2007-03-31 12:22:38 UTC (rev 8058) @@ -1753,8 +1753,8 @@ # \S*[^\s\W] --> in the matching string don't match ? or ) etc.. if at the end # so http://be) will match http://be and http://be)be) will match http://be)be - prefixes = '|'.join(('http://', 'https://', 'gopher://', 'news://', - 'ftp://', 'ed2k://', 'irc://', 'magnet:', 'sip:', r'www\.', + prefixes = '|'.join((r'http://', r'https://', r'gopher://', r'news://', + r'ftp://', r'ed2k://', r'irc://', r'magnet:', r'sip:', r'www\.', r'ftp\.')) # NOTE: it's ok to catch www.gr such stuff exist!

1 0

[commit-gajim] r8057 - trunk/src
by jim++＠gajim.org 31 Mar '07

31 Mar '07

Author: jim++ Date: 2007-03-31 14:21:53 +0200 (Sat, 31 Mar 2007) New Revision: 8057 Modified: trunk/src/chat_control.py Log: Stop asking for xep85 (chat notifs) many times, xep says ask only one. Can break notifs with gajim 0.10.1 or less. Fixes #2711. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-03-31 12:12:12 UTC (rev 8056) +++ trunk/src/chat_control.py 2007-03-31 12:21:53 UTC (rev 8057) @@ -1153,13 +1153,9 @@ # because we want it sent with REAL message # (not standlone) eg. one that has body - #FIXME: - # Enable 3 next lines after 0.11 release. - # Having this disabled violate xep85 5.1.2 but then we don't break - # notifications between 0.10.1 and 0.11 See #2637 - # if contact.our_chatstate: - # # We already ask for xep 85, don't ask it twice - # composing_jep = 'asked_once' + if contact.our_chatstate: + # We already asked for xep 85, don't ask it twice + composing_jep = 'asked_once' chatstate_to_send = 'active' contact.our_chatstate = 'ask' # pseudo state

1 0

[commit-gajim] r8056 - trunk/src
by asterix＠gajim.org 31 Mar '07

31 Mar '07

Author: asterix Date: 2007-03-31 14:12:12 +0200 (Sat, 31 Mar 2007) New Revision: 8056 Modified: trunk/src/roster_window.py Log: add missing argument to remove_tab call. fixes a TB Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-03-31 12:07:40 UTC (rev 8055) +++ trunk/src/roster_window.py 2007-03-31 12:12:12 UTC (rev 8056) @@ -3278,7 +3278,8 @@ ''' self.close_all_from_dict(gajim.interface.instances[account]) for ctrl in gajim.interface.msg_win_mgr.get_controls(acct = account): - ctrl.parent_win.remove_tab(ctrl, force = force) + ctrl.parent_win.remove_tab(ctrl, ctrl.parent_win.CLOSE_CLOSE_BUTTON, + force = force) def on_roster_window_delete_event(self, widget, event): '''When we want to close the window'''

1 0

[commit-gajim] r8055 - trunk/src
by jim++＠gajim.org 31 Mar '07

31 Mar '07

Author: jim++ Date: 2007-03-31 14:07:40 +0200 (Sat, 31 Mar 2007) New Revision: 8055 Modified: trunk/src/gajim.py Log: [bb]Better string manipulation Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-03-31 09:40:13 UTC (rev 8054) +++ trunk/src/gajim.py 2007-03-31 12:07:40 UTC (rev 8055) @@ -1753,20 +1753,14 @@ # \S*[^\s\W] --> in the matching string don't match ? or ) etc.. if at the end # so http://be) will match http://be and http://be)be) will match http://be)be - prefixes = (r'http://', r'https://', r'gopher://', r'news://', r'ftp://', - r'ed2k://', r'irc://', r'magnet:', r'sip:', r'www\.', r'ftp\.') + prefixes = '|'.join(('http://', 'https://', 'gopher://', 'news://', + 'ftp://', 'ed2k://', 'irc://', 'magnet:', 'sip:', r'www\.', + r'ftp\.')) # NOTE: it's ok to catch www.gr such stuff exist! #FIXME: recognize xmpp: and treat it specially - prefix_pattern = '' - for prefix in prefixes: - prefix_pattern += prefix + '|' - - prefix_pattern = prefix_pattern[:-1] # remove last | - prefix_pattern = '(' + prefix_pattern + ')' - - links = r'\b' + prefix_pattern + r'\S*[\w\/\=]|' + links = r'\b(%s)\S*[\w\/\=]|' % prefixes #2nd one: at_least_one_char(a)at_least_one_char.at_least_one_char mail = r'\bmailto:\S*[^\s\W]|' r'\b\S+(a)\S+\.\S*[^\s\W]'

1 0

[commit-gajim] r8054 - trunk/src
by asterix＠gajim.org 31 Mar '07

31 Mar '07

Author: asterix Date: 2007-03-31 11:40:13 +0200 (Sat, 31 Mar 2007) New Revision: 8054 Modified: trunk/src/tooltips.py Log: wrap lines in roster tooltip. so we can increase width of status to 300 chars width. fixes #2966 Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2007-03-31 09:09:16 UTC (rev 8053) +++ trunk/src/tooltips.py 2007-03-31 09:40:13 UTC (rev 8054) @@ -482,8 +482,9 @@ status = contact.status.strip() if status: # reduce long status - # (no more than 100 chars on line and no more than 5 lines) - status = helpers.reduce_chars_newlines(status, 100, 5) + # (no more than 300 chars on line and no more than 5 lines) + # status is wrapped + status = helpers.reduce_chars_newlines(status, 300, 5) # escape markup entities. status = gobject.markup_escape_text(status) properties.append(('<i>%s</i>' % status, None)) @@ -534,6 +535,7 @@ else: if isinstance(property[0], (unicode, str)): #FIXME: rm unicode? label.set_markup(property[0]) + label.set_line_wrap(True) else: label = property[0] vcard_table.attach(label, 1, 3, vcard_current_row,

1 0

[commit-gajim] r8053 - in branches/pep: data/glade src src/common
by doomhammer＠gajim.org 31 Mar '07

31 Mar '07

Author: doomhammer Date: 2007-03-31 11:09:16 +0200 (Sat, 31 Mar 2007) New Revision: 8053 Added: branches/pep/data/glade/change_activity_dialog.glade Modified: branches/pep/src/common/pep.py branches/pep/src/dialogs.py branches/pep/src/roster_window.py Log: Activity setting from a dialog once again Added: branches/pep/data/glade/change_activity_dialog.glade =================================================================== --- branches/pep/data/glade/change_activity_dialog.glade (rev 0) +++ branches/pep/data/glade/change_activity_dialog.glade 2007-03-31 09:09:16 UTC (rev 8053) @@ -0,0 +1,158 @@ +<?xml version="1.0" standalone="no"?>  +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkDialog" id="change_activity_dialog"> + <property name="border_width">6</property> + <property name="title" translatable="yes"></property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_NONE</property> + <property name="modal">False</property> + <property name="default_width">270</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + <property name="has_separator">True</property> + <signal name="key_press_event" handler="on_change_status_message_dialog_key_press_event" last_modification_time="Wed, 16 Mar 2005 00:53:06 GMT"/> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox5"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="cancel_button"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-6</property> + <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Sat, 31 Mar 2007 07:58:52 GMT"/> + </widget> + </child> + + <child> + <widget class="GtkButton" id="ok_button"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-ok</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-5</property> + <signal name="clicked" handler="on_ok_button_clicked" last_modification_time="Sat, 31 Mar 2007 07:57:55 GMT"/> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkFrame" id="frame38"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment107"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkVBox" id="vbox112"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkComboBox" id="combobox1"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="combobox2"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">●</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> Modified: branches/pep/src/common/pep.py =================================================================== --- branches/pep/src/common/pep.py 2007-03-31 08:47:42 UTC (rev 8052) +++ branches/pep/src/common/pep.py 2007-03-31 09:09:16 UTC (rev 8053) @@ -52,3 +52,14 @@ i.addData(message) gajim.connections[account].send_pb_publish('', xmpp.NS_MOOD, item, '0') + +def user_send_activity(account, activity, subactivity = '', message = ''): + item = xmpp.Node('activity', {'xmlns': xmpp.NS_ACTIVITY}) + i = item.addChild(activity) + if subactivity != '': + i.addChild(subactivity) + if message != '': + i = item.addChild('text') + i.addData(message) + + gajim.connections[account].send_pb_publish('', xmpp.NS_ACTIVITY, item, '0') Modified: branches/pep/src/dialogs.py =================================================================== --- branches/pep/src/dialogs.py 2007-03-31 08:47:42 UTC (rev 8052) +++ branches/pep/src/dialogs.py 2007-03-31 09:09:16 UTC (rev 8053) @@ -307,6 +307,86 @@ self.keys_treeview.set_cursor(path) +class ChangeActivityDialog: + activities = [_('doing_chores'), _('drinking'), _('eating'), + _('excercising'), _('grooming'), _('having_appointment'), + _('inactive'), _('relaxing'), _('talking'), _('traveling'), + _('working'), ] + subactivities = [_('at_the_spa'), _('brushing_teeth'), + _('buying_groceries'), _('cleaning'), _('coding'), + _('commuting'), _('cooking'), _('cycling'), _('day_off'), + _('doing_maintenance'), _('doing_the_dishes'), + _('doing_the_laundry'), _('driving'), _('gaming'), + _('gardening'), _('getting_a_haircut'), _('going_out'), + _('hanging_out'), _('having_a_beer'), _('having_a_snack'), + _('having_breakfast'), _('having_coffee'), + _('having_dinner'), _('having_lunch'), _('having_tea'), + _('hiking'), _('in_a_car'), _('in_a_meeting'), + _('in_real_life'), _('jogging'), _('on_a_bus'), + _('on_a_plane'), _('on_a_train'), _('on_a_trip'), + _('on_the_phone'), _('on_vacation'), _('other'), + _('partying'), _('playing_sports'), _('reading'), + _('rehearsing'), _('running'), _('running_an_errand'), + _('scheduled_holiday'), _('shaving'), _('shopping'), + _('skiing'), _('sleeping'), _('socializing'), + _('studying'), _('sunbathing'), _('swimming'), + _('taking_a_bath'), _('taking_a_shower'), _('walking'), + _('walking_the_dog'), _('watching_tv'), + _('watching_a_movie'), _('working_out'), _('writing'), ] + def __init__(self, account): + self.account = account + self.xml = gtkgui_helpers.get_glade('change_activity_dialog.glade') + self.window = self.xml.get_widget('change_activity_dialog') + self.window.set_transient_for(gajim.interface.roster.window) + self.window.set_title(_('Activity')) + + self.entry = self.xml.get_widget('entry') + + self.combo1 = self.xml.get_widget('combobox1') + self.liststore1 = gtk.ListStore(str) + self.combo1.set_model(self.liststore1) + + for activity in self.activities: + self.liststore1.append((activity,)) + + cellrenderertext = gtk.CellRendererText() + self.combo1.pack_start(cellrenderertext, True) + self.combo1.add_attribute(cellrenderertext, 'text', 0) + + self.combo2 = self.xml.get_widget('combobox2') + self.liststore2 = gtk.ListStore(str) + self.combo2.set_model(self.liststore2) + + for subactivity in self.subactivities: + self.liststore2.append((subactivity,)) + + cellrenderertext = gtk.CellRendererText() + self.combo2.pack_start(cellrenderertext, True) + self.combo2.add_attribute(cellrenderertext, 'text', 0) + + self.xml.signal_autoconnect(self) + self.window.show_all() + + def on_ok_button_clicked(self, widget): + '''Return activity and messsage (None if no activity selected)''' + activity = None + subactivity = None + message = None + active1 = self.combo1.get_active() + active2 = self.combo2.get_active() + if active1 > -1: + activity = self.liststore1[active1][0].decode('utf-8') + if active2 > -1: + subactivity = self.liststore2[active2][0].decode('utf-8') + message = self.entry.get_text().decode('utf-8') + from common import pep + pep.user_send_activity(self.account, activity, + subactivity, message) + self.window.destroy() + + def on_cancel_button_clicked(self, widget): + self.window.destroy() + class ChangeMoodDialog: moods = [_('afraid'), _('amazed'), _('angry'), _('annoyed'), _('anxious'), _('aroused'), _('ashamed'), _('bored'), _('brave'), _('calm'), _('cold'), _('confused'), _('contented'), _('cranky'), _('curious'), _('depressed'), _('disappointed'), _('disgusted'), _('distracted'), _('embarrassed'), _('excited'), _('flirtatious'), _('frustrated'), _('grumpy'), _('guilty'), _('happy'), _('hot'), _('humbled'), _('humiliated'), _('hungry'), _('hurt'), _('impressed'), _('in_awe'), _('in_love'), _('indignant'), _('interested'), _('intoxicated'), _('invincible'), _('jealous'), _('lonely'), _('mean'), _('moody'), _('nervous'), _('neutral'), _('offended'), _('playful'), _('proud'), _('relieved'), _('remorseful'), _('restless'), _('sad'), _('sarcastic'), _('serious'), _('shocked'), _('shy'), _('sick'), _('sleepy'), _('stressed'), _('surprised'), _('thirsty'), _('worried')] def __init__(self, account): Modified: branches/pep/src/roster_window.py =================================================================== --- branches/pep/src/roster_window.py 2007-03-31 08:47:42 UTC (rev 8052) +++ branches/pep/src/roster_window.py 2007-03-31 09:09:16 UTC (rev 8053) @@ -2268,6 +2268,9 @@ gajim.config.get_per('accounts', account, 'name')) helpers.launch_browser_mailer('url', url) + def on_change_activity_activate(self, widget, account): + dlg = dialogs.ChangeActivityDialog(account) + def on_change_mood_activate(self, widget, account): dlg = dialogs.ChangeMoodDialog(account) @@ -2340,6 +2343,9 @@ item = gtk.MenuItem('Mood') pep_submenu.append(item) item.connect('activate', self.on_change_mood_activate, account) + item = gtk.MenuItem('Activity') + pep_submenu.append(item) + item.connect('activate', self.on_change_activity_activate, account) else: pep_menuitem.set_no_show_all(True) pep_menuitem.hide()

1 0

[commit-gajim] r8052 - trunk/src
by asterix＠gajim.org 31 Mar '07

31 Mar '07

Author: asterix Date: 2007-03-31 10:47:42 +0200 (Sat, 31 Mar 2007) New Revision: 8052 Modified: trunk/src/groupchat_control.py Log: request vcard to full jid if we know it. fixes #3054 Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-03-31 08:22:48 UTC (rev 8051) +++ trunk/src/groupchat_control.py 2007-03-31 08:47:42 UTC (rev 8052) @@ -1950,6 +1950,9 @@ '''Call vcard_information_window class to display user's information''' c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) c2 = gajim.contacts.contact_from_gc_contact(c) + if c.jid: + c2.jid = c.jid + c2.resource = c.resource if gajim.interface.instances[self.account]['infos'].has_key(c2.jid): gajim.interface.instances[self.account]['infos'][c2.jid].window.\ present()

1 0

[commit-gajim] r8051 - branches/pep/src
by asterix＠gajim.org 31 Mar '07

31 Mar '07

Author: asterix Date: 2007-03-31 10:22:48 +0200 (Sat, 31 Mar 2007) New Revision: 8051 Modified: branches/pep/src/roster_window.py Log: remove useless commented lines Modified: branches/pep/src/roster_window.py =================================================================== --- branches/pep/src/roster_window.py 2007-03-31 08:16:58 UTC (rev 8050) +++ branches/pep/src/roster_window.py 2007-03-31 08:22:48 UTC (rev 8051) @@ -2270,9 +2270,6 @@ def on_change_mood_activate(self, widget, account): dlg = dialogs.ChangeMoodDialog(account) -# (mood, message) = dlg.run() -# if mood is not None: # None is if user pressed Cancel -# self.send_mood(account, mood, message) def on_change_status_message_activate(self, widget, account): show = gajim.SHOW_LIST[gajim.connections[account].connected]

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2007