Commits February 2008

commits@gajim.org

5 participants
62 discussions

[commit-gajim] r9317 - in trunk: data/glade src
by steve-e＠gajim.org 08 Feb '08

08 Feb '08

Author: steve-e Date: 2008-02-08 22:58:13 +0100 (Fri, 08 Feb 2008) New Revision: 9317 Modified: trunk/data/glade/preferences_window.glade trunk/src/config.py Log: Remove Player option from preference window. Fixes #3330 Modified: trunk/data/glade/preferences_window.glade =================================================================== --- trunk/data/glade/preferences_window.glade 2008-02-08 21:48:20 UTC (rev 9316) +++ trunk/data/glade/preferences_window.glade 2008-02-08 21:58:13 UTC (rev 9317) @@ -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: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-02-08 21:48:20 UTC (rev 9316) +++ trunk/src/config.py 2008-02-08 21:58:13 UTC (rev 9317) @@ -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',

1 0

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

08 Feb '08

Author: asterix Date: 2008-02-08 22:48:20 +0100 (Fri, 08 Feb 2008) New Revision: 9316 Modified: trunk/src/common/connection.py Log: show in GUI that we are offline when we don't get XMPP ping in time Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-02-08 07:58:23 UTC (rev 9315) +++ trunk/src/common/connection.py 2008-02-08 21:48:20 UTC (rev 9316) @@ -1618,7 +1618,7 @@ def check_keepalive(self): if self.awaiting_xmpp_ping_id: # We haven't got the pong in time, disco and reconnect - self.disconnect() + self._disconnectedReconnCB() def _reconnect_alarm(self): if self.time_to_reconnect:

1 0

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

08 Feb '08

Author: asterix Date: 2008-02-08 08:58:23 +0100 (Fri, 08 Feb 2008) New Revision: 9315 Modified: trunk/src/common/connection_handlers.py Log: correctly detect XEP-0199 answer from server. Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-02-08 07:53:09 UTC (rev 9314) +++ trunk/src/common/connection_handlers.py 2008-02-08 07:58:23 UTC (rev 9315) @@ -425,11 +425,11 @@ # 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[:3] != 'au_': - return 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) id = real_id[3:] if self.files_props.has_key(id):

1 0

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

08 Feb '08

Author: asterix Date: 2008-02-08 08:53:09 +0100 (Fri, 08 Feb 2008) New Revision: 9314 Modified: trunk/src/common/connection.py Log: wrong syntax, missing ) Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-02-08 07:47:35 UTC (rev 9313) +++ trunk/src/common/connection.py 2008-02-08 07:53:09 UTC (rev 9314) @@ -733,7 +733,7 @@ else: self.connection.send(iq) gajim.idlequeue.set_alarm(self.check_keepalive, gajim.config.get_per( - 'accounts', self.name, 'time_for_keep_alive_answer') + 'accounts', self.name, 'time_for_keep_alive_answer')) def get_active_default_lists(self): if not self.connection:

1 0

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

08 Feb '08

Author: asterix Date: 2008-02-08 08:47:35 +0100 (Fri, 08 Feb 2008) New Revision: 9313 Modified: trunk/src/common/config.py trunk/src/common/connection.py Log: add advanced option to configure the time we wait XMPP Ping answer Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-02-07 23:53:02 UTC (rev 9312) +++ trunk/src/common/config.py 2008-02-08 07:47:35 UTC (rev 9313) @@ -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: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-02-07 23:53:02 UTC (rev 9312) +++ trunk/src/common/connection.py 2008-02-08 07:47:35 UTC (rev 9313) @@ -732,7 +732,8 @@ self.connection.SendAndCallForResponse(iq, _on_response) else: self.connection.send(iq) - gajim.idlequeue.set_alarm(self.check_keepalive, 5) + 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:

1 0

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

07 Feb '08

Author: asterix Date: 2008-02-08 00:53:02 +0100 (Fri, 08 Feb 2008) New Revision: 9312 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py Log: use XMPP ping (XEP-0199) to detect connection lost at applicatin level. fixes #2767 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-02-06 16:33:46 UTC (rev 9311) +++ trunk/src/common/connection.py 2008-02-07 23:53:02 UTC (rev 9312) @@ -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,12 @@ 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, 5) def get_active_default_lists(self): if not self.connection: @@ -877,7 +890,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() @@ -1601,10 +1614,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.disconnect() def _reconnect_alarm(self): if self.time_to_reconnect: Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-02-06 16:33:46 UTC (rev 9311) +++ trunk/src/common/connection_handlers.py 2008-02-07 23:53:02 UTC (rev 9312) @@ -427,6 +427,9 @@ real_id = unicode(iq_obj.getAttr('id')) if real_id[:3] != 'au_': return + if real_id == self.awaiting_xmpp_ping_id: + self.awaiting_xmpp_ping_id = None + return frm = helpers.get_full_jid_from_iq(iq_obj) id = real_id[3:] if self.files_props.has_key(id): @@ -666,8 +669,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) @@ -1243,6 +1246,8 @@ 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 = {} @@ -1312,6 +1317,8 @@ 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() self.dispatch('ERROR_ANSWER', (id, jid_from, errmsg, errcode)) @@ -1400,9 +1407,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: @@ -1412,7 +1419,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') @@ -1432,7 +1439,7 @@ 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 = ''

1 0

[commit-gajim] r9311 - trunk/src
by nk＠gajim.org 06 Feb '08

06 Feb '08

Author: nk Date: 2008-02-06 17:33:46 +0100 (Wed, 06 Feb 2008) New Revision: 9311 Modified: trunk/src/dialogs.py Log: 2008 in about dialog Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-02-06 14:59:28 UTC (rev 9310) +++ trunk/src/dialogs.py 2008-02-06 16:33:46 UTC (rev 9311) @@ -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')):

1 0

[commit-gajim] r9310 - trunk/src
by nk＠gajim.org 06 Feb '08

06 Feb '08

Author: nk Date: 2008-02-06 15:59:28 +0100 (Wed, 06 Feb 2008) New Revision: 9310 Modified: trunk/src/chat_control.py trunk/src/message_window.py Log: cosmetic changes Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-02-06 09:45:15 UTC (rev 9309) +++ trunk/src/chat_control.py 2008-02-06 14:59:28 UTC (rev 9310) @@ -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: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-02-06 09:45:15 UTC (rev 9309) +++ trunk/src/message_window.py 2008-02-06 14:59:28 UTC (rev 9310) @@ -628,14 +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 itselft is selected, make sure <- and -> are allowed for navigating between tabs + # 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)

1 0

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

06 Feb '08

Author: asterix Date: 2008-02-06 10:45:15 +0100 (Wed, 06 Feb 2008) New Revision: 9309 Modified: trunk/src/message_window.py Log: always show tabs in one_window mode so that we can close latest tab in GUI. fixes #3720 Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-02-06 05:24:07 UTC (rev 9308) +++ trunk/src/message_window.py 2008-02-06 09:45:15 UTC (rev 9309) @@ -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)

1 0

[commit-gajim] r9308 - in branches/session_centric/src: . common
by bct＠gajim.org 06 Feb '08

06 Feb '08

Author: bct Date: 2008-02-06 06:24:07 +0100 (Wed, 06 Feb 2008) New Revision: 9308 Modified: branches/session_centric/src/chat_control.py branches/session_centric/src/common/connection_handlers.py branches/session_centric/src/message_control.py branches/session_centric/src/notify.py branches/session_centric/src/roster_window.py branches/session_centric/src/session.py Log: post-refactor traceback fixing Modified: branches/session_centric/src/chat_control.py =================================================================== --- branches/session_centric/src/chat_control.py 2008-02-06 01:40:51 UTC (rev 9307) +++ branches/session_centric/src/chat_control.py 2008-02-06 05:24:07 UTC (rev 9308) @@ -678,7 +678,7 @@ type_ = 'printed_' + self.type_id event = 'message_received' show_in_roster = notify.get_show_in_roster(event, - self.account, self.contact) + self.account, self.contact, self.session) show_in_systray = notify.get_show_in_systray(event, self.account, self.contact) if gc_message: @@ -1841,10 +1841,14 @@ def shutdown(self): # destroy banner tooltip - bug #pygtk for that! self.status_tooltip.destroy() + # Send 'gone' chatstate self.send_chatstate('gone', self.contact) self.contact.chatstate = None self.contact.our_chatstate = None + + self.session.control = None + # Disconnect timer callbacks gobject.source_remove(self.possible_paused_timeout_id) gobject.source_remove(self.possible_inactive_timeout_id) Modified: branches/session_centric/src/common/connection_handlers.py =================================================================== --- branches/session_centric/src/common/connection_handlers.py 2008-02-06 01:40:51 UTC (rev 9307) +++ branches/session_centric/src/common/connection_handlers.py 2008-02-06 05:24:07 UTC (rev 9308) @@ -1752,7 +1752,7 @@ def delete_session(self, jid, thread_id): try: del self.sessions[jid][thread_id] - + if not self.sessions[jid]: del self.sessions[jid] except KeyError: Modified: branches/session_centric/src/message_control.py =================================================================== --- branches/session_centric/src/message_control.py 2008-02-06 01:40:51 UTC (rev 9307) +++ branches/session_centric/src/message_control.py 2008-02-06 05:24:07 UTC (rev 9308) @@ -145,6 +145,7 @@ jid = self.contact.jid if not self.session: + print('uhoh new session') fjid = self.contact.get_full_jid() new_session = gajim.connections[self.account].make_new_session(fjid) Modified: branches/session_centric/src/notify.py =================================================================== --- branches/session_centric/src/notify.py 2008-02-06 01:40:51 UTC (rev 9307) +++ branches/session_centric/src/notify.py 2008-02-06 05:24:07 UTC (rev 9308) @@ -53,8 +53,7 @@ except: USER_HAS_GROWL = False - -def get_show_in_roster(event, account, contact): +def get_show_in_roster(event, account, contact, session = None): '''Return True if this event must be shown in roster, else False''' if event == 'gc_message_received': return True @@ -65,8 +64,10 @@ if gajim.config.get_per('notifications', str(num), 'roster') == 'no': return False if event == 'message_received': - chat_control = helpers.get_chat_control(account, contact) - if chat_control: + if session: + if session.control: + return False + elif helpers.get_chat_control(account, contact): return False return True Modified: branches/session_centric/src/roster_window.py =================================================================== --- branches/session_centric/src/roster_window.py 2008-02-06 01:40:51 UTC (rev 9307) +++ branches/session_centric/src/roster_window.py 2008-02-06 05:24:07 UTC (rev 9308) @@ -1299,8 +1299,7 @@ for result in results: tim = time.localtime(float(result[2])) - self.on_message(jid, result[1], tim, account, msg_type = 'chat', - msg_id = result[0], session = session) + session.roster_message(jid, result[1], tim, msg_type='chat', msg_id=result[0]) def fill_contacts_and_groups_dicts(self, array, account): '''fill gajim.contacts and gajim.groups''' @@ -3960,12 +3959,13 @@ contact = self.add_to_not_in_the_roster(account, jid, resource = resource) + session = gajim.connections[account].get_session(fjid, None, 'chat') + if not gajim.interface.msg_win_mgr.has_window(fjid, account): - session = account.make_new_session(account, fjid) - self.control = self.new_chat(session, contact, account, resource = resource) + session.control = self.new_chat(session, contact, account, resource = resource) if len(gajim.events.get_events(account, fjid)): - chat_control.read_queue() + session.control.read_queue() mw = gajim.interface.msg_win_mgr.get_window(fjid, account) mw.set_active_tab(fjid, account) @@ -4292,16 +4292,25 @@ fjid = contact.jid if resource: fjid += '/' + resource + + conn = gajim.connections[account] + + if not session: + session = conn.get_session(fjid, None, 'chat') + win = gajim.interface.msg_win_mgr.get_window(fjid, account) if not win: - self.new_chat(session, contact, account, resource = resource) + session.control = self.new_chat(session, contact, account, resource=resource) + + if len(gajim.events.get_events(account, fjid)): + session.control.read_queue() + win = gajim.interface.msg_win_mgr.get_window(fjid, account) - ctrl = win.get_control(fjid, account) # last message is long time ago - gajim.last_message_time[account][ctrl.get_full_jid()] = 0 + gajim.last_message_time[account][session.control.get_full_jid()] = 0 + win.set_active_tab(fjid, account) - if gajim.connections[account].is_zeroconf and \ - gajim.connections[account].status in ('offline', 'invisible'): + if conn.is_zeroconf and conn.status in ('offline', 'invisible'): win.get_control(fjid, account).got_disconnected() win.window.present() Modified: branches/session_centric/src/session.py =================================================================== --- branches/session_centric/src/session.py 2008-02-06 01:40:51 UTC (rev 9307) +++ branches/session_centric/src/session.py 2008-02-06 05:24:07 UTC (rev 9308) @@ -51,7 +51,7 @@ contact.chatstate = chatstate if contact.our_chatstate == 'ask': # we were jep85 disco? contact.our_chatstate = 'active' # no more - self.control.handle_incoming_chatstate() + #self.control.handle_incoming_chatstate() XXX elif contact.chatstate != 'active': # got no valid jep85 answer, peer does not support it contact.chatstate = False @@ -109,7 +109,10 @@ first, nickname, msg, focused], advanced_notif_num) if gajim.interface.remote_ctrl: - gajim.interface.remote_ctrl.raise_signal('NewMessage', (self.conn.name, [full_jid_with_resource, message, tim, encrypted, msg_type, subject, chatstate, msg_id, composing_xep, user_nick, xhtml, form_node])) + gajim.interface.remote_ctrl.raise_signal('NewMessage', + (self.conn.name, [full_jid_with_resource, message, tim, + encrypted, msg_type, subject, chatstate, msg_id, + composing_xep, user_nick, xhtml, form_node])) def roster_message(self, jid, msg, tim, encrypted=False, msg_type='', subject=None, resource='', msg_id=None, user_nick='', @@ -188,7 +191,7 @@ type_ = 'normal' event_type = 'single_message_received' - show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, contact) + show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, contact, self) show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) event = gajim.events.create_event(type_, (msg, subject, msg_type, tim, @@ -199,7 +202,7 @@ if popup: if not self.control: - self.control = self.new_chat(self, contact, self.conn.name, resource=resource_for_chat) + self.control = gajim.interface.roster.new_chat(self, contact, self.conn.name, resource=resource_for_chat) if len(gajim.events.get_events(self.conn.name, fjid)): self.control.read_queue()

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