Commits February 2008

commits@gajim.org

5 participants
62 discussions

[commit-gajim] r9327 - in trunk/src: . common/zeroconf
by asterix＠gajim.org 14 Feb '08

14 Feb '08

Author: asterix Date: 2008-02-14 20:18:07 +0100 (Thu, 14 Feb 2008) New Revision: 9327 Modified: trunk/src/chat_control.py trunk/src/common/zeroconf/connection_zeroconf.py trunk/src/dialogs.py trunk/src/disco.py trunk/src/gajim.py trunk/src/music_track_listener.py trunk/src/profile_window.py trunk/src/roster_window.py Log: use timeout_add_seconds instead of timeout_add (when it's available), more efficient. fixes #3734, #3736 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-02-14 02:20:07 UTC (rev 9326) +++ trunk/src/chat_control.py 2008-02-14 19:18:07 UTC (rev 9327) @@ -1134,9 +1134,9 @@ self.mouse_over_in_last_30_secs = True def _schedule_activity_timers(self): - self.possible_paused_timeout_id = gobject.timeout_add(5000, + self.possible_paused_timeout_id = gobject.timeout_add_seconds(5, self.check_for_possible_paused_chatstate, None) - self.possible_inactive_timeout_id = gobject.timeout_add(30000, + self.possible_inactive_timeout_id = gobject.timeout_add_seconds(30, self.check_for_possible_inactive_chatstate, None) def update_ui(self): Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2008-02-14 02:20:07 UTC (rev 9326) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2008-02-14 19:18:07 UTC (rev 9327) @@ -277,7 +277,7 @@ # refresh all contacts data every five seconds self.call_resolve_timeout = True - gobject.timeout_add(5000, self._on_resolve_timeout) + gobject.timeout_add_seconds(5, self._on_resolve_timeout) return True def disconnect(self, on_purpose = False): Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-02-14 02:20:07 UTC (rev 9326) +++ trunk/src/dialogs.py 2008-02-14 19:18:07 UTC (rev 9327) @@ -1942,8 +1942,8 @@ xml.signal_autoconnect(self) self.window.show_all() - timeout = gajim.config.get('notification_timeout') * 1000 # make it ms - gobject.timeout_add(timeout, self.on_timeout) + timeout = gajim.config.get('notification_timeout') + gobject.timeout_add_seconds(timeout, self.on_timeout) def on_close_button_clicked(self, widget): self.adjust_height_and_move_popup_notification_windows() Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2008-02-14 02:20:07 UTC (rev 9326) +++ trunk/src/disco.py 2008-02-14 19:18:07 UTC (rev 9327) @@ -152,7 +152,7 @@ if item.source: gobject.source_remove(item.source) if self.lifetime: - source = gobject.timeout_add(self.lifetime, self._expire_timeout, key) + source = gobject.timeout_add_seconds(self.lifetime/1000, self._expire_timeout, key) item.source = source def __getitem__(self, key): @@ -1364,12 +1364,12 @@ fraction = float(self._progress) / float(self._total_items) if self._progress >= self._total_items: # We show the progressbar for just a bit before hiding it. - id = gobject.timeout_add(1500, self._hide_progressbar_cb) + id = gobject.timeout_add_seconds(2, self._hide_progressbar_cb) self._progressbar_sourceid = id else: self.window.progressbar.show() # Hide the progressbar if we're timing out anyways. (20 secs) - id = gobject.timeout_add(20000, self._hide_progressbar_cb) + id = gobject.timeout_add_seconds(20, self._hide_progressbar_cb) self._progressbar_sourceid = id self.window.progressbar.set_fraction(fraction) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-02-14 02:20:07 UTC (rev 9326) +++ trunk/src/gajim.py 2008-02-14 19:18:07 UTC (rev 9327) @@ -218,6 +218,10 @@ del path import gobject +if not hasattr(gobject, 'timeout_add_seconds'): + def timeout_add_seconds_fake(time_sec, *args): + return gobject.timeout_add(time_sec * 1000, *args) + gobject.timeout_add_seconds = timeout_add_seconds_fake import re import signal @@ -533,7 +537,7 @@ # we stop blocking notifications of any kind # this prevents from getting the roster items as 'just signed in' # contacts. 30 seconds should be enough time - gobject.timeout_add(30000, self.unblock_signed_in_notifications, account) + gobject.timeout_add_seconds(30, self.unblock_signed_in_notifications, account) # sensitivity for this menuitem model[self.roster.status_message_menuitem_iter][3] = True @@ -648,7 +652,7 @@ gajim.newly_added[account].append(contact1.jid) if contact1.jid in gajim.to_be_removed[account]: gajim.to_be_removed[account].remove(contact1.jid) - gobject.timeout_add(5000, self.roster.remove_newly_added, + gobject.timeout_add_seconds(5, self.roster.remove_newly_added, contact1.jid, account) elif old_show > 1 and new_show == 0 and gajim.connections[account].\ connected > 1: @@ -657,7 +661,7 @@ if contact1.jid in gajim.newly_added[account]: gajim.newly_added[account].remove(contact1.jid) self.roster.draw_contact(contact1.jid, account) - gobject.timeout_add(5000, self.roster.really_remove_contact, + gobject.timeout_add_seconds(5, self.roster.really_remove_contact, contact1, account) contact1.show = array[1] contact1.status = status_message @@ -684,7 +688,7 @@ # for 30s account_ji = account + '/' + ji gajim.block_signed_in_notifications[account_ji] = True - gobject.timeout_add(30000, self.unblock_signed_in_notifications, + gobject.timeout_add_seconds(30, self.unblock_signed_in_notifications, account_ji) locations = (self.instances, self.instances[account]) for location in locations: @@ -2948,8 +2952,8 @@ if os.name == 'nt': gobject.timeout_add(200, self.process_connections) else: - gobject.timeout_add(2000, self.process_connections) - gobject.timeout_add(10000, self.read_sleepy) + gobject.timeout_add_seconds(2, self.process_connections) + gobject.timeout_add_seconds(10, self.read_sleepy) if __name__ == '__main__': def sigint_cb(num, stack): Modified: trunk/src/music_track_listener.py =================================================================== --- trunk/src/music_track_listener.py 2008-02-14 02:20:07 UTC (rev 9326) +++ trunk/src/music_track_listener.py 2008-02-14 19:18:07 UTC (rev 9327) @@ -87,13 +87,13 @@ self.current_banshee_title = '' self.banshee_paused_before = False self.banshee_is_here = False - gobject.timeout_add(10000, self._check_if_banshee_bus) + gobject.timeout_add_seconds(10, self._check_if_banshee_bus) if self.dubus_methods.NameHasOwner('org.gnome.Banshee'): self._get_banshee_bus() self.banshee_is_here = True # Otherwise, it opens Banshee! self.banshee_props ={} - gobject.timeout_add(1000, self._banshee_check_track_status) + gobject.timeout_add_seconds(1, self._banshee_check_track_status) def _check_if_banshee_bus(self): if self.dubus_methods.NameHasOwner('org.gnome.Banshee'): Modified: trunk/src/profile_window.py =================================================================== --- trunk/src/profile_window.py 2008-02-14 02:20:07 UTC (rev 9326) +++ trunk/src/profile_window.py 2008-02-14 19:18:07 UTC (rev 9327) @@ -248,7 +248,7 @@ self.statusbar.remove(self.context_id, self.message_id) self.message_id = self.statusbar.push(self.context_id, _('Information received')) - self.remove_statusbar_timeout_id = gobject.timeout_add(3000, + self.remove_statusbar_timeout_id = gobject.timeout_add_seconds(3, self.remove_statusbar, self.message_id) gobject.source_remove(self.update_progressbar_timeout_id) self.progressbar.hide() @@ -344,7 +344,7 @@ self.statusbar.remove(self.context_id, self.message_id) self.message_id = self.statusbar.push(self.context_id, _('Information NOT published')) - self.remove_statusbar_timeout_id = gobject.timeout_add(3000, + self.remove_statusbar_timeout_id = gobject.timeout_add_seconds(3, self.remove_statusbar, self.message_id) if self.update_progressbar_timeout_id is not None: gobject.source_remove(self.update_progressbar_timeout_id) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-02-14 02:20:07 UTC (rev 9326) +++ trunk/src/roster_window.py 2008-02-14 19:18:07 UTC (rev 9327) @@ -5620,10 +5620,10 @@ ## accounts has no effect until they are connected. st = gajim.config.get('set_status_msg_from_current_music_track') if st: - gobject.timeout_add(1000, + gobject.timeout_add_seconds(1, self.enable_syncing_status_msg_from_current_music_track, st) else: - gobject.timeout_add(1000, + gobject.timeout_add_seconds(1, self.enable_syncing_status_msg_from_lastfm, gajim.config.get('set_status_msg_from_lastfm'))

1 0

[commit-gajim] r9326 - in branches/session_centric: data/glade src src/common
by bct＠gajim.org 14 Feb '08

14 Feb '08

Author: bct Date: 2008-02-14 03:20:07 +0100 (Thu, 14 Feb 2008) New Revision: 9326 Modified: branches/session_centric/data/glade/preferences_window.glade branches/session_centric/src/chat_control.py branches/session_centric/src/common/config.py branches/session_centric/src/common/connection.py branches/session_centric/src/common/connection_handlers.py branches/session_centric/src/config.py branches/session_centric/src/dialogs.py branches/session_centric/src/features_window.py branches/session_centric/src/gajim-remote.py branches/session_centric/src/gajim.py branches/session_centric/src/groupchat_control.py branches/session_centric/src/message_window.py branches/session_centric/src/roster_window.py Log: merged trunk Modified: branches/session_centric/data/glade/preferences_window.glade =================================================================== --- branches/session_centric/data/glade/preferences_window.glade 2008-02-13 18:03:29 UTC (rev 9325) +++ branches/session_centric/data/glade/preferences_window.glade 2008-02-14 02:20:07 UTC (rev 9326) @@ -130,55 +130,44 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkComboBox" id="one_window_type_combobox"> - <property name="width_request">50</property> + <widget class="GtkLabel" id="label379"> <property name="visible">True</property> - <property name="items" translatable="yes">Detached roster with detached chats -Detached roster with single chat -Single window for everything -Detached roster with chat grouped by account -Detached roster with chat grouped by type</property> - <signal name="changed" handler="on_one_window_type_combo_changed"/> + <property name="xalign">0</property> + <property name="xpad">1</property> + <property name="label" translatable="yes">_Window behavior:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">one_window_type_combobox</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="speller_checkbutton"> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property> - <property name="label" translatable="yes">_Highlight misspelled words</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_speller_checkbutton_toggled"/> + <widget class="GtkComboBox" id="emoticons_combobox"> + <property name="visible">True</property> + <signal name="changed" handler="on_emoticons_combobox_changed"/> </widget> <packing> + <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="xhtml_checkbutton"> + <widget class="GtkEventBox" id="eventbox5"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> - <property name="label" translatable="yes">Ignore rich content in incoming messages</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/> + <property name="tooltip" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property> + <child> + <widget class="GtkLabel" id="label381"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xpad">1</property> + <property name="label" translatable="yes">Emoticons:</property> + </widget> + </child> </widget> <packing> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -200,45 +189,56 @@ </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox5"> + <widget class="GtkCheckButton" id="xhtml_checkbutton"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property> - <child> - <widget class="GtkLabel" id="label381"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">1</property> - <property name="label" translatable="yes">Emoticons:</property> - </widget> - </child> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> + <property name="label" translatable="yes">Ignore rich content in incoming messages</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/> </widget> <packing> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="emoticons_combobox"> - <property name="visible">True</property> - <signal name="changed" handler="on_emoticons_combobox_changed"/> + <widget class="GtkCheckButton" id="speller_checkbutton"> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property> + <property name="label" translatable="yes">_Highlight misspelled words</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_speller_checkbutton_toggled"/> </widget> <packing> - <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label379"> + <widget class="GtkComboBox" id="one_window_type_combobox"> + <property name="width_request">50</property> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">1</property> - <property name="label" translatable="yes">_Window behavior:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">one_window_type_combobox</property> + <property name="items" translatable="yes">Detached roster with detached chats +Detached roster with single chat +Single window for everything +Detached roster with chat grouped by account +Detached roster with chat grouped by type</property> + <signal name="changed" handler="on_one_window_type_combo_changed"/> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> </packing> </child> </widget> @@ -478,51 +478,17 @@ <property name="visible">True</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox2946"> + <widget class="GtkCheckButton" id="play_sounds_checkbutton"> <property name="visible">True</property> - <property name="spacing">6</property> - <property name="homogeneous">True</property> - <child> - <widget class="GtkCheckButton" id="play_sounds_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Play _sounds</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_play_sounds_checkbutton_toggled"/> - </widget> - </child> - <child> - <widget class="GtkHBox" id="soundplayer_hbox"> - <property name="spacing">5</property> - <child> - <widget class="GtkLabel" id="label189"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Player:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">soundplayer_entry</property> - </widget> - </child> - <child> - <widget class="GtkEntry" id="soundplayer_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_soundplayer_entry_changed"/> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Play _sounds</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_play_sounds_checkbutton_toggled"/> </widget> <packing> <property name="expand">False</property> - <property name="fill">False</property> </packing> </child> <child> @@ -657,7 +623,7 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkComboBox" id="outgoing_chat_states_combobox"> + <widget class="GtkComboBox" id="displayed_chat_states_combobox"> <property name="visible">True</property> <property name="items" translatable="yes">All chat states Composing only @@ -666,46 +632,48 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox9"> + <widget class="GtkEventBox" id="eventbox8"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.</property> + <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows.</property> <child> - <widget class="GtkLabel" id="label34"> + <widget class="GtkLabel" id="label33"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Send chat state notifications:</property> + <property name="label" translatable="yes">_Display chat state notifications:</property> <property name="use_underline">True</property> </widget> </child> </widget> <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox8"> + <widget class="GtkEventBox" id="eventbox9"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows.</property> + <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.</property> <child> - <widget class="GtkLabel" id="label33"> + <widget class="GtkLabel" id="label34"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Display chat state notifications:</property> + <property name="label" translatable="yes">_Send chat state notifications:</property> <property name="use_underline">True</property> </widget> </child> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="displayed_chat_states_combobox"> + <widget class="GtkComboBox" id="outgoing_chat_states_combobox"> <property name="visible">True</property> <property name="items" translatable="yes">All chat states Composing only @@ -714,8 +682,6 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> </packing> </child> </widget> @@ -759,67 +725,57 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label47"> + <widget class="GtkCheckButton" id="subscribe_mood_checkbutton"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">1</property> - <property name="label" translatable="yes">Allow others to see your:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">one_window_type_combobox</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkCheckButton" id="subscribe_tune_checkbutton"> - <property name="visible">True</property> <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="label" translatable="yes">Tune</property> + <property name="label" translatable="yes">Mood</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_subscribe_tune_checkbutton_toggled"/> + <signal name="toggled" handler="on_subscribe_mood_checkbutton_toggled"/> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label43"> + <widget class="GtkCheckButton" id="subscribe_activity_checkbutton"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">1</property> - <property name="label" translatable="yes">Receive your contact's:</property> + <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="label" translatable="yes">Activity</property> <property name="use_underline">True</property> - <property name="wrap">True</property> - <property name="mnemonic_widget">one_window_type_combobox</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_subscribe_activity_checkbutton_toggled"/> </widget> <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="publish_tune_checkbutton"> + <widget class="GtkCheckButton" id="publish_mood_checkbutton"> <property name="visible">True</property> <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="label" translatable="yes">Tune</property> + <property name="label" translatable="yes">Mood</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_publish_tune_checkbutton_toggled"/> + <signal name="toggled" handler="on_publish_mood_checkbutton_toggled"/> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -841,60 +797,70 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="publish_mood_checkbutton"> + <widget class="GtkCheckButton" id="publish_tune_checkbutton"> <property name="visible">True</property> <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="label" translatable="yes">Mood</property> + <property name="label" translatable="yes">Tune</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_publish_mood_checkbutton_toggled"/> + <signal name="toggled" handler="on_publish_tune_checkbutton_toggled"/> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="subscribe_activity_checkbutton"> + <widget class="GtkLabel" id="label43"> <property name="visible">True</property> - <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="label" translatable="yes">Activity</property> + <property name="xalign">0</property> + <property name="xpad">1</property> + <property name="label" translatable="yes">Receive your contact's:</property> <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_subscribe_activity_checkbutton_toggled"/> + <property name="wrap">True</property> + <property name="mnemonic_widget">one_window_type_combobox</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="subscribe_mood_checkbutton"> + <widget class="GtkCheckButton" id="subscribe_tune_checkbutton"> <property name="visible">True</property> <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="label" translatable="yes">Mood</property> + <property name="label" translatable="yes">Tune</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_subscribe_mood_checkbutton_toggled"/> + <signal name="toggled" handler="on_subscribe_tune_checkbutton_toggled"/> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> + <child> + <widget class="GtkLabel" id="label47"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xpad">1</property> + <property name="label" translatable="yes">Allow others to see your:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">one_window_type_combobox</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + </packing> + </child> </widget> </child> </widget> @@ -957,56 +923,65 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="auto_xa_message_entry"> + <widget class="GtkCheckButton" id="auto_away_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message</property> - <signal name="changed" handler="on_auto_xa_message_entry_changed"/> + <property name="tooltip" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property> + <property name="label" translatable="yes">_Away after:</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="auto_xa_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property> + <property name="label" translatable="yes">_Not available after:</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/> + </widget> + <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="auto_away_message_entry"> + <widget class="GtkLabel" id="label77"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message</property> - <signal name="changed" handler="on_auto_away_message_entry_changed"/> + <property name="xalign">0</property> + <property name="label" translatable="yes">minutes</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment34"> + <widget class="GtkLabel" id="label78"> <property name="visible">True</property> - <property name="xalign">1</property> - <property name="xscale">0</property> - <child> - <widget class="GtkSpinButton" id="auto_xa_time_spinbutton"> - <property name="width_request">50</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">20 1 1440 1 10 10</property> - <property name="climb_rate">1</property> - <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/> - </widget> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">minutes</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> @@ -1033,67 +1008,58 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label78"> + <widget class="GtkAlignment" id="alignment34"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">minutes</property> + <property name="xalign">1</property> + <property name="xscale">0</property> + <child> + <widget class="GtkSpinButton" id="auto_xa_time_spinbutton"> + <property name="width_request">50</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">20 1 1440 1 10 10</property> + <property name="climb_rate">1</property> + <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/> + </widget> + </child> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label77"> + <widget class="GtkEntry" id="auto_away_message_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">minutes</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message</property> + <signal name="changed" handler="on_auto_away_message_entry_changed"/> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkCheckButton" id="auto_xa_checkbutton"> + <widget class="GtkEntry" id="auto_xa_message_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property> - <property name="label" translatable="yes">_Not available after:</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/> + <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message</property> + <signal name="changed" handler="on_auto_xa_message_entry_changed"/> </widget> <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> - <child> - <widget class="GtkCheckButton" id="auto_away_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property> - <property name="label" translatable="yes">_Away after:</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> </widget> </child> </widget> @@ -1251,24 +1217,40 @@ <placeholder/> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow23"> + <widget class="GtkVButtonBox" id="vbuttonbox3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="spacing">5</property> + <property name="layout_style">GTK_BUTTONBOX_START</property> <child> - <widget class="GtkTextView" id="msg_textview"> + <widget class="GtkButton" id="new_msg_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">3</property> - <property name="wrap_mode">GTK_WRAP_WORD</property> + <property name="can_default">True</property> + <property name="label">gtk-new</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_new_msg_button_clicked"/> </widget> </child> + <child> + <widget class="GtkButton" id="delete_msg_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="label">gtk-delete</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_delete_msg_button_clicked"/> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -1291,40 +1273,24 @@ </widget> </child> <child> - <widget class="GtkVButtonBox" id="vbuttonbox3"> + <widget class="GtkScrolledWindow" id="scrolledwindow23"> <property name="visible">True</property> - <property name="spacing">5</property> - <property name="layout_style">GTK_BUTTONBOX_START</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkButton" id="new_msg_button"> + <widget class="GtkTextView" id="msg_textview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label">gtk-new</property> - <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_new_msg_button_clicked"/> + <property name="border_width">3</property> + <property name="wrap_mode">GTK_WRAP_WORD</property> </widget> </child> - <child> - <widget class="GtkButton" id="delete_msg_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label">gtk-delete</property> - <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_delete_msg_button_clicked"/> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -1390,14 +1356,14 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="label4"> + <widget class="GtkFontButton" id="conversation_fontbutton"> <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">Chat message:</property> + <property name="can_focus">True</property> + <property name="response_id">0</property> </widget> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> </packing> </child> <child> @@ -1418,14 +1384,14 @@ </packing> </child> <child> - <widget class="GtkFontButton" id="conversation_fontbutton"> + <widget class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="response_id">0</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">Chat message:</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> </widget> @@ -1475,43 +1441,35 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="label249"> + <widget class="GtkCheckButton" id="transports_iconsets_checkbutton"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">T_heme:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">theme_combobox</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkButton" id="manage_theme_button"> - <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Configure color and font of the interface</property> - <property name="label" translatable="yes">Ma_nage...</property> + <property name="tooltip" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> + <property name="label" translatable="yes">Use _transports icons</property> <property name="use_underline">True</property> <property name="response_id">0</property> - <signal name="clicked" handler="on_manage_theme_button_clicked"/> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/> </widget> <packing> - <property name="left_attach">2</property> + <property name="left_attach">1</property> <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkComboBox" id="theme_combobox"> + <widget class="GtkComboBox" id="iconset_combobox"> <property name="visible">True</property> - <signal name="changed" handler="on_theme_combobox_changed"/> + <signal name="changed" handler="on_iconset_combobox_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -1530,37 +1488,45 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="iconset_combobox"> + <widget class="GtkComboBox" id="theme_combobox"> <property name="visible">True</property> - <signal name="changed" handler="on_iconset_combobox_changed"/> + <signal name="changed" handler="on_theme_combobox_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="transports_iconsets_checkbutton"> + <widget class="GtkButton" id="manage_theme_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> - <property name="label" translatable="yes">Use _transports icons</property> + <property name="tooltip" translatable="yes">Configure color and font of the interface</property> + <property name="label" translatable="yes">Ma_nage...</property> <property name="use_underline">True</property> <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/> + <signal name="clicked" handler="on_manage_theme_button_clicked"/> </widget> <packing> - <property name="left_attach">1</property> + <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> + <child> + <widget class="GtkLabel" id="label249"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">T_heme:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">theme_combobox</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> </widget> </child> </widget> @@ -1600,119 +1566,65 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkHBox" id="hbox3022"> + <widget class="GtkLabel" id="label72"> <property name="visible">True</property> - <child> - <widget class="GtkLabel" id="label383"> - <property name="visible">True</property> - </widget> - <packing> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkButton" id="reset_colors_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_reset_colors_button_clicked"/> - <child> - <widget class="GtkAlignment" id="alignment52"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <widget class="GtkHBox" id="hbox2936"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <widget class="GtkImage" id="image439"> - <property name="visible">True</property> - <property name="stock">gtk-revert-to-saved</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label217"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Reset to Default Colors</property> - <property name="use_underline">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Incoming message:</property> + <property name="use_underline">True</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</property> + <property name="mnemonic_widget">incoming_msg_colorbutton</property> </widget> <packing> - <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkColorButton" id="url_msg_colorbutton"> + <widget class="GtkColorButton" id="incoming_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> <property name="response_id">0</property> - <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/> + <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label371"> + <widget class="GtkLabel" id="label70"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_URL highlight:</property> + <property name="label" translatable="yes">_Outgoing message:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">url_msg_colorbutton</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</property> + <property name="mnemonic_widget">outgoing_msg_colorbutton</property> </widget> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkColorButton" id="status_msg_colorbutton"> + <widget class="GtkColorButton" id="outgoing_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="response_id">0</property> - <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/> + <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> @@ -1734,66 +1646,120 @@ </packing> </child> <child> - <widget class="GtkColorButton" id="outgoing_msg_colorbutton"> + <widget class="GtkColorButton" id="status_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="response_id">0</property> - <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/> + <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label70"> + <widget class="GtkLabel" id="label371"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Outgoing message:</property> + <property name="label" translatable="yes">_URL highlight:</property> <property name="use_underline">True</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="mnemonic_widget">outgoing_msg_colorbutton</property> + <property name="mnemonic_widget">url_msg_colorbutton</property> </widget> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkColorButton" id="incoming_msg_colorbutton"> + <widget class="GtkColorButton" id="url_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> <property name="response_id">0</property> - <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/> + <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options"></property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label72"> + <widget class="GtkHBox" id="hbox3022"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Incoming message:</property> - <property name="use_underline">True</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="mnemonic_widget">incoming_msg_colorbutton</property> + <child> + <widget class="GtkLabel" id="label383"> + <property name="visible">True</property> + </widget> + <packing> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="reset_colors_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_reset_colors_button_clicked"/> + <child> + <widget class="GtkAlignment" id="alignment52"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <widget class="GtkHBox" id="hbox2936"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="image439"> + <property name="visible">True</property> + <property name="stock">gtk-revert-to-saved</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label217"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Reset to Default Colors</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </widget> <packing> + <property name="right_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> </packing> </child> </widget> @@ -1880,85 +1846,85 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label199"> + <widget class="GtkEntry" id="custom_file_manager_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Browser:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">custom_browser_entry</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_custom_file_manager_entry_changed"/> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label200"> + <widget class="GtkLabel" id="label355"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Mail client:</property> + <property name="label" translatable="yes">_File manager:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">custom_mail_client_entry</property> + <property name="mnemonic_widget">custom_file_manager_entry</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_mail_client_entry"> + <widget class="GtkEntry" id="custom_browser_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="changed" handler="on_custom_mail_client_entry_changed"/> + <signal name="changed" handler="on_custom_browser_entry_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_browser_entry"> + <widget class="GtkEntry" id="custom_mail_client_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="changed" handler="on_custom_browser_entry_changed"/> + <signal name="changed" handler="on_custom_mail_client_entry_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label355"> + <widget class="GtkLabel" id="label200"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_File manager:</property> + <property name="label" translatable="yes">_Mail client:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">custom_file_manager_entry</property> + <property name="mnemonic_widget">custom_mail_client_entry</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_file_manager_entry"> + <widget class="GtkLabel" id="label199"> <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_custom_file_manager_entry_changed"/> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Browser:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">custom_browser_entry</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> @@ -2022,19 +1988,18 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkCheckButton" id="log_encrypted_chats_checkbutton"> + <widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim log GPG or E2E encrypted messages. However, when using E2E encryption the remote site has to agree on logging. If the other side has declined logging, your messages will NOT be logged.</property> - <property name="label" translatable="yes">Log _encrypted chat session</property> + <property name="tooltip" translatable="yes">If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster</property> + <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/> + <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> @@ -2054,18 +2019,19 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton"> + <widget class="GtkCheckButton" id="log_encrypted_chats_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster</property> - <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property> + <property name="tooltip" translatable="yes">If checked, Gajim log GPG or E2E encrypted messages. However, when using E2E encryption the remote site has to agree on logging. If the other side has declined logging, your messages will NOT be logged.</property> + <property name="label" translatable="yes">Log _encrypted chat session</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/> + <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> </widget> Modified: branches/session_centric/src/chat_control.py =================================================================== --- branches/session_centric/src/chat_control.py 2008-02-13 18:03:29 UTC (rev 9325) +++ branches/session_centric/src/chat_control.py 2008-02-14 02:20:07 UTC (rev 9326) @@ -281,7 +281,7 @@ self.conv_textview.tv.show() self._paint_banner() - # For JEP-0172 + # For XEP-0172 self.user_nick = None self.smooth = True Modified: branches/session_centric/src/common/config.py =================================================================== --- branches/session_centric/src/common/config.py 2008-02-13 18:03:29 UTC (rev 9325) +++ branches/session_centric/src/common/config.py 2008-02-14 02:20:07 UTC (rev 9326) @@ -296,6 +296,7 @@ 'keep_alives_enabled': [ opt_bool, True], # send keepalive every N seconds of inactivity 'keep_alive_every_foo_secs': [ opt_int, 55 ], + 'time_for_keep_alive_answer': [ opt_int, 20, _('How many seconds to wait for the answer of keepalive packet before we try to reconnect.') ], # try for 2 minutes before giving up (aka. timeout after those seconds) 'try_connecting_for_foo_secs': [ opt_int, 60 ], 'http_auth': [opt_str, 'ask'], # yes, no, ask Modified: branches/session_centric/src/common/connection.py =================================================================== --- branches/session_centric/src/common/connection.py 2008-02-13 18:03:29 UTC (rev 9325) +++ branches/session_centric/src/common/connection.py 2008-02-14 02:20:07 UTC (rev 9326) @@ -705,11 +705,21 @@ return common.xmpp.features_nb.getPrivacyLists(self.connection) - def sendPing(self, pingTo): + def sendPing(self, pingTo=None): + '''Send XMPP Ping (XEP-0199) request. If pingTo is not set, ping is sent + to server to detect connection failure at application level.''' if not self.connection: return - iq = common.xmpp.Iq('get', to = pingTo.get_full_jid()) + id = self.connection.getAnID() + if pingTo: + to = pingTo.get_full_jid() + self.dispatch('PING_SENT', (pingTo)) + else: + to = gajim.config.get_per('accounts', self.name, 'hostname') + self.awaiting_xmpp_ping_id = id + iq = common.xmpp.Iq('get', to=to) iq.addChild(name = 'ping', namespace = common.xmpp.NS_PING) + iq.setID(id) def _on_response(resp): timePong = time_time() if not common.xmpp.isResultNode(resp): @@ -717,9 +727,13 @@ return timeDiff = round(timePong - timePing,2) self.dispatch('PING_REPLY', (pingTo, timeDiff)) - self.dispatch('PING_SENT', (pingTo)) - timePing = time_time() - self.connection.SendAndCallForResponse(iq, _on_response) + if pingTo: + timePing = time_time() + self.connection.SendAndCallForResponse(iq, _on_response) + else: + self.connection.send(iq) + gajim.idlequeue.set_alarm(self.check_keepalive, gajim.config.get_per( + 'accounts', self.name, 'time_for_keep_alive_answer')) def get_active_default_lists(self): if not self.connection: @@ -877,7 +891,7 @@ self.connection = con if not self.connection: return - self.connection.set_send_timeout(self.keepalives, self.send_keepalive) + self.connection.set_send_timeout(self.keepalives, self.sendPing) self.connection.onreceive(None) iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '') id = self.connection.getAnID() @@ -922,7 +936,7 @@ if not auto and not show == 'offline': sign_msg = True self.status = msg - if show != 'offline' and not self.connected: + if show != 'offline' and self.connected < 1: # set old_show to requested 'show' in case we need to # recconect before we auth to server self.old_show = show @@ -955,7 +969,7 @@ self.time_to_reconnect = None self._on_disconnected() - elif show != 'offline' and self.connected: + elif show != 'offline' and self.connected > 0: # dont'try to connect, when we are in state 'connecting' if self.connected == 1: return @@ -1257,6 +1271,7 @@ iq.setID(id) if groupchat_jid: self.groupchat_jids[id] = groupchat_jid + self.last_ids.append(id) self.connection.send(iq) def request_os_info(self, jid, resource, groupchat_jid=None): @@ -1277,6 +1292,7 @@ iq.setID(id) if groupchat_jid: self.groupchat_jids[id] = groupchat_jid + self.version_ids.append(id) self.connection.send(iq) def get_settings(self): @@ -1599,10 +1615,10 @@ c.setTagData('reason', reason) self.connection.send(message) - def send_keepalive(self): - # nothing received for the last foo seconds (60 secs by default) - if self.connection: - self.connection.send(' ') + def check_keepalive(self): + if self.awaiting_xmpp_ping_id: + # We haven't got the pong in time, disco and reconnect + self._disconnectedReconnCB() def _reconnect_alarm(self): if self.time_to_reconnect: Modified: branches/session_centric/src/common/connection_handlers.py =================================================================== --- branches/session_centric/src/common/connection_handlers.py 2008-02-13 18:03:29 UTC (rev 9325) +++ branches/session_centric/src/common/connection_handlers.py 2008-02-14 02:20:07 UTC (rev 9326) @@ -426,6 +426,9 @@ # if we want to respect xep-0065 we have to check for proxy # activation result in any result iq real_id = unicode(iq_obj.getAttr('id')) + if real_id == self.awaiting_xmpp_ping_id: + self.awaiting_xmpp_ping_id = None + return if real_id[:3] != 'au_': return frm = helpers.get_full_jid_from_iq(iq_obj) @@ -667,8 +670,8 @@ query = iq.setTag('query') query.setAttr('node','http://gajim.org/caps#' + gajim.version.split('-', 1)[0]) - for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, \ - common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS): + for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, + common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS): feature = common.xmpp.Node('feature') feature.setAttr('var', f) query.addChild(node=feature) @@ -1240,6 +1243,12 @@ # keep the latest subscribed event for each jid to prevent loop when we # acknoledge presences self.subscribed_events = {} + # IDs of jabber:iq:last requests + self.last_ids = [] + # IDs of jabber:iq:version requests + self.version_ids = [] + # ID of urn:xmpp:ping requests + self.awaiting_xmpp_ping_id = None # keep track of sessions this connection has with other JIDs self.sessions = {} @@ -1298,15 +1307,21 @@ def _ErrorCB(self, con, iq_obj): gajim.log.debug('ErrorCB') - if iq_obj.getQueryNS() == common.xmpp.NS_VERSION: - who = helpers.get_full_jid_from_iq(iq_obj) - jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who) + jid_from = helpers.get_full_jid_from_iq(iq_obj) + jid_stripped, resource = gajim.get_room_and_nick_from_fjid(jid_from) + id = unicode(iq_obj.getID()) + if id in self.version_ids: self.dispatch('OS_INFO', (jid_stripped, resource, '', '')) + self.version_ids.remove(id) return + if id in self.last_ids: + self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, -1, '')) + self.last_ids.remove(id) + return + if id == self.awaiting_xmpp_ping_id: + self.awaiting_xmpp_ping_id = None errmsg = iq_obj.getErrorMsg() errcode = iq_obj.getErrorCode() - jid_from = helpers.get_full_jid_from_iq(iq_obj) - id = unicode(iq_obj.getID()) self.dispatch('ERROR_ANSWER', (id, jid_from, errmsg, errcode)) def _PrivateCB(self, con, iq_obj): @@ -1393,9 +1408,9 @@ qp.setTagData('os', helpers.get_os_info()) self.connection.send(iq_obj) raise common.xmpp.NodeProcessed - + def _LastCB(self, con, iq_obj): - gajim.log.debug('IdleCB') + gajim.log.debug('LastCB') iq_obj = iq_obj.buildReply('result') qp = iq_obj.getTag('query') if not HAS_IDLE: @@ -1405,7 +1420,7 @@ self.connection.send(iq_obj) raise common.xmpp.NodeProcessed - + def _LastResultCB(self, con, iq_obj): gajim.log.debug('LastResultCB') qp = iq_obj.getTag('query') @@ -1421,9 +1436,11 @@ del self.groupchat_jids[id] else: who = helpers.get_full_jid_from_iq(iq_obj) + if id in self.last_ids: + self.last_ids.remove(id) jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who) self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, seconds, status)) - + def _VersionResultCB(self, con, iq_obj): gajim.log.debug('VersionResultCB') client_info = '' @@ -1442,6 +1459,8 @@ else: who = helpers.get_full_jid_from_iq(iq_obj) jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who) + if id in self.version_ids: + self.version_ids.remove(id) self.dispatch('OS_INFO', (jid_stripped, resource, client_info, os_info)) def _TimeCB(self, con, iq_obj): Modified: branches/session_centric/src/config.py =================================================================== --- branches/session_centric/src/config.py 2008-02-13 18:03:29 UTC (rev 9325) +++ branches/session_centric/src/config.py 2008-02-14 02:20:07 UTC (rev 9326) @@ -298,27 +298,20 @@ self.auto_popup_away_checkbutton.set_active(st) # sounds - if ((os.name == 'nt') or (sys.platform == 'darwin')): - # if windows, player must not become visible on show_all - soundplayer_hbox = self.xml.get_widget('soundplayer_hbox') - soundplayer_hbox.set_no_show_all(True) if gajim.config.get('sounds_on'): self.xml.get_widget('play_sounds_checkbutton').set_active(True) else: - self.xml.get_widget('soundplayer_hbox').set_sensitive(False) self.xml.get_widget('sounds_scrolledwindow').set_sensitive(False) self.xml.get_widget('browse_sounds_hbox').set_sensitive(False) # sound player player = gajim.config.get('soundplayer') - self.xml.get_widget('soundplayer_entry').set_text(player) if player == '': # only on first time Gajim starts commands = ('aplay', 'play', 'esdplay', 'artsplay') for command in commands: if helpers.is_in_path(command): if command == 'aplay': command += ' -q' - self.xml.get_widget('soundplayer_entry').set_text(command) gajim.config.set('soundplayer', command) break @@ -775,14 +768,9 @@ def on_play_sounds_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sounds_on', - [self.xml.get_widget('soundplayer_hbox'), - self.xml.get_widget('sounds_scrolledwindow'), + [self.xml.get_widget('sounds_scrolledwindow'), self.xml.get_widget('browse_sounds_hbox')]) - def on_soundplayer_entry_changed(self, widget): - gajim.config.set('soundplayer', widget.get_text().decode('utf-8')) - gajim.interface.save_config() - def on_sounds_treemodel_row_changed(self, model, path, iter): sound_event = model[iter][3].decode('utf-8') gajim.config.set_per('soundevents', sound_event, 'enabled', Modified: branches/session_centric/src/dialogs.py =================================================================== --- branches/session_centric/src/dialogs.py 2008-02-13 18:03:29 UTC (rev 9325) +++ branches/session_centric/src/dialogs.py 2008-02-14 02:20:07 UTC (rev 9326) @@ -936,7 +936,7 @@ dlg.set_transient_for(gajim.interface.roster.window) dlg.set_name('Gajim') dlg.set_version(gajim.version) - s = u'Copyright © 2003-2007 Gajim Team' + s = u'Copyright © 2003-2008 Gajim Team' dlg.set_copyright(s) copying_file_path = None if os.path.isfile(os.path.join(gajim.defs.docdir, 'COPYING')): Modified: branches/session_centric/src/features_window.py =================================================================== --- branches/session_centric/src/features_window.py 2008-02-13 18:03:29 UTC (rev 9325) +++ branches/session_centric/src/features_window.py 2008-02-14 02:20:07 UTC (rev 9326) @@ -142,7 +142,10 @@ selection = widget.get_selection() if not selection: return - path = selection.get_selected_rows()[1][0] + rows = selection.get_selected_rows()[1] + if not rows: + return + path = rows[0] available = self.model[path][1] feature = self.model[path][0].decode('utf-8') text = self.features[feature][1] + '\n' Modified: branches/session_centric/src/gajim-remote.py =================================================================== --- branches/session_centric/src/gajim-remote.py 2008-02-13 18:03:29 UTC (rev 9325) +++ branches/session_centric/src/gajim-remote.py 2008-02-14 02:20:07 UTC (rev 9326) @@ -59,7 +59,7 @@ class GajimRemote: def __init__(self): - self.argv_len = len(sys.argv) + self.argv_len = len(sys.argv) # define commands dict. Prototype : # { # 'command': [comment, [list of arguments] ] @@ -73,14 +73,14 @@ _('Shows a help on specific command'), [ #User gets help for the command, specified by this parameter - (_('command'), + (_('command'), _('show help on command'), False) ] - ], + ], 'toggle_roster_appearance' : [ _('Shows or hides the roster window'), [] - ], + ], 'show_next_pending_event': [ _('Pops up a window with the next pending event'), [] @@ -93,27 +93,27 @@ False) ] - ], + ], 'list_accounts': [ _('Prints a list of registered accounts'), [] - ], + ], 'change_status': [ _('Changes the status of account or accounts'), [ #offline, online, chat, away, xa, dnd, invisible should not be translated - (_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible '), True), - (_('message'), _('status message'), False), + (_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible '), True), + (_('message'), _('status message'), False), (_('account'), _('change status of account "account". ' 'If not specified, try to change status of all accounts that have ' '"sync with global status" option set'), False) ] ], - 'open_chat': [ - _('Shows the chat dialog so that you can send messages to a contact'), + 'open_chat': [ + _('Shows the chat dialog so that you can send messages to a contact'), [ ('jid', _('JID of the contact that you want to chat with'), - True), + True), (_('account'), _('if specified, contact is taken from the ' 'contact list of this account'), False) ] @@ -121,7 +121,7 @@ 'send_chat_message':[ _('Sends new chat message to a contact in the roster. Both OpenPGP key ' 'and account are optional. If you want to set only \'account\', ' - 'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), + 'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), [ ('jid', _('JID of the contact that will receive the message'), True), (_('message'), _('message contents'), True), @@ -134,7 +134,7 @@ 'send_single_message':[ _('Sends new single message to a contact in the roster. Both OpenPGP key ' 'and account are optional. If you want to set only \'account\', ' - 'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), + 'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), [ ('jid', _('JID of the contact that will receive the message'), True), (_('subject'), _('message subject'), True), @@ -144,9 +144,9 @@ (_('account'), _('if specified, the message will be sent ' 'using this account'), False), ] - ], + ], 'send_groupchat_message':[ - _('Sends new message to a groupchat you\'ve joined.'), + _('Sends new message to a groupchat you\'ve joined.'), [ ('room_jid', _('JID of the room that will receive the message'), True), (_('message'), _('message contents'), True), @@ -155,13 +155,13 @@ ] ], 'contact_info': [ - _('Gets detailed info on a contact'), + _('Gets detailed info on a contact'), [ ('jid', _('JID of the contact'), True) ] ], 'account_info': [ - _('Gets detailed info on a account'), + _('Gets detailed info on a account'), [ ('account', _('Name of the account'), True) ] @@ -188,8 +188,8 @@ ], 'prefs_del': [ _('Deletes a preference item'), - [ - (_('key'), _('name of the preference to be deleted'), True) + [ + (_('key'), _('name of the preference to be deleted'), True) ] ], 'prefs_store': [ @@ -199,7 +199,7 @@ ], 'remove_contact': [ _('Removes contact from roster'), - [ + [ ('jid', _('JID of the contact'), True), (_('account'), _('if specified, contact is taken from the ' 'contact list of this account'), False) @@ -208,7 +208,7 @@ ], 'add_contact': [ _('Adds contact to roster'), - [ + [ (_('jid'), _('JID of the contact'), True), (_('account'), _('Adds new contact to this account'), False) ] @@ -226,7 +226,7 @@ [ (_('account'), _(''), False) ] - ], + ], 'get_unread_msgs_number': [ _('Returns number of unread messages'), @@ -239,7 +239,7 @@ ] ], 'send_xml': [ - _('Sends custom XML'), + _('Sends custom XML'), [ ('xml', _('XML to send'), True), ('account', _('Account in which the xml will be sent; ' @@ -263,8 +263,13 @@ (_('account'), _(''), False) ] ], + 'check_gajim_running':[ + _('Check if Gajim is running'), + [] + ], } + self.sbus = None if self.argv_len < 2 or \ sys.argv[1] not in self.commands.keys(): # no args or bad args send_error(self.compose_help()) @@ -277,6 +282,9 @@ sys.exit(0) if self.command == 'handle_uri': self.handle_uri() + if self.command == 'check_gajim_running': + print self.check_gajim_running() + sys.exit(0) self.init_connection() self.check_arguments() @@ -323,7 +331,7 @@ pref_keys.sort() for pref_key in pref_keys: result = '%s = %s' % (pref_key, res[pref_key]) - if isinstance(result, unicode): + if isinstance(result, unicode): print result.encode(PREFERRED_ENCODING) else: print result @@ -332,6 +340,22 @@ elif res: print unicode(res).encode(PREFERRED_ENCODING) + def check_gajim_running(self): + if not self.sbus: + try: + self.sbus = dbus.SessionBus() + except: + raise exceptions.SessionBusNotPresent + + test = False + if hasattr(self.sbus, 'name_has_owner'): + if self.sbus.name_has_owner(SERVICE): + test = True + elif dbus.dbus_bindings.bus_name_has_owner(self.sbus.get_connection(), + SERVICE): + test = True + return test + def init_connection(self): ''' create the onnection to the session dbus, or exit if it is not possible ''' @@ -340,6 +364,8 @@ except: raise exceptions.SessionBusNotPresent + if not self.check_gajim_running(): + send_error(_('It seems Gajim is not running. So you can\'t use gajim-remote.')) obj = self.sbus.get_object(SERVICE, OBJ_PATH) interface = dbus.Interface(obj, INTERFACE) @@ -368,7 +394,7 @@ if command in self.commands: command_props = self.commands[command] arguments_str = self.make_arguments_row(command_props[1]) - str = _('Usage: %s %s %s \n\t %s') % (BASENAME, command, + str = _('Usage: %s %s %s \n\t %s') % (BASENAME, command, arguments_str, command_props[0]) if len(command_props[1]) > 0: str += '\n\n' + _('Arguments:') + '\n' @@ -383,7 +409,7 @@ commands = self.commands.keys() commands.sort() for command in commands: - str += ' ' + command + str += ' ' + command for argument in self.commands[command][1]: str += ' ' if argument[2]: @@ -457,7 +483,7 @@ if len(args) > argv_len: if args[argv_len][2]: send_error(_('Argument "%s" is not specified. \n' - 'Type "%s help %s" for more info') % + 'Type "%s help %s" for more info') % (args[argv_len][0], BASENAME, self.command)) self.arguments = [] i = 0 @@ -485,7 +511,7 @@ if action == 'join': self.command = sys.argv[1] = 'join_room' return - + sys.exit(0) def call_remote_method(self): Modified: branches/session_centric/src/gajim.py =================================================================== --- branches/session_centric/src/gajim.py 2008-02-13 18:03:29 UTC (rev 9325) +++ branches/session_centric/src/gajim.py 2008-02-14 02:20:07 UTC (rev 9326) @@ -720,12 +720,6 @@ elif new_show > 1: # Status change (not connected/disconnected or error (<1)) notify.notify('status_change', jid, account, [new_show, status_message]) - else: - # FIXME: Msn transport (CMSN1.2.1 and PyMSN0.10) doesn't follow the JEP - # remove in 2007 - # It's maybe a GC_NOTIFY (specialy for MSN gc) - self.handle_event_gc_notify(account, (jid, array[1], status_message, - array[3], None, None, None, None, None, [], None, None)) def handle_event_msgerror(self, account, array): #'MSGERROR' (account, (jid, error_code, error_msg, msg, time)) @@ -989,6 +983,10 @@ def handle_event_last_status_time(self, account, array): # ('LAST_STATUS_TIME', account, (jid, resource, seconds, status)) + tim = array[2] + if tim < 0: + # Ann error occured + return win = None if self.instances[account]['infos'].has_key(array[0]): win = self.instances[account]['infos'][array[0]] @@ -997,7 +995,7 @@ if win: c = gajim.contacts.get_contact(account, array[0], array[1]) if c: # c can be none if it's a gc contact - c.last_status_time = time.localtime(time.time() - array[2]) + c.last_status_time = time.localtime(time.time() - tim) if array[3]: c.status = array[3] win.set_last_status_time() Modified: branches/session_centric/src/groupchat_control.py =================================================================== --- branches/session_centric/src/groupchat_control.py 2008-02-13 18:03:29 UTC (rev 9325) +++ branches/session_centric/src/groupchat_control.py 2008-02-14 02:20:07 UTC (rev 9326) @@ -939,19 +939,18 @@ model[iter][C_TEXT] = name def draw_avatar(self, nick): + if not gajim.config.get('show_avatars_in_roster'): + return model = self.list_treeview.get_model() iter = self.get_contact_iter(nick) if not iter: return - if gajim.config.get('show_avatars_in_roster'): - pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(self.room_jid + \ - '/' + nick, True) - if pixbuf in ('ask', None): - scaled_pixbuf = None - else: - scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster') - else: + pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(self.room_jid + \ + '/' + nick, True) + if pixbuf in ('ask', None): scaled_pixbuf = None + else: + scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster') model[iter][C_AVATAR] = scaled_pixbuf def chg_contact_status(self, nick, show, status, role, affiliation, jid, Modified: branches/session_centric/src/message_window.py =================================================================== --- branches/session_centric/src/message_window.py 2008-02-13 18:03:29 UTC (rev 9325) +++ branches/session_centric/src/message_window.py 2008-02-14 02:20:07 UTC (rev 9326) @@ -4,12 +4,12 @@ ## Vincent Hanquez <tab(a)snarc.org> ## Copyright (C) 2005 Yann Leboulanger <asterix(a)lagaule.org> ## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <kourem(a)gmail.com> ## Dimitur Kirov <dkirov(a)gmail.com> ## Norman Rasmussen <norman(a)rasmussen.co.za> ## Copyright (C) 2005-2007 Travis Shirk <travis(a)pobox.com> ## Copyright (C) 2006 Geobert Quach <geobert(a)gmail.com> ## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> +## Copyright (C) 2005-2008 Nikos Kouremenos <kourem(a)gmail.com> ## ## This file is part of Gajim. ## @@ -123,7 +123,9 @@ else: nb_pos = gtk.POS_TOP self.notebook.set_tab_pos(nb_pos) - if gajim.config.get('tabs_always_visible'): + window_mode = gajim.interface.msg_win_mgr.mode + if gajim.config.get('tabs_always_visible') or \ + window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: self.notebook.set_show_tabs(True) self.alignment.set_property('top-padding', 2) else: @@ -444,7 +446,9 @@ self.window.destroy() return # don't show_title, we are dead elif self.get_num_controls() == 1: # we are going from two tabs to one - show_tabs_if_one_tab = gajim.config.get('tabs_always_visible') + window_mode = gajim.interface.msg_win_mgr.mode + show_tabs_if_one_tab = gajim.config.get('tabs_always_visible') or \ + window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER self.notebook.set_show_tabs(show_tabs_if_one_tab) if not show_tabs_if_one_tab: self.alignment.set_property('top-padding', 0) @@ -624,11 +628,15 @@ self.show_title(control = new_ctrl) def _on_notebook_key_press(self, widget, event): - control = self.get_active_control() # Ctrl+PageUP / DOWN has to be handled by notebook if (event.state & gtk.gdk.CONTROL_MASK and event.keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)): return False + # when tab itself is selected, make sure <- and -> are allowed for navigating between tabs + if event.keyval in (gtk.keysyms.Left, gtk.keysyms.Right): + return False + + control = self.get_active_control() if isinstance(control, ChatControlBase): # we forwarded it to message textview control.msg_textview.emit('key_press_event', event) Modified: branches/session_centric/src/roster_window.py =================================================================== --- branches/session_centric/src/roster_window.py 2008-02-13 18:03:29 UTC (rev 9325) +++ branches/session_centric/src/roster_window.py 2008-02-14 02:20:07 UTC (rev 9326) @@ -334,8 +334,7 @@ model.append(i, (None, name, 'contact', jid, account, None, None)) self.draw_contact(jid, account) - if gajim.config.get('show_avatars_in_roster'): - self.draw_avatar(jid, account) + self.draw_avatar(jid, account) self.draw_account(account) # Redraw parent to change icon self.draw_contact(big_brother_jid, big_brother_account) @@ -395,8 +394,7 @@ if gajim.groups[account][group]['expand']: self.tree.expand_row(model.get_path(iterG), False) self.draw_contact(jid, account) - if gajim.config.get('show_avatars_in_roster'): - self.draw_avatar(jid, account) + self.draw_avatar(jid, account) self.draw_account(account) # put the children under this iter for data in shown_family: @@ -762,6 +760,8 @@ def draw_avatar(self, jid, account): '''draw the avatar''' + if not gajim.config.get('show_avatars_in_roster'): + return model = self.tree.get_model() iters = self.get_contact_iter(jid, account) if gajim.config.get('show_avatars_in_roster'):

1 0

[commit-gajim] r9325 - in trunk/src: . common/zeroconf
by jim++＠gajim.org 13 Feb '08

13 Feb '08

Author: jim++ Date: 2008-02-13 19:03:29 +0100 (Wed, 13 Feb 2008) New Revision: 9325 Modified: trunk/src/chat_control.py trunk/src/common/zeroconf/connection_zeroconf.py trunk/src/dialogs.py trunk/src/disco.py trunk/src/gajim.py trunk/src/music_track_listener.py trunk/src/profile_window.py trunk/src/roster_window.py Log: Sadly, timeout_add_seconds is only availaible since gtk 2.14. It's quite recent. I have 2.10. Reverting [9324]. Reopen #3734. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-02-13 07:14:06 UTC (rev 9324) +++ trunk/src/chat_control.py 2008-02-13 18:03:29 UTC (rev 9325) @@ -1134,9 +1134,9 @@ self.mouse_over_in_last_30_secs = True def _schedule_activity_timers(self): - self.possible_paused_timeout_id = gobject.timeout_add_seconds(5, + self.possible_paused_timeout_id = gobject.timeout_add(5000, self.check_for_possible_paused_chatstate, None) - self.possible_inactive_timeout_id = gobject.timeout_add_seconds(30, + self.possible_inactive_timeout_id = gobject.timeout_add(30000, self.check_for_possible_inactive_chatstate, None) def update_ui(self): Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2008-02-13 07:14:06 UTC (rev 9324) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2008-02-13 18:03:29 UTC (rev 9325) @@ -277,7 +277,7 @@ # refresh all contacts data every five seconds self.call_resolve_timeout = True - gobject.timeout_add_seconds(5, self._on_resolve_timeout) + gobject.timeout_add(5000, self._on_resolve_timeout) return True def disconnect(self, on_purpose = False): Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-02-13 07:14:06 UTC (rev 9324) +++ trunk/src/dialogs.py 2008-02-13 18:03:29 UTC (rev 9325) @@ -1942,8 +1942,8 @@ xml.signal_autoconnect(self) self.window.show_all() - timeout = gajim.config.get('notification_timeout') - gobject.timeout_add_seconds(timeout, self.on_timeout) + timeout = gajim.config.get('notification_timeout') * 1000 # make it ms + gobject.timeout_add(timeout, self.on_timeout) def on_close_button_clicked(self, widget): self.adjust_height_and_move_popup_notification_windows() Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2008-02-13 07:14:06 UTC (rev 9324) +++ trunk/src/disco.py 2008-02-13 18:03:29 UTC (rev 9325) @@ -152,7 +152,7 @@ if item.source: gobject.source_remove(item.source) if self.lifetime: - source = gobject.timeout_add_seconds(self.lifetime/1000, self._expire_timeout, key) + source = gobject.timeout_add(self.lifetime, self._expire_timeout, key) item.source = source def __getitem__(self, key): @@ -1364,12 +1364,12 @@ fraction = float(self._progress) / float(self._total_items) if self._progress >= self._total_items: # We show the progressbar for just a bit before hiding it. - id = gobject.timeout_add_seconds(2, self._hide_progressbar_cb) + id = gobject.timeout_add(1500, self._hide_progressbar_cb) self._progressbar_sourceid = id else: self.window.progressbar.show() # Hide the progressbar if we're timing out anyways. (20 secs) - id = gobject.timeout_add_seconds(20, self._hide_progressbar_cb) + id = gobject.timeout_add(20000, self._hide_progressbar_cb) self._progressbar_sourceid = id self.window.progressbar.set_fraction(fraction) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-02-13 07:14:06 UTC (rev 9324) +++ trunk/src/gajim.py 2008-02-13 18:03:29 UTC (rev 9325) @@ -533,7 +533,7 @@ # we stop blocking notifications of any kind # this prevents from getting the roster items as 'just signed in' # contacts. 30 seconds should be enough time - gobject.timeout_add_seconds(30, self.unblock_signed_in_notifications, account) + gobject.timeout_add(30000, self.unblock_signed_in_notifications, account) # sensitivity for this menuitem model[self.roster.status_message_menuitem_iter][3] = True @@ -648,7 +648,7 @@ gajim.newly_added[account].append(contact1.jid) if contact1.jid in gajim.to_be_removed[account]: gajim.to_be_removed[account].remove(contact1.jid) - gobject.timeout_add_seconds(5, self.roster.remove_newly_added, + gobject.timeout_add(5000, self.roster.remove_newly_added, contact1.jid, account) elif old_show > 1 and new_show == 0 and gajim.connections[account].\ connected > 1: @@ -657,7 +657,7 @@ if contact1.jid in gajim.newly_added[account]: gajim.newly_added[account].remove(contact1.jid) self.roster.draw_contact(contact1.jid, account) - gobject.timeout_add_seconds(5, self.roster.really_remove_contact, + gobject.timeout_add(5000, self.roster.really_remove_contact, contact1, account) contact1.show = array[1] contact1.status = status_message @@ -684,7 +684,7 @@ # for 30s account_ji = account + '/' + ji gajim.block_signed_in_notifications[account_ji] = True - gobject.timeout_add_seconds(30, self.unblock_signed_in_notifications, + gobject.timeout_add(30000, self.unblock_signed_in_notifications, account_ji) locations = (self.instances, self.instances[account]) for location in locations: @@ -2948,8 +2948,8 @@ if os.name == 'nt': gobject.timeout_add(200, self.process_connections) else: - gobject.timeout_add_seconds(2, self.process_connections) - gobject.timeout_add_seconds(10, self.read_sleepy) + gobject.timeout_add(2000, self.process_connections) + gobject.timeout_add(10000, self.read_sleepy) if __name__ == '__main__': def sigint_cb(num, stack): Modified: trunk/src/music_track_listener.py =================================================================== --- trunk/src/music_track_listener.py 2008-02-13 07:14:06 UTC (rev 9324) +++ trunk/src/music_track_listener.py 2008-02-13 18:03:29 UTC (rev 9325) @@ -87,13 +87,13 @@ self.current_banshee_title = '' self.banshee_paused_before = False self.banshee_is_here = False - gobject.timeout_add_seconds(10, self._check_if_banshee_bus) + gobject.timeout_add(10000, self._check_if_banshee_bus) if self.dubus_methods.NameHasOwner('org.gnome.Banshee'): self._get_banshee_bus() self.banshee_is_here = True # Otherwise, it opens Banshee! self.banshee_props ={} - gobject.timeout_add_seconds(1, self._banshee_check_track_status) + gobject.timeout_add(1000, self._banshee_check_track_status) def _check_if_banshee_bus(self): if self.dubus_methods.NameHasOwner('org.gnome.Banshee'): Modified: trunk/src/profile_window.py =================================================================== --- trunk/src/profile_window.py 2008-02-13 07:14:06 UTC (rev 9324) +++ trunk/src/profile_window.py 2008-02-13 18:03:29 UTC (rev 9325) @@ -248,7 +248,7 @@ self.statusbar.remove(self.context_id, self.message_id) self.message_id = self.statusbar.push(self.context_id, _('Information received')) - self.remove_statusbar_timeout_id = gobject.timeout_add_seconds(3, + self.remove_statusbar_timeout_id = gobject.timeout_add(3000, self.remove_statusbar, self.message_id) gobject.source_remove(self.update_progressbar_timeout_id) self.progressbar.hide() @@ -344,7 +344,7 @@ self.statusbar.remove(self.context_id, self.message_id) self.message_id = self.statusbar.push(self.context_id, _('Information NOT published')) - self.remove_statusbar_timeout_id = gobject.timeout_add_seconds(3, + self.remove_statusbar_timeout_id = gobject.timeout_add(3000, self.remove_statusbar, self.message_id) if self.update_progressbar_timeout_id is not None: gobject.source_remove(self.update_progressbar_timeout_id) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-02-13 07:14:06 UTC (rev 9324) +++ trunk/src/roster_window.py 2008-02-13 18:03:29 UTC (rev 9325) @@ -5620,10 +5620,10 @@ ## accounts has no effect until they are connected. st = gajim.config.get('set_status_msg_from_current_music_track') if st: - gobject.timeout_add_seconds(1, + gobject.timeout_add(1000, self.enable_syncing_status_msg_from_current_music_track, st) else: - gobject.timeout_add_seconds(1, + gobject.timeout_add(1000, self.enable_syncing_status_msg_from_lastfm, gajim.config.get('set_status_msg_from_lastfm'))

1 0

[commit-gajim] r9324 - in trunk/src: . common/zeroconf
by asterix＠gajim.org 13 Feb '08

13 Feb '08

Author: asterix Date: 2008-02-13 08:14:06 +0100 (Wed, 13 Feb 2008) New Revision: 9324 Modified: trunk/src/chat_control.py trunk/src/common/zeroconf/connection_zeroconf.py trunk/src/dialogs.py trunk/src/disco.py trunk/src/gajim.py trunk/src/music_track_listener.py trunk/src/profile_window.py trunk/src/roster_window.py Log: [Goedson] use timeout_add_seconds instead of timeout_add, more efficient. fixes #3734 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-02-11 23:38:40 UTC (rev 9323) +++ trunk/src/chat_control.py 2008-02-13 07:14:06 UTC (rev 9324) @@ -1134,9 +1134,9 @@ self.mouse_over_in_last_30_secs = True def _schedule_activity_timers(self): - self.possible_paused_timeout_id = gobject.timeout_add(5000, + self.possible_paused_timeout_id = gobject.timeout_add_seconds(5, self.check_for_possible_paused_chatstate, None) - self.possible_inactive_timeout_id = gobject.timeout_add(30000, + self.possible_inactive_timeout_id = gobject.timeout_add_seconds(30, self.check_for_possible_inactive_chatstate, None) def update_ui(self): Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2008-02-11 23:38:40 UTC (rev 9323) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2008-02-13 07:14:06 UTC (rev 9324) @@ -277,7 +277,7 @@ # refresh all contacts data every five seconds self.call_resolve_timeout = True - gobject.timeout_add(5000, self._on_resolve_timeout) + gobject.timeout_add_seconds(5, self._on_resolve_timeout) return True def disconnect(self, on_purpose = False): Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-02-11 23:38:40 UTC (rev 9323) +++ trunk/src/dialogs.py 2008-02-13 07:14:06 UTC (rev 9324) @@ -1942,8 +1942,8 @@ xml.signal_autoconnect(self) self.window.show_all() - timeout = gajim.config.get('notification_timeout') * 1000 # make it ms - gobject.timeout_add(timeout, self.on_timeout) + timeout = gajim.config.get('notification_timeout') + gobject.timeout_add_seconds(timeout, self.on_timeout) def on_close_button_clicked(self, widget): self.adjust_height_and_move_popup_notification_windows() Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2008-02-11 23:38:40 UTC (rev 9323) +++ trunk/src/disco.py 2008-02-13 07:14:06 UTC (rev 9324) @@ -152,7 +152,7 @@ if item.source: gobject.source_remove(item.source) if self.lifetime: - source = gobject.timeout_add(self.lifetime, self._expire_timeout, key) + source = gobject.timeout_add_seconds(self.lifetime/1000, self._expire_timeout, key) item.source = source def __getitem__(self, key): @@ -1364,12 +1364,12 @@ fraction = float(self._progress) / float(self._total_items) if self._progress >= self._total_items: # We show the progressbar for just a bit before hiding it. - id = gobject.timeout_add(1500, self._hide_progressbar_cb) + id = gobject.timeout_add_seconds(2, self._hide_progressbar_cb) self._progressbar_sourceid = id else: self.window.progressbar.show() # Hide the progressbar if we're timing out anyways. (20 secs) - id = gobject.timeout_add(20000, self._hide_progressbar_cb) + id = gobject.timeout_add_seconds(20, self._hide_progressbar_cb) self._progressbar_sourceid = id self.window.progressbar.set_fraction(fraction) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-02-11 23:38:40 UTC (rev 9323) +++ trunk/src/gajim.py 2008-02-13 07:14:06 UTC (rev 9324) @@ -533,7 +533,7 @@ # we stop blocking notifications of any kind # this prevents from getting the roster items as 'just signed in' # contacts. 30 seconds should be enough time - gobject.timeout_add(30000, self.unblock_signed_in_notifications, account) + gobject.timeout_add_seconds(30, self.unblock_signed_in_notifications, account) # sensitivity for this menuitem model[self.roster.status_message_menuitem_iter][3] = True @@ -648,7 +648,7 @@ gajim.newly_added[account].append(contact1.jid) if contact1.jid in gajim.to_be_removed[account]: gajim.to_be_removed[account].remove(contact1.jid) - gobject.timeout_add(5000, self.roster.remove_newly_added, + gobject.timeout_add_seconds(5, self.roster.remove_newly_added, contact1.jid, account) elif old_show > 1 and new_show == 0 and gajim.connections[account].\ connected > 1: @@ -657,7 +657,7 @@ if contact1.jid in gajim.newly_added[account]: gajim.newly_added[account].remove(contact1.jid) self.roster.draw_contact(contact1.jid, account) - gobject.timeout_add(5000, self.roster.really_remove_contact, + gobject.timeout_add_seconds(5, self.roster.really_remove_contact, contact1, account) contact1.show = array[1] contact1.status = status_message @@ -684,7 +684,7 @@ # for 30s account_ji = account + '/' + ji gajim.block_signed_in_notifications[account_ji] = True - gobject.timeout_add(30000, self.unblock_signed_in_notifications, + gobject.timeout_add_seconds(30, self.unblock_signed_in_notifications, account_ji) locations = (self.instances, self.instances[account]) for location in locations: @@ -2948,8 +2948,8 @@ if os.name == 'nt': gobject.timeout_add(200, self.process_connections) else: - gobject.timeout_add(2000, self.process_connections) - gobject.timeout_add(10000, self.read_sleepy) + gobject.timeout_add_seconds(2, self.process_connections) + gobject.timeout_add_seconds(10, self.read_sleepy) if __name__ == '__main__': def sigint_cb(num, stack): Modified: trunk/src/music_track_listener.py =================================================================== --- trunk/src/music_track_listener.py 2008-02-11 23:38:40 UTC (rev 9323) +++ trunk/src/music_track_listener.py 2008-02-13 07:14:06 UTC (rev 9324) @@ -87,13 +87,13 @@ self.current_banshee_title = '' self.banshee_paused_before = False self.banshee_is_here = False - gobject.timeout_add(10000, self._check_if_banshee_bus) + gobject.timeout_add_seconds(10, self._check_if_banshee_bus) if self.dubus_methods.NameHasOwner('org.gnome.Banshee'): self._get_banshee_bus() self.banshee_is_here = True # Otherwise, it opens Banshee! self.banshee_props ={} - gobject.timeout_add(1000, self._banshee_check_track_status) + gobject.timeout_add_seconds(1, self._banshee_check_track_status) def _check_if_banshee_bus(self): if self.dubus_methods.NameHasOwner('org.gnome.Banshee'): Modified: trunk/src/profile_window.py =================================================================== --- trunk/src/profile_window.py 2008-02-11 23:38:40 UTC (rev 9323) +++ trunk/src/profile_window.py 2008-02-13 07:14:06 UTC (rev 9324) @@ -248,7 +248,7 @@ self.statusbar.remove(self.context_id, self.message_id) self.message_id = self.statusbar.push(self.context_id, _('Information received')) - self.remove_statusbar_timeout_id = gobject.timeout_add(3000, + self.remove_statusbar_timeout_id = gobject.timeout_add_seconds(3, self.remove_statusbar, self.message_id) gobject.source_remove(self.update_progressbar_timeout_id) self.progressbar.hide() @@ -344,7 +344,7 @@ self.statusbar.remove(self.context_id, self.message_id) self.message_id = self.statusbar.push(self.context_id, _('Information NOT published')) - self.remove_statusbar_timeout_id = gobject.timeout_add(3000, + self.remove_statusbar_timeout_id = gobject.timeout_add_seconds(3, self.remove_statusbar, self.message_id) if self.update_progressbar_timeout_id is not None: gobject.source_remove(self.update_progressbar_timeout_id) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-02-11 23:38:40 UTC (rev 9323) +++ trunk/src/roster_window.py 2008-02-13 07:14:06 UTC (rev 9324) @@ -5620,10 +5620,10 @@ ## accounts has no effect until they are connected. st = gajim.config.get('set_status_msg_from_current_music_track') if st: - gobject.timeout_add(1000, + gobject.timeout_add_seconds(1, self.enable_syncing_status_msg_from_current_music_track, st) else: - gobject.timeout_add(1000, + gobject.timeout_add_seconds(1, self.enable_syncing_status_msg_from_lastfm, gajim.config.get('set_status_msg_from_lastfm'))

1 0

[commit-gajim] r9323 - www-website
by asterix＠gajim.org 11 Feb '08

11 Feb '08

Author: asterix Date: 2008-02-12 00:38:40 +0100 (Tue, 12 Feb 2008) New Revision: 9323 Added: www-website/favicon.ico Modified: www-website/Design.php Log: add favicon.ico to gajim website Modified: www-website/Design.php =================================================================== --- www-website/Design.php 2008-02-10 20:02:32 UTC (rev 9322) +++ www-website/Design.php 2008-02-11 23:38:40 UTC (rev 9323) @@ -127,6 +127,7 @@ echo " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n"; echo " <title>\n $titre\n </title>\n"; echo " <link rel=\"stylesheet\" href=\"css/main.css\" type=\"text/css\" />\n"; + echo " <link rel=\"shortcut icon\" href=\"/favicon.ico\" />\n"; echo " </head>\n <body>\n"; echo "<div id=\"logo\">"; echo "<a href=\"index.php\" ><img id=\"logo_img\" src=\"imgs/up_logo.jpg\" alt=\"Gajim !\" title=\"Home\"/></a>\n"; Added: www-website/favicon.ico =================================================================== (Binary files differ) Property changes on: www-website/favicon.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

[commit-gajim] r9322 - trunk/src
by asterix＠gajim.org 10 Feb '08

10 Feb '08

Author: asterix Date: 2008-02-10 21:02:32 +0100 (Sun, 10 Feb 2008) New Revision: 9322 Modified: trunk/src/config.py Log: [TuX] remove spaces in room jids when they are entered in manage bookmarks window. Fixes #3730 Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-02-09 10:08:44 UTC (rev 9321) +++ trunk/src/config.py 2008-02-10 20:02:32 UTC (rev 9322) @@ -2910,9 +2910,9 @@ def on_server_entry_changed(self, widget): (model, iter) = self.selection.get_selected() if iter: - room_jid = self.room_entry.get_text().decode('utf-8') + '@' + \ - self.server_entry.get_text().decode('utf-8') - model[iter][2] = room_jid + room_jid = self.room_entry.get_text().decode('utf-8').strip() + '@' + \ + self.server_entry.get_text().decode('utf-8').strip() + model[iter][2] = room_jid.replace(' ', '') def on_room_entry_changed(self, widget): (model, iter) = self.selection.get_selected()

1 0

[commit-gajim] r9321 - trunk/src
by asterix＠gajim.org 09 Feb '08

09 Feb '08

Author: asterix Date: 2008-02-09 11:08:44 +0100 (Sat, 09 Feb 2008) New Revision: 9321 Modified: trunk/src/vcard.py Log: don't request vcard to full_jid when we know the real jid in MUC. fixes #3723 Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2008-02-09 06:57:07 UTC (rev 9320) +++ trunk/src/vcard.py 2008-02-09 10:08:44 UTC (rev 9321) @@ -388,7 +388,12 @@ self.fill_status_label() if self.gc_contact: - gajim.connections[self.account].request_vcard(self.real_jid, + # If we know the real jid, remove the resource from vcard request + if self.gc_contact.jid: + jid = self.gc_contact.jid + else: + jid = self.real_jid + gajim.connections[self.account].request_vcard(jid, self.gc_contact.get_full_jid()) else: gajim.connections[self.account].request_vcard(self.contact.jid)

1 0

[commit-gajim] r9320 - branches/session_centric/src
by bct＠gajim.org 09 Feb '08

09 Feb '08

Author: bct Date: 2008-02-09 07:57:07 +0100 (Sat, 09 Feb 2008) New Revision: 9320 Modified: branches/session_centric/src/chat_control.py Log: groupchat sessions fix Modified: branches/session_centric/src/chat_control.py =================================================================== --- branches/session_centric/src/chat_control.py 2008-02-08 22:15:03 UTC (rev 9319) +++ branches/session_centric/src/chat_control.py 2008-02-09 06:57:07 UTC (rev 9320) @@ -675,12 +675,6 @@ kind in ('incoming', 'incoming_queue'): # we want to have save this message in events list # other_tags_for_text == ['marked'] --> highlighted gc message - type_ = 'printed_' + self.type_id - event = 'message_received' - show_in_roster = notify.get_show_in_roster(event, - self.account, self.contact, self.session) - show_in_systray = notify.get_show_in_systray(event, - self.account, self.contact) if gc_message: type_ = 'printed_gc_msg' event = 'gc_message_received' @@ -690,6 +684,14 @@ show_in_systray = True if other_tags_for_text == ['marked']: type_ = 'printed_marked_gc_msg' + else: + type_ = 'printed_' + self.type_id + event = 'message_received' + show_in_roster = notify.get_show_in_roster(event, + self.account, self.contact, self.session) + show_in_systray = notify.get_show_in_systray(event, + self.account, self.contact) + event = gajim.events.create_event(type_, None, show_in_roster = show_in_roster, show_in_systray = show_in_systray)

1 0

[commit-gajim] r9319 - trunk/src
by steve-e＠gajim.org 08 Feb '08

08 Feb '08

Author: steve-e Date: 2008-02-08 23:15:03 +0100 (Fri, 08 Feb 2008) New Revision: 9319 Modified: trunk/src/gajim.py Log: Remove workaround old, non xep-complient MSN transports. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-02-08 22:04:42 UTC (rev 9318) +++ trunk/src/gajim.py 2008-02-08 22:15:03 UTC (rev 9319) @@ -720,14 +720,7 @@ elif new_show > 1: # Status change (not connected/disconnected or error (<1)) notify.notify('status_change', jid, account, [new_show, status_message]) - else: - # FIXME: Msn transport (CMSN1.2.1 and PyMSN0.10) doesn't follow the JEP - # remove in 2007 - # It's maybe a GC_NOTIFY (specialy for MSN gc) - self.handle_event_gc_notify(account, (jid, array[1], status_message, - array[3], None, None, None, None, None, [], None, None)) - def handle_event_msg(self, account, array): # 'MSG' (account, (jid, msg, time, encrypted, msg_type, subject, # chatstate, msg_id, composing_xep, user_nick, xhtml, session, form_node))

1 0

[commit-gajim] r9318 - trunk/src/common
by asterix＠gajim.org 08 Feb '08

08 Feb '08

Author: asterix Date: 2008-02-08 23:04:42 +0100 (Fri, 08 Feb 2008) New Revision: 9318 Modified: trunk/src/common/connection.py Log: don't show us online automatically when we are in error state and we try to go online Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-02-08 21:58:13 UTC (rev 9317) +++ trunk/src/common/connection.py 2008-02-08 22:04:42 UTC (rev 9318) @@ -936,7 +936,7 @@ if not auto and not show == 'offline': sign_msg = True self.status = msg - if show != 'offline' and not self.connected: + if show != 'offline' and self.connected < 1: # set old_show to requested 'show' in case we need to # recconect before we auth to server self.old_show = show @@ -969,7 +969,7 @@ self.time_to_reconnect = None self._on_disconnected() - elif show != 'offline' and self.connected: + elif show != 'offline' and self.connected > 0: # dont'try to connect, when we are in state 'connecting' if self.connected == 1: return

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2008