Commits December 2013

commits@gajim.org

2 participants
151 discussions

gajim: accounts and xml accounts creation dialogs. Do not "Show ...
by Gajim 30 Dec '13

30 Dec '13

changeset a07f5516925b in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=a07f5516925b description: accounts and xml accounts creation dialogs. Do not "Show images on buttons". see #7186 diffstat: data/gui/account_creation_wizard_window.ui | 193 ++++------------------------ data/gui/accounts_window.ui | 118 +++-------------- 2 files changed, 52 insertions(+), 259 deletions(-) diffs (truncated from 552 to 300 lines): diff -r 3ae6ad5480af -r a07f5516925b data/gui/account_creation_wizard_window.ui --- a/data/gui/account_creation_wizard_window.ui Fri Sep 20 13:09:52 2013 +0400 +++ b/data/gui/account_creation_wizard_window.ui Fri Sep 20 13:02:37 2013 +0400 @@ -1,6 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <interface>  + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-preferences</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-apply</property> + </object> <object class="GtkListStore" id="liststore1"> <columns>  @@ -12,20 +22,6 @@ </row> </data> </object> - <object class="GtkListStore" id="server_liststore"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkEntryCompletion" id="server_entrycompletion"> - <property name="model">server_liststore</property> - <property name="text_column">0</property> - </object> - <object class="GtkEntryCompletion" id="server_entrycompletion1"> - <property name="model">server_liststore</property> - <property name="text_column">0</property> - </object> <object class="GtkWindow" id="account_creation_wizard_window"> <property name="can_focus">False</property> <property name="border_width">12</property> @@ -84,11 +80,9 @@ <child> <object class="GtkRadioButton" id="use_existing_account_radiobutton"> <property name="label" translatable="yes">I already have an account I want to _use</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -102,11 +96,9 @@ <child> <object class="GtkRadioButton" id="register_new_account_radiobutton"> <property name="label" translatable="yes">I want to _register for a new account</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -210,12 +202,10 @@ <child> <object class="GtkCheckButton" id="save_password_checkbutton"> <property name="label" translatable="yes">Save pass_word</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will remember the password for this account</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="focus_on_click">False</property> <property name="xalign">0.5</property> @@ -277,11 +267,9 @@ <child> <object class="GtkCheckButton" id="anonymous_checkbutton1"> <property name="label" translatable="yes">Anon_ymous authentication</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -295,24 +283,7 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="server_comboboxentry"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="has_entry">True</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry"> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <property name="completion">server_entrycompletion</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - </packing> + <placeholder/> </child> </object> <packing> @@ -375,26 +346,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkComboBoxText" id="server_comboboxentry1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="has_entry">True</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry1"> - <property name="can_focus">True</property> - <property name="completion">server_entrycompletion1</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -405,11 +356,9 @@ <child> <object class="GtkCheckButton" id="anonymous_checkbutton2"> <property name="label" translatable="yes">Anon_ymous authentication</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -467,11 +416,9 @@ <child> <object class="GtkButton" id="manage_proxies_button"> <property name="label" translatable="yes">Manage...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_manage_proxies_button_clicked" swapped="no"/> </object> @@ -485,11 +432,9 @@ <child> <object class="GtkCheckButton" id="custom_host_port_checkbutton"> <property name="label" translatable="yes">Use custom hostname/port</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -650,12 +595,10 @@ <property name="label" translatable="yes">Add this certificate to the list of trusted certificates. SHA1 fingerprint of the certificate: </property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -794,11 +737,9 @@ <child> <object class="GtkCheckButton" id="go_online_checkbutton"> <property name="label" translatable="yes">Connect when I press Finish</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="active">True</property> @@ -813,11 +754,9 @@ <child> <object class="GtkCheckButton" id="show_vcard_checkbutton"> <property name="label" translatable="yes">Set my profile when I connect</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="active">True</property> @@ -860,12 +799,10 @@ <child> <object class="GtkButton" id="cancel_button"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> </object> @@ -878,13 +815,11 @@ <child> <object class="GtkButton" id="back_button"> <property name="label">gtk-go-back</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_back_button_clicked" swapped="no"/> </object> @@ -897,13 +832,11 @@ <child> <object class="GtkButton" id="forward_button"> <property name="label">gtk-go-forward</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_forward_button_clicked" swapped="no"/> </object> @@ -915,53 +848,14 @@ </child> <child> <object class="GtkButton" id="advanced_button"> - <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">_Advanced</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="use_action_appearance">False</property> + <property name="image">image2</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_advanced_button_clicked" swapped="no"/> - <child> - <object class="GtkAlignment" id="alignment96"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox2996"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1265"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-preferences</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label364"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Advanced</property> - <property name="use_underline">True</property>

1 0

gajim: fix dialogs buttons. Do not "Show images on buttons". Fix...
by Gajim 30 Dec '13

30 Dec '13

changeset 7fb0c1f53ee4 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=7fb0c1f53ee4 description: fix dialogs buttons. Do not "Show images on buttons". Fixes #7186 diffstat: data/gui/blocked_contacts_window.ui | 43 +----- data/gui/change_status_message_dialog.ui | 4 - data/gui/history_manager.ui | 44 +----- data/gui/plugins_window.ui | 133 +++--------------- data/gui/preferences_window.ui | 217 +++--------------------------- data/gui/service_discovery_window.ui | 87 ++---------- src/disco.py | 44 ++---- 7 files changed, 95 insertions(+), 477 deletions(-) diffs (truncated from 1357 to 300 lines): diff -r a07f5516925b -r 7fb0c1f53ee4 data/gui/blocked_contacts_window.ui --- a/data/gui/blocked_contacts_window.ui Fri Sep 20 13:02:37 2013 +0400 +++ b/data/gui/blocked_contacts_window.ui Fri Sep 20 14:41:56 2013 +0400 @@ -38,47 +38,14 @@ </child> <child> <object class="GtkButton" id="remove_button"> + <property name="label" translatable="yes">_Unblock</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="border_width">3</property> + <property name="image">image1</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_remove_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-remove</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Unblock</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> </object> <packing> <property name="expand">False</property> @@ -89,4 +56,8 @@ </object> </child> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-remove</property> + </object> </interface> diff -r a07f5516925b -r 7fb0c1f53ee4 data/gui/change_status_message_dialog.ui --- a/data/gui/change_status_message_dialog.ui Fri Sep 20 13:02:37 2013 +0400 +++ b/data/gui/change_status_message_dialog.ui Fri Sep 20 14:41:56 2013 +0400 @@ -354,9 +354,5 @@ </child> </object> </child> - <action-widgets> - <action-widget response="-6">cancel_button</action-widget> - <action-widget response="-5">ok_button</action-widget> - </action-widgets> </object> </interface> diff -r a07f5516925b -r 7fb0c1f53ee4 data/gui/history_manager.ui --- a/data/gui/history_manager.ui Fri Sep 20 13:02:37 2013 +0400 +++ b/data/gui/history_manager.ui Fri Sep 20 14:41:56 2013 +0400 @@ -212,48 +212,16 @@ </child> <child> <object class="GtkButton" id="search_db_button"> + <property name="label" translatable="yes">_Search Database</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> + <property name="image">image1</property> + <property name="use_underline">True</property> + <property name="image_position">bottom</property> <signal name="clicked" handler="on_search_db_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Search Database</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> </object> <packing> <property name="expand">False</property> @@ -345,4 +313,8 @@ <action-widget response="-5">save_button</action-widget> </action-widgets> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-find</property> + </object> </interface> diff -r a07f5516925b -r 7fb0c1f53ee4 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Fri Sep 20 13:02:37 2013 +0400 +++ b/data/gui/plugins_window.ui Fri Sep 20 14:41:56 2013 +0400 @@ -1,6 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <interface>  + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-apply</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-cancel</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-preferences</property> + </object> <object class="GtkWindow" id="plugins_window"> <property name="width_request">650</property> <property name="height_request">500</property> @@ -45,9 +60,6 @@ <object class="GtkTreeView" id="installed_plugins_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> </object> </child> </object> @@ -66,43 +78,12 @@ <property name="xalign">0</property> <child> <object class="GtkButton" id="install_plugin_button"> - <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">Install from zip</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> + <property name="image">image1</property> <signal name="clicked" handler="on_install_plugin_button_clicked" swapped="no"/> - <child> - <object class="GtkHBox" id="hbox8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-apply</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="configure_plugin_button_label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Install from zip</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> </object> </child> </object> @@ -166,7 +147,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><empty></property> + <property name="label"><empty></property> <property name="selectable">True</property> </object> <packing> @@ -206,7 +187,7 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes"><empty></property> + <property name="label"><empty></property> <property name="wrap_mode">word-char</property> <property name="selectable">True</property> <property name="ellipsize">end</property> @@ -242,12 +223,10 @@ </child> <child> <object class="GtkLinkButton" id="plugin_homepage_linkbutton"> - <property name="label" translatable="yes">homepage url</property> - <property name="use_action_appearance">False</property> + <property name="label">homepage url</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <property name="xalign">0</property> @@ -325,43 +304,12 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="uninstall_plugin_button"> - <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">Uninstall</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> + <property name="image">image2</property> <signal name="clicked" handler="on_uninstall_plugin_button_clicked" swapped="no"/> - <child> - <object class="GtkHBox" id="hbox6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkImage" id="image5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-cancel</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="uninstall_plugin_button_label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Uninstall</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> </object> <packing> <property name="expand">False</property>

1 0

gajim: Fix send button. See #7186
by Gajim 30 Dec '13

30 Dec '13

changeset af0c6b702d92 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=af0c6b702d92 description: Fix send button. See #7186 diffstat: data/gui/chat_control.ui | 102 +++-------------------------------------- data/gui/groupchat_control.ui | 67 +++------------------------ 2 files changed, 16 insertions(+), 153 deletions(-) diffs (truncated from 588 to 300 lines): diff -r 7fb0c1f53ee4 -r af0c6b702d92 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Fri Sep 20 14:41:56 2013 +0400 +++ b/data/gui/chat_control.ui Fri Sep 20 17:26:54 2013 +0400 @@ -265,12 +265,10 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> <object class="GtkButton" id="authentication_button"> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">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="no_show_all">True</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -326,14 +324,12 @@ <property name="can_focus">False</property> <child> <object class="GtkButton" id="emoticons_button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -354,13 +350,11 @@ </child> <child> <object class="GtkButton" id="formattings_button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="has_tooltip">True</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -392,14 +386,12 @@ </child> <child> <object class="GtkButton" id="add_to_roster_button"> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">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="no_show_all">True</property> <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Add this contact to roster (Ctrl+D)</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <child> <object class="GtkImage" id="image9"> @@ -419,12 +411,10 @@ </child> <child> <object class="GtkButton" id="send_file_button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -444,11 +434,9 @@ </child> <child> <object class="GtkToggleButton" id="audio_togglebutton"> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <child> <object class="GtkImage" id="audio_image"> @@ -467,11 +455,9 @@ </child> <child> <object class="GtkToggleButton" id="video_togglebutton"> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <child> <object class="GtkImage" id="video_image"> @@ -490,14 +476,12 @@ </child> <child> <object class="GtkButton" id="convert_to_gc_button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -518,14 +502,12 @@ </child> <child> <object class="GtkButton" id="contact_information_button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Show the contact's profile (Ctrl+I)</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -546,14 +528,12 @@ </child> <child> <object class="GtkButton" id="history_button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Browse the chat history (Ctrl+H)</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -586,14 +566,12 @@ </child> <child> <object class="GtkButton" id="message_window_actions_button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Show advanced functions (Alt+D)</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> @@ -629,11 +607,9 @@ </child> <child> <object class="GtkVolumeButton" id="sound_hscale"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <property name="orientation">vertical</property> @@ -652,11 +628,9 @@ </child> <child> <object class="GtkVolumeButton" id="mic_hscale"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <property name="yalign">0.4699999988079071</property> @@ -677,11 +651,9 @@ <child> <object class="GtkButton" id="dtmf_button"> <property name="label" translatable="yes">#</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> </object> <packing> @@ -725,52 +697,13 @@ </child> <child> <object class="GtkButton" id="send_button"> - <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">_Send</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">Send message</property> - <property name="use_action_appearance">False</property> - <child> - <object class="GtkAlignment" id="alignment102"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox3010"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1339"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-jump-to</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label373"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" comments="Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)">_Send</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> + <property name="image">image4</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -818,11 +751,9 @@ <property name="n_columns">3</property> <child> <object class="GtkButton" id="1_button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <child> <object class="GtkLabel" id="label1"> @@ -841,11 +772,9 @@ </child> <child> <object class="GtkButton" id="2_button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="xalign">0</property> <child> @@ -866,11 +795,9 @@ </child> <child> <object class="GtkButton" id="3_button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="xalign">0</property> <child> @@ -891,11 +818,9 @@ </child> <child> <object class="GtkButton" id="4_button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="xalign">0</property> <child> @@ -916,11 +841,9 @@ </child> <child>

1 0

gajim: Fix buttons icons. See #7186
by Gajim 30 Dec '13

30 Dec '13

changeset 2e47a9b58025 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=2e47a9b58025 description: Fix buttons icons. See #7186 diffstat: data/gui/manage_pep_services_window.ui | 34 +------ data/gui/search_window.ui | 133 +++++-------------------------- data/gui/service_registration_window.ui | 86 +++----------------- 3 files changed, 42 insertions(+), 211 deletions(-) diffs (truncated from 352 to 300 lines): diff -r af0c6b702d92 -r 2e47a9b58025 data/gui/manage_pep_services_window.ui --- a/data/gui/manage_pep_services_window.ui Fri Sep 20 17:26:54 2013 +0400 +++ b/data/gui/manage_pep_services_window.ui Fri Sep 20 20:26:56 2013 +0400 @@ -55,38 +55,14 @@ </child> <child> <object class="GtkButton" id="configure_button"> + <property name="label" translatable="yes">_Configure</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="image">image1</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_configure_button_clicked"/> - <child> - <object class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="stock">gtk-preferences</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <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">_Configure</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child> </object> <packing> <property name="expand">False</property> @@ -120,4 +96,8 @@ </object> </child> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-preferences</property> + </object> </interface> diff -r af0c6b702d92 -r 2e47a9b58025 data/gui/search_window.ui --- a/data/gui/search_window.ui Fri Sep 20 17:26:54 2013 +0400 +++ b/data/gui/search_window.ui Fri Sep 20 20:26:56 2013 +0400 @@ -52,50 +52,15 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="add_contact_button"> + <property name="label" translatable="yes">_Add contact</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">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="no_show_all">True</property> + <property name="image">image1</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_add_contact_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkHBox" id="hbox1"> - <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="spacing">2</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="stock">gtk-add</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <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">_Add contact</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> </object> <packing> <property name="expand">False</property> @@ -105,50 +70,15 @@ </child> <child> <object class="GtkButton" id="information_button"> + <property name="label" translatable="yes">_Information</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">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="no_show_all">True</property> + <property name="image">image3</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_information_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment3"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkHBox" id="hbox2"> - <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="spacing">2</property> - <child> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="stock">gtk-info</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <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">_Information</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> </object> <packing> <property name="expand">False</property> @@ -158,47 +88,14 @@ </child> <child> <object class="GtkButton" id="search_button"> + <property name="label" translatable="yes">_Search</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> + <property name="image">image2</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_search_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox5"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label58"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Search</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> </object> <packing> <property name="expand">False</property> @@ -231,4 +128,16 @@ </object> </child> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-find</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-info</property> + </object> </interface> diff -r af0c6b702d92 -r 2e47a9b58025 data/gui/service_registration_window.ui --- a/data/gui/service_registration_window.ui Fri Sep 20 17:26:54 2013 +0400 +++ b/data/gui/service_registration_window.ui Fri Sep 20 20:26:56 2013 +0400 @@ -35,47 +35,14 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel_button"> + <property name="label" translatable="yes">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> + <property name="image">image2</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_cancel_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment18"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox22"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image107"> - <property name="visible">True</property> - <property name="stock">gtk-cancel</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label34"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Cancel</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> </object> <packing> <property name="expand">False</property> @@ -85,48 +52,15 @@ </child> <child> <object class="GtkButton" id="ok_button"> + <property name="label" translatable="yes">_OK</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> + <property name="image">image1</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_ok_button_clicked"/>

1 0

gajim: apply modification to markedmsgcolor immediatly. Fixes #7436
by Gajim 30 Dec '13

30 Dec '13

changeset b3c2e9967a22 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=b3c2e9967a22 description: apply modification to markedmsgcolor immediatly. Fixes #7436 diffstat: src/conversation_textview.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diffs (28 lines): diff -r e8058d4e0c19 -r b3c2e9967a22 src/conversation_textview.py --- a/src/conversation_textview.py Sun Sep 29 01:06:37 2013 +0400 +++ b/src/conversation_textview.py Mon Sep 16 16:48:07 2013 +0200 @@ -281,10 +281,10 @@ tag = buffer_.create_tag(tagname) tag.set_property('foreground', color) - tag = buffer_.create_tag('marked') + self.tagMarked = buffer_.create_tag('marked') color = gajim.config.get('markedmsgcolor') - tag.set_property('foreground', color) - tag.set_property('weight', Pango.Weight.BOLD) + self.tagMarked.set_property('foreground', color) + self.tagMarked.set_property('weight', Pango.Weight.BOLD) tag = buffer_.create_tag('time_sometimes') tag.set_property('foreground', 'darkgrey') @@ -346,7 +346,9 @@ self.tagIn.set_property('foreground', gajim.config.get('inmsgcolor')) self.tagOut.set_property('foreground', gajim.config.get('outmsgcolor')) self.tagStatus.set_property('foreground', - gajim.config.get('statusmsgcolor')) + gajim.config.get('statusmsgcolor')) + self.tagMarked.set_property('foreground', + gajim.config.get('markedmsgcolor')) color = gajim.config.get('urlmsgcolor') self.tv.tagURL.set_property('foreground', color) self.tv.tagMail.set_property('foreground', color)

1 0

gajim: Fix crash with d-bus unable to reach the daemon's socket
by Gajim 30 Dec '13

30 Dec '13

changeset 7eecb3c2a7e9 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=7eecb3c2a7e9 description: Fix crash with d-bus unable to reach the daemon's socket diffstat: src/gtkgui_helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b3c2e9967a22 -r 7eecb3c2a7e9 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Mon Sep 16 16:48:07 2013 +0200 +++ b/src/gtkgui_helpers.py Thu Sep 19 19:04:13 2013 +0400 @@ -734,7 +734,7 @@ gajim.config.set('check_if_gajim_is_default', False) try: - from gi.repository import GConf + GConf = importlib.import_module('gi.repository.GConf') # in try because daemon may not be there client = GConf.Client.get_default() except Exception:

1 0

python-nbxmpp: ability to configure cipher list. see #7
by Yann Leboulanger 30 Dec '13

30 Dec '13

changeset 2a705299d7e7 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=2a705299d7e7 description: ability to configure cipher list. see #7 diffstat: doc/examples/xsend.py | 4 +++- nbxmpp/bosh.py | 8 ++++---- nbxmpp/client_nb.py | 27 ++++++++++++++++----------- nbxmpp/tls_nb.py | 20 ++++++++++---------- nbxmpp/transports_nb.py | 29 ++++++++++++++++------------- 5 files changed, 49 insertions(+), 39 deletions(-) diffs (232 lines): diff -r 8b9b9ea9a20d -r 2a705299d7e7 doc/examples/xsend.py --- a/doc/examples/xsend.py Sun Nov 03 13:47:50 2013 +0100 +++ b/doc/examples/xsend.py Sun Nov 03 17:55:20 2013 +0100 @@ -35,6 +35,8 @@ def __init__(self): self.jid = nbxmpp.protocol.JID(jidparams['jid']) self.password = jidparams['password'] + self.sm = nbxmpp.Smacks(self) # Stream Management + self.client_cert = None def on_auth(self, con, auth): if not auth: @@ -59,7 +61,7 @@ def connect(self): idle_queue = nbxmpp.idlequeue.get_idlequeue() self.client = nbxmpp.NonBlockingClient(self.jid.getDomain(), idle_queue, caller=self) - self.con = self.client.connect(self.on_connected, self.on_connection_failed, secure_tuple=('tls', '', '')) + self.con = self.client.connect(self.on_connected, self.on_connection_failed, secure_tuple=('tls', '', '', None)) def send_message(self, to_jid, text): id_ = self.client.send(nbxmpp.protocol.Message(to_jid, text, typ='chat')) diff -r 8b9b9ea9a20d -r 2a705299d7e7 nbxmpp/bosh.py --- a/nbxmpp/bosh.py Sun Nov 03 13:47:50 2013 +0100 +++ b/nbxmpp/bosh.py Sun Nov 03 17:55:20 2013 +0100 @@ -37,10 +37,10 @@ class NonBlockingBOSH(NonBlockingTransport): - def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, certs, - xmpp_server, domain, bosh_dict, proxy_creds): - NonBlockingTransport.__init__(self, raise_event, on_disconnect, idlequeue, - estabilish_tls, certs) + def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, + certs, cipher_list, xmpp_server, domain, bosh_dict, proxy_creds): + NonBlockingTransport.__init__(self, raise_event, on_disconnect, + idlequeue, estabilish_tls, certs, cipher_list) self.bosh_sid = None if locale.getdefaultlocale()[0]: diff -r 8b9b9ea9a20d -r 2a705299d7e7 nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Sun Nov 03 13:47:50 2013 +0100 +++ b/nbxmpp/client_nb.py Sun Nov 03 17:55:20 2013 +0100 @@ -149,7 +149,7 @@ def connect(self, on_connect, on_connect_failure, hostname=None, port=5222, on_proxy_failure=None, on_stream_error_cb=None, proxy=None, - secure_tuple=('plain', None, None)): + secure_tuple=('tls', None, None, None)): """ Open XMPP connection (open XML streams in both directions) @@ -157,22 +157,25 @@ :param on_connect_failure: called when error occures during connection :param hostname: hostname of XMPP server from SRV request :param port: port number of XMPP server - :param on_proxy_failure: called if error occurres during TCP connection to - proxy server or during proxy connecting process + :param on_proxy_failure: called if error occurres during TCP connection + to proxy server or during proxy connecting process :param proxy: dictionary with proxy data. It should contain at least - values for keys 'host' and 'port' - connection details for proxy serve - and optionally keys 'user' and 'pass' as proxy credentials - :param secure_tuple: tuple of (desired connection type, cacerts, mycerts) - connection type can be 'ssl' - TLS established after TCP connection, - 'tls' - TLS established after negotiation with starttls, or 'plain'. - cacerts, mycerts - see tls_nb.NonBlockingTLS constructor for more - details + values for keys 'host' and 'port' - connection details for proxy + serve and optionally keys 'user' and 'pass' as proxy credentials + :param secure_tuple: tuple of (desired connection type, cacerts, + mycerts, cipher_list) + connection type can be 'ssl' - TLS established after TCP connection, + 'tls' - TLS established after negotiation with starttls, or + 'plain'. + cacerts, mycerts, cipher_list - see tls_nb.NonBlockingTLS + constructor for more details """ self.on_connect = on_connect self.on_connect_failure=on_connect_failure self.on_proxy_failure = on_proxy_failure self.on_stream_error_cb = on_stream_error_cb - self.desired_security, self.cacerts, self.mycerts = secure_tuple + self.desired_security, self.cacerts, self.mycerts, self.cipher_list = \ + secure_tuple self.Connection = None self.Port = port self.proxy = proxy @@ -209,6 +212,7 @@ idlequeue=self.idlequeue, estabilish_tls=establish_tls, certs=certs, + cipher_list = self.cipher_list, proxy_creds=(proxy_user, proxy_pass), xmpp_server=(self.xmpp_hostname, self.Port), domain=self.Server, @@ -230,6 +234,7 @@ idlequeue=self.idlequeue, estabilish_tls=establish_tls, certs=certs, + cipher_list = self.cipher_list, proxy_dict=proxy_dict) # plug transport into client as self.Connection diff -r 8b9b9ea9a20d -r 2a705299d7e7 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sun Nov 03 13:47:50 2013 +0100 +++ b/nbxmpp/tls_nb.py Sun Nov 03 17:55:20 2013 +0100 @@ -250,21 +250,21 @@ PyOpenSSLWrapper. """ - def __init__(self, cacerts, mycerts): + def __init__(self, cacerts, mycerts, cipher_list): """ :param cacerts: path to pem file with certificates of known XMPP servers - :param mycerts: path to pem file with certificates of user trusted servers + :param mycerts: path to pem file with certificates of user trusted + servers + :param cipher_list: list of ciphers to use when connection to server. If + None is provided, a default list is used: HIGH:!aNULL:!eNULL:RC4-SHA """ PlugIn.__init__(self) self.cacerts = cacerts self.mycerts = mycerts - - # from ssl.h (partial extract) - ssl_h_bits = { "SSL_ST_CONNECT": 0x1000, "SSL_ST_ACCEPT": 0x2000, - "SSL_CB_LOOP": 0x01, "SSL_CB_EXIT": 0x02, - "SSL_CB_READ": 0x04, "SSL_CB_WRITE": 0x08, - "SSL_CB_ALERT": 0x4000, - "SSL_CB_HANDSHAKE_START": 0x10, "SSL_CB_HANDSHAKE_DONE": 0x20} + if cipher_list is None: + self.cipher_list = 'HIGH:!aNULL:!eNULL:RC4-SHA' + else: + self.cipher_list = cipher_list def plugin(self, owner): """ @@ -403,7 +403,7 @@ tcpsock.ssl_errnum = [] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback) - tcpsock._sslContext.set_cipher_list('HIGH:!aNULL:!eNULL:RC4-SHA') + tcpsock._sslContext.set_cipher_list(self.cipher_list) store = tcpsock._sslContext.get_cert_store() self._load_cert_file(self.cacerts, store) self._load_cert_file(self.mycerts, store) diff -r 8b9b9ea9a20d -r 2a705299d7e7 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sun Nov 03 13:47:50 2013 +0100 +++ b/nbxmpp/transports_nb.py Sun Nov 03 17:55:20 2013 +0100 @@ -109,7 +109,7 @@ """ def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, - certs): + certs, cipher_list): """ Each trasport class can have different constructor but it has to have at least all the arguments of NonBlockingTransport constructor @@ -117,10 +117,11 @@ :param raise_event: callback for monitoring of sent and received data :param on_disconnect: callback called on disconnection during runtime :param idlequeue: processing idlequeue - :param estabilish_tls: boolean whether to estabilish TLS connection after - TCP connection is done - :param certs: tuple of (cacerts, mycerts) see constructor of - tls_nb.NonBlockingTLS for more details + :param estabilish_tls: boolean whether to estabilish TLS connection + after TCP connection is done + :param certs: tuple of (cacerts, mycerts) see constructor + of tls_nb.NonBlockingTLS for more details + :param cipher_list: list of ciphers used to connect to server """ PlugIn.__init__(self) self.raise_event = raise_event @@ -135,6 +136,7 @@ self.set_state(DISCONNECTED) self.estabilish_tls = estabilish_tls self.certs = certs + self.cipher_list = cipher_list # type of used ssl lib (if any) will be assigned to this member var self.ssl_lib = None self._exported_methods=[self.onreceive, self.set_send_timeout, @@ -293,12 +295,12 @@ estabilish TLS connection. """ def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, - certs, proxy_dict=None): + certs, cipher_list, proxy_dict=None): """ :param proxy_dict: dictionary with proxy data as loaded from config file """ - NonBlockingTransport.__init__(self, raise_event, on_disconnect, idlequeue, - estabilish_tls, certs) + NonBlockingTransport.__init__(self, raise_event, on_disconnect, + idlequeue, estabilish_tls, certs, cipher_list) IdleObject.__init__(self) # queue with messages to be send @@ -409,7 +411,8 @@ NonBlockingTLS module """ cacerts, mycerts = self.certs - result = tls_nb.NonBlockingTLS.get_instance(cacerts, mycerts).PlugIn(self) + result = tls_nb.NonBlockingTLS.get_instance(cacerts, mycerts, + self.cipher_list).PlugIn(self) if result: on_succ() else: @@ -663,8 +666,8 @@ """ def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, - certs, on_http_request_possible, on_persistent_fallback, http_dict, - proxy_dict=None): + certs, cipher_list, on_http_request_possible, on_persistent_fallback, + http_dict, proxy_dict=None): """ :param on_http_request_possible: method to call when HTTP request to socket owned by transport is possible. @@ -673,10 +676,10 @@ :param http_dict: dictionary with data for HTTP request and headers """ NonBlockingTCP.__init__(self, raise_event, on_disconnect, idlequeue, - estabilish_tls, certs, proxy_dict) + estabilish_tls, certs, cipher_list, proxy_dict) self.http_protocol, self.http_host, self.http_port, self.http_path = \ - urisplit(http_dict['http_uri']) + urisplit(http_dict['http_uri']) self.http_protocol = self.http_protocol or 'http' self.http_path = self.http_path or '/' self.http_version = http_dict['http_version']

1 0

python-nbxmpp: [fedor] fix BOSH connection. Fixes #10
by Yann Leboulanger 30 Dec '13

30 Dec '13

changeset b6a21b6390f4 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=b6a21b6390f4 description: [fedor] fix BOSH connection. Fixes #10 diffstat: nbxmpp/bosh.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r 2a705299d7e7 -r b6a21b6390f4 nbxmpp/bosh.py --- a/nbxmpp/bosh.py Sun Nov 03 17:55:20 2013 +0100 +++ b/nbxmpp/bosh.py Fri Nov 29 20:31:51 2013 +0100 @@ -68,6 +68,7 @@ self.bosh_secure = 'true' else: self.bosh_secure = 'false' + self.cipher_list = cipher_list self.use_proxy_auth = bosh_dict['useauth'] self.proxy_creds = proxy_creds self.wait_cb_time = None @@ -450,6 +451,7 @@ on_disconnect=self.disconnect, idlequeue = self.idlequeue, estabilish_tls = self.estabilish_tls, + cipher_list = self.cipher_list, certs = self.certs, on_http_request_possible = self.on_http_request_possible, http_dict = http_dict,

1 0

python-nbxmpp: [fedor] Disable SSL v3 protocol and use only TLS ...
by Yann Leboulanger 30 Dec '13

30 Dec '13

changeset caac135fb450 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=caac135fb450 description: [fedor] Disable SSL v3 protocol and use only TLS 1.0, TLS 1.1, TLS 1.2. Fixes #9 diffstat: nbxmpp/tls_nb.py | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diffs (76 lines): diff -r b6a21b6390f4 -r caac135fb450 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Fri Nov 29 20:31:51 2013 +0100 +++ b/nbxmpp/tls_nb.py Sat Nov 30 09:58:35 2013 +0100 @@ -256,13 +256,13 @@ :param mycerts: path to pem file with certificates of user trusted servers :param cipher_list: list of ciphers to use when connection to server. If - None is provided, a default list is used: HIGH:!aNULL:!eNULL:RC4-SHA + None is provided, a default list is used: HIGH:!aNULL:RC4-SHA """ PlugIn.__init__(self) self.cacerts = cacerts self.mycerts = mycerts if cipher_list is None: - self.cipher_list = 'HIGH:!aNULL:!eNULL:RC4-SHA' + self.cipher_list = 'HIGH:!aNULL:RC4-SHA' else: self.cipher_list = cipher_list @@ -280,6 +280,10 @@ return res def _dumpX509(self, cert, stream=sys.stderr): + try: + print("Digest (SHA-2 256):" + cert.digest("sha256"), file=stream) + except ValueError: # Old OpenSSL version + pass print("Digest (SHA-1):" + cert.digest("sha1"), file=stream) print("Digest (MD5):" + cert.digest("md5"), file=stream) print("Serial #:" + cert.get_serial_number(), file=stream) @@ -353,17 +357,21 @@ def _startSSL_pyOpenSSL(self): log.debug("_startSSL_pyOpenSSL called") tcpsock = self._owner + # See http://docs.python.org/dev/library/ssl.html + tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) + flags = OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_NO_SSLv3 | \ + OpenSSL.SSL.OP_SINGLE_DH_USE + try: + flags |= OpenSSL.SSL.OP_NO_TICKET + except AttributeError, e: + # py-OpenSSL < 0.9 or old OpenSSL + flags |= 16384 + tcpsock._sslContext.set_options(flags) + # NonBlockingHTTPBOSH instance has no attribute _owner if hasattr(tcpsock, '_owner') and tcpsock._owner._caller.client_cert \ and os.path.exists(tcpsock._owner._caller.client_cert): conn = tcpsock._owner._caller - # FIXME make a checkbox for Client Cert / SSLv23 / TLSv1 - # If we are going to use a client cert/key pair for authentication, - # we choose TLSv1* method. - tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) - flags = (OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_NO_SSLv3 - | OpenSSL.SSL.OP_SINGLE_DH_USE) - tcpsock._sslContext.set_options(flags) log.debug('Using client cert and key from %s' % conn.client_cert) try: p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read(), @@ -389,16 +397,6 @@ 'from file %s: %s' % (conn.client_cert, msg)) else: log.info('client cert and key loaded OK') - else: - # See http://docs.python.org/dev/library/ssl.html - tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) - flags = OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_SINGLE_DH_USE - try: - flags |= OpenSSL.SSL.OP_NO_TICKET - except AttributeError as e: - # py-OpenSSL < 0.9 or old OpenSSL - flags |= 16384 - tcpsock._sslContext.set_options(flags) tcpsock.ssl_errnum = [] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER,

1 0

python-nbxmpp: prevent traceback
by Yann Leboulanger 30 Dec '13

30 Dec '13

changeset fccda8ea864e in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=fccda8ea864e description: prevent traceback diffstat: nbxmpp/smacks.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r caac135fb450 -r fccda8ea864e nbxmpp/smacks.py --- a/nbxmpp/smacks.py Sat Nov 30 09:58:35 2013 +0100 +++ b/nbxmpp/smacks.py Sat Nov 30 11:29:05 2013 +0100 @@ -95,7 +95,11 @@ number of stanzas received by the server. Pops stanzas that were handled by the server from the queue. ''' - h = int(stanza.getAttr('h')) + h = stanza.getAttr('h') + if not h: + log.error('Server did not send h attribute') + return + h = int(h) diff = self.out_h - h if len(self.uqueue) < diff or diff < 0:

1 0

← Newer
1
...
8
9
10
11
12
13
14
15
16
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2013