Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Fix regression from 8b800f46
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1e9fb205 by Philipp Hörist at 2018-07-06T23:54:29+02:00 Fix regression from 8b800f46 - - - - - 1 changed file: - gajim/common/modules/vcard_avatars.py Changes: ===================================== gajim/common/modules/vcard_avatars.py ===================================== --- a/gajim/common/modules/vcard_avatars.py +++ b/gajim/common/modules/vcard_avatars.py @@ -119,7 +119,7 @@ class VCardAvatars: app.contacts.set_avatar(self._account, jid, avatar_sha) app.interface.update_avatar( self._account, jid, room_avatar=room) - return + return if avatar_sha not in self._requested_shas: self._requested_shas.append(avatar_sha) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e9fb205eec1dd2e347cd686cb3c35c2df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e9fb205eec1dd2e347cd686cb3c35c2df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Pass account when clicking on xmpp:?join link
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a5b17a87 by Philipp Hörist at 2018-07-06T22:17:05+02:00 Pass account when clicking on xmpp:?join link - - - - - 1 changed file: - gajim/conversation_textview.py Changes: ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -781,7 +781,7 @@ class ConversationTextview(GObject.GObject): if '?' in word: (jid, action) = word.split('?') if action == 'join': - app.interface.join_gc_minimal(None, jid) + app.interface.join_gc_minimal(self.account, jid) else: self.on_start_chat_activate(None, jid) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a5b17a87a978a405e8beb55c93776f82fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a5b17a87a978a405e8beb55c93776f82fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework JoinGroupchat Dialog
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4fa4484d by Sophie Herold at 2018-07-06T22:14:32+02:00 Rework JoinGroupchat Dialog - - - - - 4 changed files: - gajim/common/app.py - gajim/data/gui/join_groupchat_window.ui - gajim/data/style/gajim.css - gajim/dialogs.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -389,6 +389,19 @@ def get_connected_accounts(): account_list.append(account) return account_list +def get_enabled_accounts_with_labels(exclude_local=True): + """ + Returns a list with [account, account_label] entries. + Order by account_label + """ + accounts = [] + for acc in connections: + if not exclude_local or acc != 'Local': + acc_label = config.get_per('accounts', acc, 'account_label') + accounts.append([acc, acc_label]) + accounts.sort(key=lambda xs: str.lower(xs[1])) + return accounts + def account_is_connected(account): if account not in connections: return False ===================================== gajim/data/gui/join_groupchat_window.ui ===================================== --- a/gajim/data/gui/join_groupchat_window.ui +++ b/gajim/data/gui/join_groupchat_window.ui @@ -1,170 +1,433 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> - <object class="GtkGrid" id="grid"> - <property name="visible">True</property> + <object class="GtkListStore" id="account_liststore"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkListStore" id="recently_liststorex"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkPopoverMenu" id="recently_popover"> <property name="can_focus">False</property> - <property name="margin_left">18</property> - <property name="margin_right">18</property> - <property name="margin_top">18</property> - <property name="margin_bottom">18</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="jid_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">center</property> - <property name="margin_bottom">12</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkSwitch" id="bookmark_switch"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Bookmark this Groupchat</property> - <property name="halign">start</property> - <property name="valign">center</property> + <property name="margin_left">6</property> + <property name="margin_right">6</property> <property name="margin_top">6</property> - <property name="active">True</property> - <signal name="notify::active" handler="_on_bookmark_activate" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkSwitch" id="autojoin_switch"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Join this Groupchat every time Gajim is started</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="active">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">8</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="margin_top">6</property> - <property name="label" translatable="yes">Bookmark</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="label" translatable="yes">Autojoin</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="account_combo"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="valign">center</property> - <signal name="changed" handler="_on_account_combo_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="nick_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="account_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Account</property> + <property name="margin_bottom">6</property> + <property name="max_content_width">300</property> + <property name="max_content_height">300</property> + <property name="propagate_natural_width">True</property> + <property name="propagate_natural_height">True</property> + <child> + <object class="GtkTreeView" id="recently_treeview"> + <property name="name">recently_treeview</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">recently_liststorex</property> + <property name="headers_visible">False</property> + <property name="enable_search">False</property> + <property name="hover_selection">True</property> + <property name="show_expanders">False</property> + <property name="activate_on_single_click">True</property> + <signal name="row-activated" handler="_on_recent_selected" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="title" translatable="yes">column</property> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">3</attribute> + </attributes> + </child> + </object> + </child> + <style> + <class name="popover_treeview"/> + </style> + </object> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="submenu">main</property> + <property name="position">1</property> </packing> </child> + </object> + <object class="GtkBox" id="main_box"> + <property name="width_request">400</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">18</property> + <property name="margin_right">18</property> + <property name="margin_top">18</property> + <property name="margin_bottom">18</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> <child> - <object class="GtkLabel"> + <object class="GtkGrid" id="grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Nickname</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="password_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Password</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="password_entry"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="input_purpose">password</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkSwitch" id="autojoin_switch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Join group chat every time Gajim is started</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="active">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="label" translatable="yes">Autojoin</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="account_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Account</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="room_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Room</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="server_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Server</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="password_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Password</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="nick_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Nickname</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="height_request">6</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="height_request">6</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkSwitch" id="bookmark_switch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Bookmark group chat</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="active">True</property> + <signal name="notify::active" handler="_on_bookmark_activate" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="label" translatable="yes">Bookmark</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="height_request">6</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="account_combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">account_liststore</property> + <property name="id_column">0</property> + <signal name="changed" handler="_on_account_combo_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="password_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="activates_default">True</property> + <property name="input_purpose">password</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkEntry" id="room_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="recently_button"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Recently used channels</property> + <property name="popover">recently_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">document-open-recent-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="search_button"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Search the rooms on this server</property> + <signal name="clicked" handler="_on_search_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">system-search-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="server_combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry"> + <property name="can_focus">True</property> + <property name="caps_lock_warning">False</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> - <property name="width">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> <object class="GtkButtonBox" id="button_box"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="margin_top">18</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <property name="layout_style">end</property> <child> <object class="GtkButton"> @@ -201,140 +464,9 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">9</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="server_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Server</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="room_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Room</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="recent_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Recently</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="room_entry"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="recent_combo"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <signal name="changed" handler="_on_recent_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="server_combo"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry"> - <property name="can_focus">True</property> - <property name="caps_lock_warning">False</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkButton" id="search_button"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Search the rooms on this server</property> - <signal name="clicked" handler="_on_search_clicked" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">system-search-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <object class="GtkHeaderBar" id="headerbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="title" translatable="yes">Join Groupchat</property> - <child> - <object class="GtkButton"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="_on_cancel_clicked" swapped="no"/> - </object> - </child> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Join</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="use_underline">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_on_join_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="pack_type">end</property> - <property name="position">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> ===================================== gajim/data/style/gajim.css ===================================== --- a/gajim/data/style/gajim.css +++ b/gajim/data/style/gajim.css @@ -90,6 +90,11 @@ popover#EmoticonPopover flowboxchild { padding-top: 5px; padding-bottom: 5px; } #StartChatListBox > row { padding: 10px 20px 10px 10px; } #StartChatListBox > row:not(.activatable) label { color: @insensitive_fg_color } +/* Popover Treeview */ +.popover_treeview { border-radius: 3px; background-color: @theme_bg_color; } +.popover_treeview { padding: 6px; } +.popover_treeview :hover { background-color: @theme_selected_bg_color; } + /* Text style */ .bold16 { font-size: 16px; font-weight: bold; } ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2300,7 +2300,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): self.set_show_menubar(False) self.set_resizable(False) self.set_position(Gtk.WindowPosition.CENTER) - self.set_title(_('Join Groupchat')) + self.set_title(_('Join Group Chat')) if transient_for: self.set_transient_for(transient_for) @@ -2309,93 +2309,86 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): self.requested_jid = None self.room_jid = room_jid self.account = account - self.minimal_mode = 0 # 2: very mini, 1: with room, 0: show all - if room_jid is not None: - if '@' in room_jid: - self.minimal_mode = 2 - else: - self.minimal_mode = 1 - glade_objects = ['grid', 'nick_entry', 'account_combo', 'jid_label', - 'bookmark_switch', 'autojoin_switch', 'headerbar', - 'account_label', 'password_entry', 'password_label', - 'join_button', 'button_box', 'server_label', - 'server_combo', 'recent_label', 'recent_combo', - 'room_label', 'room_entry', 'search_button'] + if self.room_jid is None: + self.minimal_mode = False + else: + self.minimal_mode = True - minimal_widgets = ['jid_label'] - room_widgets = ['room_label', 'room_entry'] + glade_objects = ['main_box', 'account_label', 'account_combo', + 'server_label', 'server_combo', 'room_entry', + 'recently_button', 'recently_popover', + 'recently_treeview', 'search_button', 'password_label', + 'password_entry', 'nick_entry', 'bookmark_switch', + 'autojoin_switch'] - extended_widgets = ['server_label', 'server_combo', 'recent_label', - 'recent_combo', 'room_label', 'room_entry', - 'search_button'] self.builder = gtkgui_helpers.get_gtk_builder( 'join_groupchat_window.ui') for obj in glade_objects: setattr(self, obj, self.builder.get_object(obj)) - self.add(self.grid) - - if os.environ.get('GTK_CSD', '1') == '1': - self.set_titlebar(self.headerbar) - else: - self.button_box.show() + self.add(self.main_box) # Show widgets depending on the mode the window is in - if self.minimal_mode > 0: - for widget in minimal_widgets: - getattr(self, widget).show() - if self.minimal_mode == 1: - for widget in room_widgets: - getattr(self, widget).show() - self.jid_label.set_text(room_jid) - else: - for widget in extended_widgets: - getattr(self, widget).show() + if not self.minimal_mode: + self.recently_button.show() + self.search_button.show() - if account is None: - connected_accounts = app.get_connected_accounts() - account = connected_accounts[0] - for acc in connected_accounts: - self.account_combo.append_text(acc) - else: - connected_accounts = [account] - self.account_combo.append_text(account) + accounts = app.get_enabled_accounts_with_labels() + account_liststore = self.account_combo.get_model() + for acc in accounts: + account_liststore.append(acc) + + if not accounts: + return + + if not self.account: + self.account = accounts[0][0] self.builder.connect_signals(self) self.connect('key-press-event', self._on_key_press_event) self.connect('destroy', self._on_destroy) - if self.minimal_mode == 0: + if not self.minimal_mode: app.ged.register_event_handler('agent-info-received', ged.GUI1, self._nec_agent_info_received) app.ged.register_event_handler('agent-info-error-received', ged.GUI1, self._nec_agent_info_error_received) # Show account combobox if there is more than one account - if len(connected_accounts) > 1: + if len(accounts) > 1: self.account_combo.show() self.account_label.show() - # Select first account - self.account_combo.set_active(0) + self.account_combo.set_active_id(self.account) + + if self.minimal_mode: + if '@' in self.room_jid: + (room, server) = self.room_jid.split('@') + self.room_entry.set_text(room) + if not muc_caps_cache.supports( + self.room_jid, 'muc_passwordprotected'): + self.password_entry.hide() + self.password_label.hide() + self.nick_entry.grab_focus() + else: + self.password_entry.grab_focus() + else: + server = self.room_jid + self.room_entry.grab_focus() + + self.server_combo.insert_text(0, server) + self.server_combo.set_active(0) if self.password is not None: self.password_entry.set_text(self.password) # Set bookmark switch sensitive if server supports bookmarks - acc = self.account_combo.get_active_text() + acc = self.account_combo.get_active_id() if not app.connections[acc].private_storage_supported: self.bookmark_switch.set_sensitive(False) self.autojoin_switch.set_sensitive(False) - # Show password field if we are in extended mode or - # The MUC is passwordprotected - if self.minimal_mode == 0 or muc_caps_cache.supports( - room_jid, 'muc_passwordprotected'): - self.password_entry.show() - self.password_label.show() - self.show_all() def set_room(self, room_jid): @@ -2404,16 +2397,18 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): self.server_combo.get_child().set_text(server) def _fill_recent_and_servers(self, account): - self.recent_combo.remove_all() + recently_liststore = self.recently_treeview.get_model() + recently_liststore.clear() self.server_combo.remove_all() recent = app.get_recent_groupchats(account) servers = [] for groupchat in recent: - text = '%s on %s@%s' % (groupchat.nickname, - groupchat.room, - groupchat.server) + label = '%s@%s' % (groupchat.room, groupchat.server) - self.recent_combo.append_text(text) + recently_liststore.append([groupchat.server, + groupchat.room, + groupchat.nickname, + label]) servers.append(groupchat.server) for server in set(servers): @@ -2424,24 +2419,18 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): if muc_domain is not None: self.server_combo.insert_text(0, muc_domain) - def _on_recent_changed(self, combo): - text = combo.get_active_text() - if text is None: - self.server_combo.set_active(0) - return - nickname, _, room_jid = text.split() - room, server = app.get_name_and_server_from_jid(room_jid) - self.room_entry.set_text(room) - self.nick_entry.set_text(nickname) - self.server_combo.get_child().set_text(server) + def _on_recent_selected(self, treeview, *args): + (model, iter_) = treeview.get_selection().get_selected() + self.server_combo.get_child().set_text(model[iter_][0]) + self.room_entry.set_text(model[iter_][1]) + self.nick_entry.set_text(model[iter_][2]) + self.recently_popover.popdown() def _on_account_combo_changed(self, combo): - account = combo.get_active_text() + account = combo.get_active_id() self.account = account self.nick_entry.set_text(app.nicks[account]) - if self.minimal_mode == 0: - self._fill_recent_and_servers(account) - self.recent_combo.set_active(0) + self._fill_recent_and_servers(account) def _on_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: @@ -2451,7 +2440,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): return True def _on_join_clicked(self, *args): - account = self.account_combo.get_active_text() + account = self.account_combo.get_active_id() nickname = self.nick_entry.get_text() invisible_show = app.SHOW_LIST.index('invisible') @@ -2459,18 +2448,15 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): app.interface.raise_dialog('join-while-invisible') return - if self.minimal_mode < 2: - if self.minimal_mode == 0: - server = self.server_combo.get_active_text() - else: # mode 1 - server = self.room_jid - room = self.room_entry.get_text() - if room == '': - ErrorDialog(_('Invalid Room'), - _('Please choose a room'), transient_for=self) - return - self.room_jid = '%s@%s' % (room, server) + server = self.server_combo.get_active_text() + room = self.room_entry.get_text() + + if room == '': + ErrorDialog(_('Invalid Room'), + _('Please choose a room'), transient_for=self) + return + self.room_jid = '%s@%s' % (room, server) self.room_jid = self.room_jid.lower() if app.in_groupchat(account, self.room_jid): @@ -2518,7 +2504,10 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): self.destroy() def _on_bookmark_activate(self, switch, param): - self.autojoin_switch.set_sensitive(switch.get_active()) + bookmark_state = switch.get_active() + self.autojoin_switch.set_sensitive(bookmark_state) + if not bookmark_state: + self.autojoin_switch.set_active(False) def _add_bookmark(self, account, nickname, password): con = app.connections[account] @@ -2537,7 +2526,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): name, self.room_jid, autojoin, 1, password, nickname) def _on_destroy(self, *args): - if self.minimal_mode == 0: + if not self.minimal_mode: app.ged.remove_event_handler('agent-info-received', ged.GUI1, self._nec_agent_info_received) app.ged.remove_event_handler('agent-info-error-received', ged.GUI1, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4fa4484dfd41b173dcf47908e90777e8c5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4fa4484dfd41b173dcf47908e90777e8c5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Call JoinGroupchat Dialog with account
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 15bcd80e by Philipp Hörist at 2018-07-06T21:56:17+02:00 Call JoinGroupchat Dialog with account - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -3636,7 +3636,8 @@ class RosterWindow: """ When the join gc menuitem is clicked, show the join gc window """ - app.app.activate_action('join-groupchat') + app.app.activate_action('%s-join-groupchat' % account, + GLib.Variant('s', account)) def on_show_transports_action(self, action, param): app.config.set('show_transports_group', param.get_boolean()) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/15bcd80e1980603ac6e87522e7ae7560ef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/15bcd80e1980603ac6e87522e7ae7560ef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use open JoinGroupchat Dialog when browsing MUCs
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 63a27ace by Philipp Hörist at 2018-07-06T21:43:53+02:00 Use open JoinGroupchat Dialog when browsing MUCs - - - - - 2 changed files: - gajim/common/app.py - gajim/disco.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -583,6 +583,9 @@ def prefers_app_menu(): def get_app_window(cls): for win in app.get_windows(): - if isinstance(win, cls): + if isinstance(cls, str): + if type(win).__name__ == cls: + return win + elif isinstance(win, cls): return win return None ===================================== gajim/disco.py ===================================== --- a/gajim/disco.py +++ b/gajim/disco.py @@ -1797,11 +1797,12 @@ class MucBrowser(AgentBrowser): if not iter_: return service = model[iter_][0] - if 'join_gc' not in app.interface.instances[self.account]: + window = app.get_app_window('JoinGroupchatWindow') + if window is None: app.interface.join_gc_minimal(self.account, service) else: - app.interface.instances[self.account]['join_gc'].set_room(service) - app.interface.instances[self.account]['join_gc'].present() + window.set_room(service) + window.present() self.window.destroy() def update_actions(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/63a27ace61848047ea345790f6bdcce3db… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/63a27ace61848047ea345790f6bdcce3db… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Move rest of UserAvatar into new module
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ccb3c2de by Philipp Hörist at 2018-07-06T19:55:13+02:00 Move rest of UserAvatar into new module - - - - - 6a363678 by Philipp Hörist at 2018-07-06T20:05:57+02:00 Dont handle all pep events - - - - - 70661b70 by Philipp Hörist at 2018-07-06T20:12:50+02:00 Rename method to something more appropriate - - - - - d45fa13e by Philipp Hörist at 2018-07-06T21:02:06+02:00 Refactor atom into new module and disable it Gajim lacks a good UI for microblogging Fixes #9218 - - - - - 10 changed files: - − gajim/common/atom.py - gajim/common/connection_handlers_events.py - gajim/common/const.py - + gajim/common/modules/atom.py - gajim/common/modules/pep.py - gajim/common/modules/user_avatar.py - gajim/common/modules/user_nickname.py - gajim/common/pep.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/common/atom.py deleted ===================================== --- a/gajim/common/atom.py +++ /dev/null @@ -1,176 +0,0 @@ -# -*- coding: utf-8 -*- -## src/common/atom.py -## -## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> -## Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -""" -Atom (rfc 4287) feed parser, used to read data from atom-over-pubsub transports -and services. Very simple. Actually implements only atom:entry. Implement more features -if you need -""" - -# suggestion: rewrite functions that return dates to return standard python time tuples, -# exteneded to contain timezone - -import nbxmpp -import time - -class PersonConstruct(nbxmpp.Node, object): - """ - Not used for now, as we don't need authors/contributors in pubsub.com feeds. - They rarely exist there - """ - - def __init__(self, node): - ''' Create person construct from node. ''' - nbxmpp.Node.__init__(self, node=node) - - def get_name(self): - return self.getTagData('name') - - name = property(get_name, None, None, - '''Conveys a human-readable name for the person. Should not be None, - although some badly generated atom feeds don't put anything here - (this is non-standard behavior, still pubsub.com sometimes does that.)''') - - def get_uri(self): - return self.getTagData('uri') - - uri = property(get_uri, None, None, - '''Conveys an IRI associated with the person. Might be None when not set.''') - - def get_email(self): - return self.getTagData('email') - - email = property(get_email, None, None, - '''Conveys an e-mail address associated with the person. Might be None when - not set.''') - -class Entry(nbxmpp.Node, object): - def __init__(self, node=None): - nbxmpp.Node.__init__(self, 'entry', node=node) - - def __repr__(self): - return '<Atom:Entry object of id="%r">' % self.getAttr('id') - -class OldEntry(nbxmpp.Node, object): - """ - Parser for feeds from pubsub.com. They use old Atom 0.3 format with their - extensions - """ - - def __init__(self, node=None): - ''' Create new Atom 0.3 entry object. ''' - nbxmpp.Node.__init__(self, 'entry', node=node) - - def __repr__(self): - return '<Atom0.3:Entry object of id="%r">' % self.getAttr('id') - - def get_feed_title(self): - """ - Return title of feed, where the entry was created. The result is the feed - name concatenated with source-feed title - """ - if self.parent is not None: - main_feed = self.parent.getTagData('title') - else: - main_feed = None - - if self.getTag('feed') is not None: - source_feed = self.getTag('feed').getTagData('title') - else: - source_feed = None - - - if main_feed is not None and source_feed is not None: - return '%s: %s' % (main_feed, source_feed) - elif main_feed is not None: - return main_feed - elif source_feed is not None: - return source_feed - else: - return '' - - feed_title = property(get_feed_title, None, None, - ''' Title of feed. It is built from entry''s original feed title and title of feed - which delivered this entry. ''') - - def get_feed_link(self): - """ - Get source link - """ - try: - return self.getTag('feed').getTags('link', {'rel':'alternate'})[1].getData() - except Exception: - return None - - feed_link = property(get_feed_link, None, None, - ''' Link to main webpage of the feed. ''') - - def get_title(self): - """ - Get an entry's title - """ - return self.getTagData('title') - - title = property(get_title, None, None, - ''' Entry's title. ''') - - def get_uri(self): - """ - Get the uri the entry points to (entry's first link element with - rel='alternate' or without rel attribute) - """ - for element in self.getTags('link'): - if 'rel' in element.attrs and element.attrs['rel']!='alternate': continue - try: - return element.attrs['href'] - except AttributeError: - pass - return None - - uri = property(get_uri, None, None, - ''' URI that is pointed by the entry. ''') - - def get_updated(self): - """ - Get the time the entry was updated last time - - This should be standarized, but pubsub.com sends it in human-readable - format. We won't try to parse it. (Atom 0.3 uses the word «modified» for - that). - - If there's no time given in the entry, we try with <published> - and <issued> elements. - """ - for name in ('updated', 'modified', 'published', 'issued'): - date = self.getTagData(name) - if date is not None: break - - if date is None: - # it is not in the standard format - return time.asctime() - - return date - - updated = property(get_updated, None, None, - ''' Last significant modification time. ''') - - feed_tagline = '' ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -22,7 +22,6 @@ # pylint: disable=attribute-defined-outside-init from calendar import timegm -import datetime import hashlib import hmac import logging @@ -33,7 +32,6 @@ import OpenSSL.crypto import nbxmpp from nbxmpp.protocol import NS_CHATSTATES -from gajim.common import atom from gajim.common import nec from gajim.common import helpers from gajim.common import app @@ -1759,24 +1757,6 @@ class PEPReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.pep_type = pep.type_ return True - items = self.event_tag.getTag('items') - if items: - # for each entry in feed (there shouldn't be more than one, but to - # be sure... - for item in items.getTags('item'): - entry = item.getTag('entry', namespace=nbxmpp.NS_ATOM) - if entry: - app.nec.push_incoming_event(AtomEntryReceived(None, - conn=self.conn, node=entry)) - -class AtomEntryReceived(nec.NetworkIncomingEvent): - name = 'atom-entry-received' - base_network_events = [] - - def generate(self): - self.atom_entry = atom.OldEntry(node=self.node) - return True - class PlainConnectionEvent(nec.NetworkIncomingEvent): name = 'plain-connection' base_network_events = [] ===================================== gajim/common/const.py ===================================== --- a/gajim/common/const.py +++ b/gajim/common/const.py @@ -152,6 +152,8 @@ class PEPEventType(IntEnum): MOOD = 2 LOCATION = 3 NICKNAME = 4 + AVATAR = 5 + ATOM = 6 ACTIVITIES = { ===================================== gajim/common/modules/atom.py ===================================== --- /dev/null +++ b/gajim/common/modules/atom.py @@ -0,0 +1,226 @@ +# Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> +# Tomasz Melcer <liori AT exroot.org> +# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> +# +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +""" +Atom (rfc 4287) feed parser, used to read data from atom-over-pubsub transports +and services. Very simple. Actually implements only atom:entry. +Implement more features if you need +""" + +# XEP-0277: Microblogging over XMPP + +# Module is disabled for now because Gajim lacks a good UI for that +# register the module in connection.py with register_module() to activate again + +import logging +import nbxmpp +import time + +from gajim.common.const import PEPEventType +from gajim.common.exceptions import StanzaMalformed +from gajim.common.modules.pep import AbstractPEPModule, AbstractPEPData + +log = logging.getLogger('gajim.c.m.atom') + + +class AtomData(AbstractPEPData): + + type_ = PEPEventType.ATOM + + def __init__(self, atom): + self._pep_specific_data = atom + + def get_entry(self): + return self._pep_specific_data + + +class Atom(AbstractPEPModule): + + name = 'atom' + namespace = 'urn:xmpp:microblog:0' + pep_class = AtomData + store_publish = False + _log = log + + def __init__(self, con): + AbstractPEPModule.__init__(self, con, con.name) + + self.handlers = [] + + def _extract_info(self, item): + entry = item.getTag('entry', namespace=nbxmpp.NS_ATOM) + if entry is None: + StanzaMalformed('no entry node') + + return OldEntry(node=entry) or None + + +class PersonConstruct(nbxmpp.Node, object): + """ + Not used for now, as we don't need authors/contributors + in pubsub.com feeds. They rarely exist there + """ + + def __init__(self, node): + ''' Create person construct from node. ''' + nbxmpp.Node.__init__(self, node=node) + + def get_name(self): + return self.getTagData('name') + + name = property( + get_name, None, None, + '''Conveys a human-readable name for the person. Should not be None, + although some badly generated atom feeds don't put anything here + (this is non-standard behavior, still pubsub.com sometimes does that.)''') + + def get_uri(self): + return self.getTagData('uri') + + uri = property( + get_uri, None, None, + '''Conveys an IRI associated with the person. + Might be None when not set.''') + + def get_email(self): + return self.getTagData('email') + + email = property( + get_email, None, None, + '''Conveys an e-mail address associated with the person. Might be None when + not set.''') + + +class Entry(nbxmpp.Node, object): + def __init__(self, node=None): + nbxmpp.Node.__init__(self, 'entry', node=node) + + def __repr__(self): + return '<Atom:Entry object of id="%r">' % self.getAttr('id') + + +class OldEntry(nbxmpp.Node, object): + """ + Parser for feeds from pubsub.com. They use old Atom 0.3 format with their + extensions + """ + + def __init__(self, node=None): + ''' Create new Atom 0.3 entry object. ''' + nbxmpp.Node.__init__(self, 'entry', node=node) + + def __repr__(self): + return '<Atom0.3:Entry object of id="%r">' % self.getAttr('id') + + def get_feed_title(self): + """ + Return title of feed, where the entry was created. + The result is the feed name concatenated with source-feed title + """ + if self.parent is not None: + main_feed = self.parent.getTagData('title') + else: + main_feed = None + + if self.getTag('feed') is not None: + source_feed = self.getTag('feed').getTagData('title') + else: + source_feed = None + + if main_feed is not None and source_feed is not None: + return '%s: %s' % (main_feed, source_feed) + elif main_feed is not None: + return main_feed + elif source_feed is not None: + return source_feed + else: + return '' + + feed_title = property( + get_feed_title, None, None, + ''' Title of feed. It is built from entry''s original feed title + and title of feed which delivered this entry. ''') + + def get_feed_link(self): + """ + Get source link + """ + try: + return self.getTag('feed').getTags('link', {'rel': 'alternate'})[1].getData() + except Exception: + return None + + feed_link = property( + get_feed_link, None, None, + ''' Link to main webpage of the feed. ''') + + def get_title(self): + """ + Get an entry's title + """ + return self.getTagData('title') + + title = property( + get_title, None, None, + ''' Entry's title. ''') + + def get_uri(self): + """ + Get the uri the entry points to (entry's first link element with + rel='alternate' or without rel attribute) + """ + for element in self.getTags('link'): + if 'rel' in element.attrs and element.attrs['rel'] != 'alternate': + continue + try: + return element.attrs['href'] + except AttributeError: + pass + return None + + uri = property( + get_uri, None, None, + ''' URI that is pointed by the entry. ''') + + def get_updated(self): + """ + Get the time the entry was updated last time + + This should be standarized, but pubsub.com sends it in human-readable + format. We won't try to parse it. + (Atom 0.3 uses the word «modified» for that). + + If there's no time given in the entry, we try with <published> + and <issued> elements. + """ + for name in ('updated', 'modified', 'published', 'issued'): + date = self.getTagData(name) + if date is not None: + break + + if date is None: + # it is not in the standard format + return time.asctime() + + return date + + updated = property( + get_updated, None, None, + ''' Last significant modification time. ''') + + feed_tagline = '' ===================================== gajim/common/modules/pep.py ===================================== --- a/gajim/common/modules/pep.py +++ b/gajim/common/modules/pep.py @@ -134,14 +134,14 @@ class AbstractPEPModule: raise NotImplementedError def _push_event(self, jid, user_pep): - self._update_contacts(jid, user_pep) + self._notification_received(jid, user_pep) app.nec.push_incoming_event( PEPReceivedEvent(None, conn=self._con, jid=str(jid), pep_type=self.name, user_pep=user_pep)) - def _update_contacts(self, jid, user_pep): + def _notification_received(self, jid, user_pep): for contact in app.contacts.get_contacts(self._account, str(jid)): if user_pep: contact.pep[self.name] = user_pep ===================================== gajim/common/modules/user_avatar.py ===================================== --- a/gajim/common/modules/user_avatar.py +++ b/gajim/common/modules/user_avatar.py @@ -21,15 +21,31 @@ import binascii import nbxmpp from gajim.common import app +from gajim.common.const import PEPEventType from gajim.common.exceptions import StanzaMalformed +from gajim.common.modules.pep import AbstractPEPModule, AbstractPEPData log = logging.getLogger('gajim.c.m.user_avatar') -class UserAvatar: +class UserAvatarData(AbstractPEPData): + + type_ = PEPEventType.AVATAR + + def __init__(self, avatar): + self._pep_specific_data = avatar + + +class UserAvatar(AbstractPEPModule): + + name = 'user-avatar' + namespace = 'urn:xmpp:avatar:metadata' + pep_class = UserAvatarData + store_publish = False + _log = log + def __init__(self, con): - self._con = con - self._account = con.name + AbstractPEPModule.__init__(self, con, con.name) self.handlers = [] @@ -83,7 +99,7 @@ class UserAvatar: log.warning('Error: %s %s', stanza.getFrom(), error) return - log.info('Received: %s %s', jid, sha) + log.info('Received Avatar: %s %s', jid, sha) app.interface.save_avatar(data) if self._con.get_own_jid().bareMatch(jid): @@ -94,3 +110,45 @@ class UserAvatar: app.contacts.set_avatar(self._account, jid, sha) app.interface.update_avatar(self._account, jid) + + def _extract_info(self, item): + metadata = item.getTag('metadata', namespace=self.namespace) + if metadata is None: + raise StanzaMalformed('No metadata node') + + info = metadata.getTags('info', one=True) + if not info: + return None + + avatar = info.getAttrs() + return avatar or None + + def _notification_received(self, jid, user_pep): + avatar = user_pep._pep_specific_data + own_jid = self._con.get_own_jid() + if avatar is None: + # Remove avatar + log.info('Remove: %s', jid) + app.contacts.set_avatar(self._account, str(jid), None) + app.logger.set_avatar_sha(own_jid.getStripped(), str(jid), None) + app.interface.update_avatar(self._account, str(jid)) + else: + if own_jid.bareMatch(jid): + sha = app.config.get_per( + 'accounts', self._account, 'avatar_sha') + else: + sha = app.contacts.get_avatar_sha(self._account, str(jid)) + + if sha == avatar['id']: + log.info('Avatar already known: %s %s', + jid, avatar['id']) + return + self.get_pubsub_avatar(jid, avatar['id']) + + def send(self, data): + # Not implemented yet + return + + def retract(self): + # Not implemented yet + return ===================================== gajim/common/modules/user_nickname.py ===================================== --- a/gajim/common/modules/user_nickname.py +++ b/gajim/common/modules/user_nickname.py @@ -66,7 +66,7 @@ class UserNickname(AbstractPEPModule): item.addData(data) return item - def _update_contacts(self, jid, user_pep): + def _notification_received(self, jid, user_pep): for contact in app.contacts.get_contacts(self._account, str(jid)): contact.contact_name = user_pep.get_nick() ===================================== gajim/common/pep.py ===================================== --- a/gajim/common/pep.py +++ b/gajim/common/pep.py @@ -80,48 +80,4 @@ class AbstractPEP(object): pass -class AvatarNotificationPEP(AbstractPEP): - '''XEP-0084: Avatars''' - - type_ = 'avatar-notification' - namespace = 'urn:xmpp:avatar:metadata' - - def _extract_info(self, items): - self.avatar = None - for item in items.getTags('item'): - metadata = item.getTag('metadata') - if metadata is None: - app.log('c.m.user_avatar').warning( - 'Invalid avatar stanza:\n%s', items) - break - info = item.getTag('metadata').getTag('info') - if info is not None: - self.avatar = info.getAttrs() - break - - return (None, False) - - def _on_receive(self, jid, account): - con = app.connections[account] - if self.avatar is None: - # Remove avatar - app.log('c.m.user_avatar').info('Remove: %s', jid) - app.contacts.set_avatar(account, jid, None) - own_jid = con.get_own_jid().getStripped() - app.logger.set_avatar_sha(own_jid, jid, None) - app.interface.update_avatar(account, jid) - else: - sha = app.contacts.get_avatar_sha(account, jid) - app.log('c.m.user_avatar').info( - 'Update: %s %s', jid, self.avatar['id']) - if sha == self.avatar['id']: - app.log('c.m.user_avatar').info( - 'Avatar already known: %s %s', - jid, self.avatar['id']) - return - con.get_module('UserAvatar').get_pubsub_avatar( - jid, self.avatar['id']) - - -SUPPORTED_PERSONAL_USER_EVENTS = [ - AvatarNotificationPEP] +SUPPORTED_PERSONAL_USER_EVENTS = [] ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1166,7 +1166,10 @@ class Interface: @staticmethod def handle_atom_entry(obj): - AtomWindow.newAtomEntry(obj.atom_entry) + if obj != PEPEventType.ATOM: + return + if obj.get_entry(): + AtomWindow.newAtomEntry(obj.get_entry()) def handle_event_zc_name_conflict(self, obj): def on_ok(new_name): @@ -1503,7 +1506,7 @@ class Interface: self.handlers = { 'DB_ERROR': [self.handle_event_db_error], 'FILE_SEND_ERROR': [self.handle_event_file_send_error], - 'atom-entry-received': [self.handle_atom_entry], + 'pep-received': [self.handle_atom_entry], 'bad-gpg-passphrase': [self.handle_event_bad_gpg_passphrase], 'bookmarks-received': [self.handle_event_bookmarks], 'client-cert-passphrase': [ ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -64,6 +64,7 @@ from gajim.common import helpers from gajim.common import idle from gajim.common.exceptions import GajimGeneralException from gajim.common import i18n +from gajim.common.const import PEPEventType if app.is_installed('GEOCLUE'): from gajim.common import location_listener from gajim.common import ged @@ -2648,6 +2649,13 @@ class RosterWindow: self.remove_contact(jid, obj.conn.name, backend=True) def _nec_pep_received(self, obj): + if obj.user_pep.type_ not in (PEPEventType.ACTIVITY, + PEPEventType.TUNE, + PEPEventType.MOOD, + PEPEventType.LOCATION, + PEPEventType.NICKNAME): + return + if obj.jid == app.get_jid_from_account(obj.conn.name): self.draw_account(obj.conn.name) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0a6b2126b34dd9d627e203a630c185f2d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0a6b2126b34dd9d627e203a630c185f2d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add XEP-0084 namespaces
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e2ab1ecf by Philipp Hörist at 2018-07-06T19:18:20+02:00 Add XEP-0084 namespaces - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== --- a/nbxmpp/protocol.py +++ b/nbxmpp/protocol.py @@ -43,6 +43,8 @@ NS_ATOM = 'http://www.w3.org/2005/Atom' NS_ATTENTION = 'urn:xmpp:attention:0' # XEP-0224 NS_AUTH = 'jabber:iq:auth' NS_AVATAR = 'http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' +NS_AVATAR_METADATA = 'urn:xmpp:avatar:metadata' # XEP-0084 +NS_AVATAR_DATA = 'urn:xmpp:avatar:data' # XEP-0084 NS_BIND = 'urn:ietf:params:xml:ns:xmpp-bind' NS_BLOCKING = 'urn:xmpp:blocking' # XEP-0191 NS_BOB = 'urn:xmpp:bob' # XEP-0231 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e2ab1ecf6eb4ef53eec10d036c… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e2ab1ecf6eb4ef53eec10d036c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Raise NodeProcessed after processing ROSTERX
by Philipp Hörist 05 Jul '18

05 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0a6b2126 by Philipp Hörist at 2018-07-05T23:55:09+02:00 Raise NodeProcessed after processing ROSTERX - - - - - 1 changed file: - gajim/common/modules/roster_item_exchange.py Changes: ===================================== gajim/common/modules/roster_item_exchange.py ===================================== --- a/gajim/common/modules/roster_item_exchange.py +++ b/gajim/common/modules/roster_item_exchange.py @@ -44,7 +44,8 @@ class RosterItemExchange: items_list = stanza.getTag( 'x', namespace=nbxmpp.NS_ROSTERX).getChildren() if items_list is None: - return + raise nbxmpp.NodeProcessed + action = items_list[0].getAttr('action') if not action: action = 'add' @@ -77,7 +78,7 @@ class RosterItemExchange: exchange_items_list[jid] = [name, groups] if not exchange_items_list: - return + raise nbxmpp.NodeProcessed log.info('Items: %s', exchange_items_list) @@ -87,8 +88,7 @@ class RosterItemExchange: exchange_items_list=exchange_items_list, action=action)) - if stanza.name == 'iq': - raise nbxmpp.NodeProcessed + raise nbxmpp.NodeProcessed def send_contacts(self, contacts, fjid, type_='message'): if not app.account_is_connected(self._account): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0a6b2126b34dd9d627e203a630c185f2df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0a6b2126b34dd9d627e203a630c185f2df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Add message handlers for AUTH and ROSTERX
by Philipp Hörist 05 Jul '18

05 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 503ee35b by Philipp Hörist at 2018-07-05T21:09:55+02:00 Add message handlers for AUTH and ROSTERX - - - - - 51e85f14 by Philipp Hörist at 2018-07-05T21:41:28+02:00 Remove unused code - - - - - a1e1e56d by Philipp Hörist at 2018-07-05T22:03:06+02:00 Fix logic error when printing status - - - - - 6 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/modules/http_auth.py - gajim/common/modules/roster_item_exchange.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -630,7 +630,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.last_time_to_reconnect = None self.new_account_info = None self.new_account_form = None - self.last_io = app.idlequeue.current_time() self.last_sent = [] self.password = passwords.get_password(name) @@ -1512,7 +1511,6 @@ class Connection(CommonConnection, ConnectionHandlers): app.nec.push_incoming_event(AnonymousAuthEvent(None, conn=self, old_jid=old_jid, new_jid=new_jid)) if auth: - self.last_io = app.idlequeue.current_time() self.connected = 2 self.retrycount = 0 if self.on_connect_auth: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -302,6 +302,11 @@ class ConnectionHandlersBase: # We decrypt GPG messages one after the other. Keep queue in mem self.gpg_messages_to_decrypt = [] + # XEPs that are based on Message + self._message_namespaces = set([nbxmpp.NS_HTTP_AUTH, + nbxmpp.NS_PUBSUB_EVENT, + nbxmpp.NS_ROSTERX]) + app.ged.register_event_handler('iq-error-received', ged.CORE, self._nec_iq_error_received) app.ged.register_event_handler('presence-received', ged.CORE, @@ -1023,7 +1028,13 @@ ConnectionHTTPUpload): """ Called when we receive a message """ - if nbxmpp.NS_PUBSUB_EVENT in stanza.getProperties(): + + # Check if a child of the message contains any + # of these namespaces, so we dont execute the + # message handler for them. + # They have defined their own message handlers + # but nbxmpp executes less common handlers last + if self._message_namespaces & set(stanza.getProperties()): return log.debug('MessageCB') @@ -1192,9 +1203,6 @@ ConnectionHTTPUpload): # This way we'll really remove it app.to_be_removed[self.name].remove(jid) - def _StanzaArrivedCB(self, con, obj): - self.last_io = app.idlequeue.current_time() - def _MucOwnerCB(self, con, iq_obj): log.debug('MucOwnerCB') app.nec.push_incoming_event(MucOwnerReceivedEvent(None, conn=self, @@ -1459,10 +1467,7 @@ ConnectionHTTPUpload): con.RegisterHandler('iq', self._JingleCB, 'set', nbxmpp.NS_JINGLE) con.RegisterHandler('iq', self._ErrorCB, 'error') con.RegisterHandler('iq', self._IqCB) - con.RegisterHandler('iq', self._StanzaArrivedCB) con.RegisterHandler('iq', self._ResultCB, 'result') - con.RegisterHandler('presence', self._StanzaArrivedCB) - con.RegisterHandler('message', self._StanzaArrivedCB) con.RegisterHandler('unknown', self._StreamCB, nbxmpp.NS_XMPP_STREAMS, xmlns=nbxmpp.NS_STREAMS) con.RegisterHandler('iq', self._PubkeyGetCB, 'get', ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -914,18 +914,6 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.stanza.getFrom()) return - # check if the message is a roster item exchange (XEP-0144) - if self.stanza.getTag('x', namespace=nbxmpp.NS_ROSTERX): - self.conn.get_module('RosterItemExchange').received_item( - self.conn, self.stanza) - return - - # check if the message is a XEP-0070 confirmation request - if self.stanza.getTag('confirm', namespace=nbxmpp.NS_HTTP_AUTH): - self.conn.get_module('HTTPAuth').answer_request( - self.conn, self.stanza) - return - try: self.get_jid_resource() except helpers.InvalidFormat: ===================================== gajim/common/modules/http_auth.py ===================================== --- a/gajim/common/modules/http_auth.py +++ b/gajim/common/modules/http_auth.py @@ -30,7 +30,8 @@ class HTTPAuth: self._account = con.name self.handlers = [ - ('iq', self.answer_request, 'get', nbxmpp.NS_HTTP_AUTH) + ('iq', self.answer_request, 'get', nbxmpp.NS_HTTP_AUTH), + ('message', self.answer_request, '', nbxmpp.NS_HTTP_AUTH) ] def answer_request(self, con, stanza): ===================================== gajim/common/modules/roster_item_exchange.py ===================================== --- a/gajim/common/modules/roster_item_exchange.py +++ b/gajim/common/modules/roster_item_exchange.py @@ -31,7 +31,8 @@ class RosterItemExchange: self._account = con.name self.handlers = [ - ('iq', self.received_item, 'set', nbxmpp.NS_ROSTERX) + ('iq', self.received_item, 'set', nbxmpp.NS_ROSTERX), + ('message', self.received_item, '', nbxmpp.NS_ROSTERX) ] def received_item(self, con, stanza): ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1978,8 +1978,11 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] bookmarks = con.get_module('Bookmarks').bookmarks bookmark = bookmarks.get(self.room_jid, None) - print_status = bookmark.get( - 'print_status', app.config.get('print_status_in_muc')) + if bookmark is None or not bookmark['print_status']: + print_status = app.config.get('print_status_in_muc') + else: + print_status = bookmark['print_status'] + if obj.show == 'offline': if obj.nick in self.attention_list: self.attention_list.remove(obj.nick) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fe3c1b4fbdb206c1d9fac096d37dffce0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fe3c1b4fbdb206c1d9fac096d37dffce0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Refactor UserMood into own module
by Philipp Hörist 05 Jul '18

05 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 14f088c2 by Philipp Hörist at 2018-07-05T19:37:51+02:00 Refactor UserMood into own module - - - - - bbf3a544 by Philipp Hörist at 2018-07-05T19:38:03+02:00 Refactor UserLocation into own module - - - - - 31d62358 by Philipp Hörist at 2018-07-05T19:38:41+02:00 Fix retracting UserTune/UserActivity - - - - - b04f9af4 by Philipp Hörist at 2018-07-05T19:54:32+02:00 Fix copy/paste typo - - - - - fe3c1b4f by Philipp Hörist at 2018-07-05T20:20:22+02:00 Refactor UserNickname into own module - - - - - 19 changed files: - gajim/chat_control.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/const.py - gajim/common/location_listener.py - gajim/common/modules/pep.py - gajim/common/modules/user_activity.py - + gajim/common/modules/user_location.py - + gajim/common/modules/user_mood.py - + gajim/common/modules/user_nickname.py - gajim/common/modules/user_tune.py - gajim/common/pep.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/dialogs.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/profile_window.py - gajim/roster_window.py - gajim/tooltips.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -122,7 +122,7 @@ class ChatControl(ChatControlBase): self._pep_images['mood'] = self.xml.get_object('mood_image') self._pep_images['activity'] = self.xml.get_object('activity_image') self._pep_images['tune'] = self.xml.get_object('tune_image') - self._pep_images['location'] = self.xml.get_object('location_image') + self._pep_images['geoloc'] = self.xml.get_object('location_image') self.update_all_pep_types() self.show_avatar() @@ -422,7 +422,7 @@ class ChatControl(ChatControlBase): if obj.jid != self.contact.jid: return - if obj.pep_type == 'nickname': + if obj.pep_type == 'nick': self.update_ui() self.parent_win.redraw_tab(self) self.parent_win.show_title() @@ -584,8 +584,8 @@ class ChatControl(ChatControlBase): return True def on_location_eventbox_button_release_event(self, widget, event): - if 'location' in self.contact.pep: - location = self.contact.pep['location']._pep_specific_data + if 'geoloc' in self.contact.pep: + location = self.contact.pep['geoloc']._pep_specific_data if ('lat' in location) and ('lon' in location): uri = 'https://www.openstreetmap.org/?' + \ 'mlat=%(lat)s&mlon=%(lon)s&zoom=16' % {'lat': location['lat'], ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -80,6 +80,9 @@ from gajim.common.modules.pep import PEP from gajim.common.modules.user_avatar import UserAvatar from gajim.common.modules.user_activity import UserActivity from gajim.common.modules.user_tune import UserTune +from gajim.common.modules.user_mood import UserMood +from gajim.common.modules.user_location import UserLocation +from gajim.common.modules.user_nickname import UserNickname from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact from gajim.gtkgui_helpers import get_action @@ -632,7 +635,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.password = passwords.get_password(name) self.music_track_info = 0 - self.location_info = {} + self.register_supported = False self.pubsub_publish_options_supported = False # Do we auto accept insecure connection @@ -676,6 +679,9 @@ class Connection(CommonConnection, ConnectionHandlers): self.register_module('UserAvatar', UserAvatar, self) self.register_module('UserActivity', UserActivity, self) self.register_module('UserTune', UserTune, self) + self.register_module('UserMood', UserMood, self) + self.register_module('UserLocation', UserLocation, self) + self.register_module('UserNickname', UserNickname, self) app.ged.register_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) @@ -761,7 +767,6 @@ class Connection(CommonConnection, ConnectionHandlers): # We are doing disconnect at so many places, better use one function in all def disconnect(self, on_purpose=False): app.interface.music_track_changed(None, None, self.name) - self.reset_awaiting_pep() self.get_module('PEP').reset_stored_publish() self.on_purpose = on_purpose self.connected = 0 ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -42,7 +42,6 @@ from gi.repository import GLib import nbxmpp from gajim.common import caps_cache as capscache -from gajim.common.pep import LOCATION_DATA from gajim.common import helpers from gajim.common import app from gajim.common import dataforms @@ -282,98 +281,6 @@ class ConnectionDisco: app.nec.push_incoming_event(AgentInfoReceivedEvent(None, conn=self, stanza=iq_obj)) - -class ConnectionPEP(object): - - def __init__(self, account, dispatcher, pubsub_connection): - self._account = account - self._dispatcher = dispatcher - self._pubsub_connection = pubsub_connection - self.reset_awaiting_pep() - - def pep_change_account_name(self, new_name): - self._account = new_name - - def reset_awaiting_pep(self): - self.to_be_sent_mood = None - self.to_be_sent_nick = None - self.to_be_sent_location = None - - def send_awaiting_pep(self): - """ - Send pep info that were waiting for connection - """ - if self.to_be_sent_mood: - self.send_mood(*self.to_be_sent_mood) - if self.to_be_sent_nick: - self.send_nick(self.to_be_sent_nick) - if self.to_be_sent_location: - self.send_location(self.to_be_sent_location) - self.reset_awaiting_pep() - - def send_mood(self, mood, message=None): - if self.connected == 1: - # We are connecting, keep mood in mem and send it when we'll be - # connected - self.to_be_sent_mood = (mood, message) - return - if not self.pep_supported: - return - item = nbxmpp.Node('mood', {'xmlns': nbxmpp.NS_MOOD}) - if mood: - item.addChild(mood) - if message: - i = item.addChild('text') - i.addData(message) - self.get_module('PubSub').send_pb_publish('', nbxmpp.NS_MOOD, item, '0') - - def retract_mood(self): - if not self.pep_supported: - return - self.send_mood(None) - # not all client support new XEP, so we still retract - self.get_module('PubSub').send_pb_retract('', nbxmpp.NS_MOOD, '0') - - def send_nickname(self, nick): - if self.connected == 1: - # We are connecting, keep nick in mem and send it when we'll be - # connected - self.to_be_sent_nick = nick - return - if not self.pep_supported: - return - item = nbxmpp.Node('nick', {'xmlns': nbxmpp.NS_NICK}) - item.addData(nick) - self.get_module('PubSub').send_pb_publish('', nbxmpp.NS_NICK, item, '0') - - def retract_nickname(self): - if not self.pep_supported: - return - - self.get_module('PubSub').send_pb_retract('', nbxmpp.NS_NICK, '0') - - def send_location(self, info): - if self.connected == 1: - # We are connecting, keep location in mem and send it when we'll be - # connected - self.to_be_sent_location = info - return - if not self.pep_supported: - return - item = nbxmpp.Node('geoloc', {'xmlns': nbxmpp.NS_LOCATION}) - for field in LOCATION_DATA: - if info.get(field, None): - i = item.addChild(field) - i.addData(info[field]) - self.get_module('PubSub').send_pb_publish('', nbxmpp.NS_LOCATION, item, '0') - - def retract_location(self): - if not self.pep_supported: - return - self.send_location({}) - # not all client support new XEP, so we still retract - self.get_module('PubSub').send_pb_retract('', nbxmpp.NS_LOCATION, '0') - # basic connection handlers used here and in zeroconf class ConnectionHandlersBase: def __init__(self): @@ -841,7 +748,7 @@ class ConnectionHandlersBase: class ConnectionHandlers(ConnectionArchive313, ConnectionSocks5Bytestream, ConnectionDisco, -ConnectionCommands, ConnectionPEP, ConnectionCaps, +ConnectionCommands, ConnectionCaps, ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream, ConnectionHTTPUpload): def __init__(self): @@ -849,8 +756,6 @@ ConnectionHTTPUpload): ConnectionSocks5Bytestream.__init__(self) ConnectionIBBytestream.__init__(self) ConnectionCommands.__init__(self) - ConnectionPEP.__init__(self, account=self.name, dispatcher=self, - pubsub_connection=self) ConnectionHTTPUpload.__init__(self) # Handle presences BEFORE caps @@ -1446,7 +1351,6 @@ ConnectionHTTPUpload): # Inform GUI we just signed in app.nec.push_incoming_event(SignedInEvent(None, conn=self)) - self.send_awaiting_pep() self.get_module('PEP').send_stored_publish() self.continue_connect_info = None ===================================== gajim/common/const.py ===================================== --- a/gajim/common/const.py +++ b/gajim/common/const.py @@ -4,6 +4,7 @@ from collections import namedtuple Option = namedtuple('Option', 'kind label type value name callback data desc enabledif props') Option.__new__.__defaults__ = (None,) * len(Option._fields) + @unique class OptionKind(IntEnum): ENTRY = 0 @@ -20,6 +21,7 @@ class OptionKind(IntEnum): CHANGEPASSWORD = 11 GPG = 12 + @unique class OptionType(IntEnum): ACCOUNT_CONFIG = 0 @@ -28,6 +30,7 @@ class OptionType(IntEnum): ACTION = 3 DIALOG = 4 + class AvatarSize(IntEnum): TAB = 16 ROSTER = 32 @@ -37,22 +40,26 @@ class AvatarSize(IntEnum): VCARD = 200 PUBLISH = 200 + class ArchiveState(IntEnum): NEVER = 0 ALL = 1 + @unique class PathLocation(IntEnum): CONFIG = 0 CACHE = 1 DATA = 2 + @unique class PathType(IntEnum): FILE = 0 FOLDER = 1 FOLDER_OPTIONAL = 2 + @unique class KindConstant(IntEnum): STATUS = 0 @@ -67,6 +74,7 @@ class KindConstant(IntEnum): def __str__(self): return str(self.value) + @unique class ShowConstant(IntEnum): ONLINE = 0 @@ -76,6 +84,7 @@ class ShowConstant(IntEnum): DND = 4 OFFLINE = 5 + @unique class TypeConstant(IntEnum): AIM = 0 @@ -94,6 +103,7 @@ class TypeConstant(IntEnum): MRIM = 13 NO_TRANSPORT = 14 + @unique class SubscriptionConstant(IntEnum): NONE = 0 @@ -101,11 +111,13 @@ class SubscriptionConstant(IntEnum): FROM = 2 BOTH = 3 + @unique class JIDConstant(IntEnum): NORMAL_TYPE = 0 ROOM_TYPE = 1 + @unique class IdleState(IntEnum): UNKNOWN = 0 @@ -113,26 +125,33 @@ class IdleState(IntEnum): AWAY = 2 AWAKE = 3 + @unique class RequestAvatar(IntEnum): SELF = 0 ROOM = 1 USER = 2 + @unique class BookmarkStorageType(IntEnum): PRIVATE = 0 PUBSUB = 1 + @unique class PEPHandlerType(IntEnum): NOTIFY = 0 RETRACT = 1 + @unique class PEPEventType(IntEnum): ACTIVITY = 0 TUNE = 1 + MOOD = 2 + LOCATION = 3 + NICKNAME = 4 ACTIVITIES = { @@ -226,6 +245,118 @@ ACTIVITIES = { 'studying': _('Studying'), 'writing': _('Writing')}} +MOODS = { + 'afraid': _('Afraid'), + 'amazed': _('Amazed'), + 'amorous': _('Amorous'), + 'angry': _('Angry'), + 'annoyed': _('Annoyed'), + 'anxious': _('Anxious'), + 'aroused': _('Aroused'), + 'ashamed': _('Ashamed'), + 'bored': _('Bored'), + 'brave': _('Brave'), + 'calm': _('Calm'), + 'cautious': _('Cautious'), + 'cold': _('Cold'), + 'confident': _('Confident'), + 'confused': _('Confused'), + 'contemplative': _('Contemplative'), + 'contented': _('Contented'), + 'cranky': _('Cranky'), + 'crazy': _('Crazy'), + 'creative': _('Creative'), + 'curious': _('Curious'), + 'dejected': _('Dejected'), + 'depressed': _('Depressed'), + 'disappointed': _('Disappointed'), + 'disgusted': _('Disgusted'), + 'dismayed': _('Dismayed'), + 'distracted': _('Distracted'), + 'embarrassed': _('Embarrassed'), + 'envious': _('Envious'), + 'excited': _('Excited'), + 'flirtatious': _('Flirtatious'), + 'frustrated': _('Frustrated'), + 'grateful': _('Grateful'), + 'grieving': _('Grieving'), + 'grumpy': _('Grumpy'), + 'guilty': _('Guilty'), + 'happy': _('Happy'), + 'hopeful': _('Hopeful'), + 'hot': _('Hot'), + 'humbled': _('Humbled'), + 'humiliated': _('Humiliated'), + 'hungry': _('Hungry'), + 'hurt': _('Hurt'), + 'impressed': _('Impressed'), + 'in_awe': _('In Awe'), + 'in_love': _('In Love'), + 'indignant': _('Indignant'), + 'interested': _('Interested'), + 'intoxicated': _('Intoxicated'), + 'invincible': _('Invincible'), + 'jealous': _('Jealous'), + 'lonely': _('Lonely'), + 'lost': _('Lost'), + 'lucky': _('Lucky'), + 'mean': _('Mean'), + 'moody': _('Moody'), + 'nervous': _('Nervous'), + 'neutral': _('Neutral'), + 'offended': _('Offended'), + 'outraged': _('Outraged'), + 'playful': _('Playful'), + 'proud': _('Proud'), + 'relaxed': _('Relaxed'), + 'relieved': _('Relieved'), + 'remorseful': _('Remorseful'), + 'restless': _('Restless'), + 'sad': _('Sad'), + 'sarcastic': _('Sarcastic'), + 'satisfied': _('Satisfied'), + 'serious': _('Serious'), + 'shocked': _('Shocked'), + 'shy': _('Shy'), + 'sick': _('Sick'), + 'sleepy': _('Sleepy'), + 'spontaneous': _('Spontaneous'), + 'stressed': _('Stressed'), + 'strong': _('Strong'), + 'surprised': _('Surprised'), + 'thankful': _('Thankful'), + 'thirsty': _('Thirsty'), + 'tired': _('Tired'), + 'undefined': _('Undefined'), + 'weak': _('Weak'), + 'worried': _('Worried') +} + +LOCATION_DATA = { + 'accuracy': _('accuracy'), + 'alt': _('alt'), + 'area': _('area'), + 'bearing': _('bearing'), + 'building': _('building'), + 'country': _('country'), + 'countrycode': _('countrycode'), + 'datum': _('datum'), + 'description': _('description'), + 'error': _('error'), + 'floor': _('floor'), + 'lat': _('lat'), + 'locality': _('locality'), + 'lon': _('lon'), + 'postalcode': _('postalcode'), + 'region': _('region'), + 'room': _('room'), + 'speed': _('speed'), + 'street': _('street'), + 'text': _('text'), + 'timestamp': _('timestamp'), + 'uri': _('URI') +} + SSLError = { 2: _("Unable to get issuer certificate"), @@ -260,7 +391,7 @@ SSLError = { 31: _("Authority and issuer serial number mismatch"), 32: _("Key usage does not include certificate signing"), 50: _("Application verification failure"), - } +} THANKS = u"""\ ===================================== gajim/common/location_listener.py ===================================== --- a/gajim/common/location_listener.py +++ b/gajim/common/location_listener.py @@ -97,7 +97,7 @@ class LocationListener: del new_data['timestamp'] if last_data == new_data: continue - app.connections[acct].send_location(self._data) + app.connections[acct].get_module('UserLocation').send(self._data) self.location_info = self._data.copy() def _timestamp_to_utc(self, timestamp): ===================================== gajim/common/modules/pep.py ===================================== --- a/gajim/common/modules/pep.py +++ b/gajim/common/modules/pep.py @@ -195,6 +195,10 @@ class AbstractPEPData: type_ = PEPEventType + def asMarkupText(self): + '''SHOULD be implemented by subclasses''' + return '' + def __eq__(self, other): return other == self.type_ ===================================== gajim/common/modules/user_activity.py ===================================== --- a/gajim/common/modules/user_activity.py +++ b/gajim/common/modules/user_activity.py @@ -87,8 +87,10 @@ class UserActivity(AbstractPEPModule): return activity_dict or None def _build_node(self, data): - activity, subactivity, message = data item = nbxmpp.Node('activity', {'xmlns': self.namespace}) + if data is None: + return + activity, subactivity, message = data if activity: i = item.addChild(activity) if subactivity: ===================================== gajim/common/modules/user_location.py ===================================== --- /dev/null +++ b/gajim/common/modules/user_location.py @@ -0,0 +1,85 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# XEP-0080: User Location + +import logging + +import nbxmpp +from gi.repository import GLib + +from gajim.common.const import PEPEventType, LOCATION_DATA +from gajim.common.exceptions import StanzaMalformed +from gajim.common.modules.pep import AbstractPEPModule, AbstractPEPData + +log = logging.getLogger('gajim.c.m.user_location') + + +class UserLocationData(AbstractPEPData): + + type_ = PEPEventType.LOCATION + + def __init__(self, location): + self._pep_specific_data = location + + def asMarkupText(self): + location = self._pep_specific_data + location_string = '' + + for entry in location.keys(): + text = location[entry] + text = GLib.markup_escape_text(text) + # Translate standard location tag + tag = LOCATION_DATA.get(entry, entry) + location_string += '\n<b>%(tag)s</b>: %(text)s' % { + 'tag': tag.capitalize(), 'text': text} + + return location_string.strip() + + +class UserLocation(AbstractPEPModule): + + name = 'geoloc' + namespace = nbxmpp.NS_LOCATION + pep_class = UserLocationData + store_publish = True + _log = log + + def __init__(self, con): + AbstractPEPModule.__init__(self, con, con.name) + + self.handlers = [] + + def _extract_info(self, item): + location_dict = {} + location_tag = item.getTag('geoloc', namespace=nbxmpp.NS_LOCATION) + if location_tag is None: + raise StanzaMalformed('No geoloc node') + + for child in location_tag.getChildren(): + name = child.getName().strip() + data = child.getData().strip() + if child.getName() in LOCATION_DATA: + location_dict[name] = data + + return location_dict or None + + def _build_node(self, data): + item = nbxmpp.Node('geoloc', {'xmlns': nbxmpp.NS_LOCATION}) + if data is None: + return item + for field in LOCATION_DATA: + if data.get(field, False): + item.addChild(field, payload=data[field]) + return item ===================================== gajim/common/modules/user_mood.py ===================================== --- /dev/null +++ b/gajim/common/modules/user_mood.py @@ -0,0 +1,88 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# XEP-0107: User Mood + +import logging + +import nbxmpp +from gi.repository import GLib + +from gajim.common.const import PEPEventType, MOODS +from gajim.common.exceptions import StanzaMalformed +from gajim.common.modules.pep import AbstractPEPModule, AbstractPEPData + +log = logging.getLogger('gajim.c.m.user_mood') + + +class UserMoodData(AbstractPEPData): + + type_ = PEPEventType.MOOD + + def __init__(self, mood): + self._pep_specific_data = mood + + def asMarkupText(self): + mood = self._translate_mood(self._pep_specific_data['mood']) + markuptext = '<b>%s</b>' % GLib.markup_escape_text(mood) + if 'text' in self._pep_specific_data: + text = self._pep_specific_data['text'] + markuptext += ' (%s)' % GLib.markup_escape_text(text) + return markuptext + + def _translate_mood(self, mood): + if mood in MOODS: + return MOODS[mood] + else: + return mood + + +class UserMood(AbstractPEPModule): + + name = 'mood' + namespace = nbxmpp.NS_MOOD + pep_class = UserMoodData + store_publish = True + _log = log + + def __init__(self, con): + AbstractPEPModule.__init__(self, con, con.name) + + self.handlers = [] + + def _extract_info(self, item): + mood_dict = {} + mood_tag = item.getTag('mood', namespace=nbxmpp.NS_MOOD) + if mood_tag is None: + raise StanzaMalformed('No mood node') + + for child in mood_tag.getChildren(): + name = child.getName().strip() + if name == 'text': + mood_dict['text'] = child.getData() + else: + mood_dict['mood'] = name + + return mood_dict or None + + def _build_node(self, data): + item = nbxmpp.Node('mood', {'xmlns': nbxmpp.NS_MOOD}) + if data is None: + return + mood, text = data + if mood: + item.addChild(mood) + if text: + item.addChild('text', payload=text) + return item ===================================== gajim/common/modules/user_nickname.py ===================================== --- /dev/null +++ b/gajim/common/modules/user_nickname.py @@ -0,0 +1,78 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# XEP-0172: User Nickname + +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common.const import PEPEventType +from gajim.common.exceptions import StanzaMalformed +from gajim.common.modules.pep import AbstractPEPModule, AbstractPEPData + +log = logging.getLogger('gajim.c.m.user_nickname') + + +class UserNicknameData(AbstractPEPData): + + type_ = PEPEventType.NICKNAME + + def __init__(self, nickname): + self._pep_specific_data = nickname + + def get_nick(self): + return self._pep_specific_data or '' + + +class UserNickname(AbstractPEPModule): + + name = 'nick' + namespace = nbxmpp.NS_NICK + pep_class = UserNicknameData + store_publish = True + _log = log + + def __init__(self, con): + AbstractPEPModule.__init__(self, con, con.name) + + self.handlers = [] + + def _extract_info(self, item): + nick = '' + child = item.getTag('nick', namespace=nbxmpp.NS_NICK) + if child is None: + raise StanzaMalformed('No nick node') + nick = child.getData() + + return nick or None + + def _build_node(self, data): + item = nbxmpp.Node('nick', {'xmlns': nbxmpp.NS_NICK}) + if data is None: + return + item.addData(data) + return item + + def _update_contacts(self, jid, user_pep): + for contact in app.contacts.get_contacts(self._account, str(jid)): + contact.contact_name = user_pep.get_nick() + + if jid == self._con.get_own_jid().getStripped(): + if user_pep: + app.nicks[self._account] = user_pep.get_nick() + else: + app.nicks[self._account] = app.config.get_per( + 'accounts', self._account, 'name') ===================================== gajim/common/modules/user_tune.py ===================================== --- a/gajim/common/modules/user_tune.py +++ b/gajim/common/modules/user_tune.py @@ -81,8 +81,10 @@ class UserTune(AbstractPEPModule): return tune_dict or None def _build_node(self, data): - artist, title, source, track, length = data item = nbxmpp.Node('tune', {'xmlns': nbxmpp.NS_TUNE}) + if data is None: + return item + artist, title, source, track, length = data if artist: item.addChild('artist', payload=artist) if title: ===================================== gajim/common/pep.py ===================================== --- a/gajim/common/pep.py +++ b/gajim/common/pep.py @@ -23,122 +23,9 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -MOODS = { - 'afraid': _('Afraid'), - 'amazed': _('Amazed'), - 'amorous': _('Amorous'), - 'angry': _('Angry'), - 'annoyed': _('Annoyed'), - 'anxious': _('Anxious'), - 'aroused': _('Aroused'), - 'ashamed': _('Ashamed'), - 'bored': _('Bored'), - 'brave': _('Brave'), - 'calm': _('Calm'), - 'cautious': _('Cautious'), - 'cold': _('Cold'), - 'confident': _('Confident'), - 'confused': _('Confused'), - 'contemplative': _('Contemplative'), - 'contented': _('Contented'), - 'cranky': _('Cranky'), - 'crazy': _('Crazy'), - 'creative': _('Creative'), - 'curious': _('Curious'), - 'dejected': _('Dejected'), - 'depressed': _('Depressed'), - 'disappointed': _('Disappointed'), - 'disgusted': _('Disgusted'), - 'dismayed': _('Dismayed'), - 'distracted': _('Distracted'), - 'embarrassed': _('Embarrassed'), - 'envious': _('Envious'), - 'excited': _('Excited'), - 'flirtatious': _('Flirtatious'), - 'frustrated': _('Frustrated'), - 'grateful': _('Grateful'), - 'grieving': _('Grieving'), - 'grumpy': _('Grumpy'), - 'guilty': _('Guilty'), - 'happy': _('Happy'), - 'hopeful': _('Hopeful'), - 'hot': _('Hot'), - 'humbled': _('Humbled'), - 'humiliated': _('Humiliated'), - 'hungry': _('Hungry'), - 'hurt': _('Hurt'), - 'impressed': _('Impressed'), - 'in_awe': _('In Awe'), - 'in_love': _('In Love'), - 'indignant': _('Indignant'), - 'interested': _('Interested'), - 'intoxicated': _('Intoxicated'), - 'invincible': _('Invincible'), - 'jealous': _('Jealous'), - 'lonely': _('Lonely'), - 'lost': _('Lost'), - 'lucky': _('Lucky'), - 'mean': _('Mean'), - 'moody': _('Moody'), - 'nervous': _('Nervous'), - 'neutral': _('Neutral'), - 'offended': _('Offended'), - 'outraged': _('Outraged'), - 'playful': _('Playful'), - 'proud': _('Proud'), - 'relaxed': _('Relaxed'), - 'relieved': _('Relieved'), - 'remorseful': _('Remorseful'), - 'restless': _('Restless'), - 'sad': _('Sad'), - 'sarcastic': _('Sarcastic'), - 'satisfied': _('Satisfied'), - 'serious': _('Serious'), - 'shocked': _('Shocked'), - 'shy': _('Shy'), - 'sick': _('Sick'), - 'sleepy': _('Sleepy'), - 'spontaneous': _('Spontaneous'), - 'stressed': _('Stressed'), - 'strong': _('Strong'), - 'surprised': _('Surprised'), - 'thankful': _('Thankful'), - 'thirsty': _('Thirsty'), - 'tired': _('Tired'), - 'undefined': _('Undefined'), - 'weak': _('Weak'), - 'worried': _('Worried')} - -LOCATION_DATA = { - 'accuracy': _('accuracy'), - 'alt': _('alt'), - 'area': _('area'), - 'bearing': _('bearing'), - 'building': _('building'), - 'country': _('country'), - 'countrycode': _('countrycode'), - 'datum': _('datum'), - 'description': _('description'), - 'error': _('error'), - 'floor': _('floor'), - 'lat': _('lat'), - 'locality': _('locality'), - 'lon': _('lon'), - 'postalcode': _('postalcode'), - 'region': _('region'), - 'room': _('room'), - 'speed': _('speed'), - 'street': _('street'), - 'text': _('text'), - 'timestamp': _('timestamp'), - 'uri': _('URI')} - -from gi.repository import GLib - import logging log = logging.getLogger('gajim.c.pep') -import nbxmpp from gajim.common import app @@ -193,116 +80,6 @@ class AbstractPEP(object): pass -class UserMoodPEP(AbstractPEP): - '''XEP-0107: User Mood''' - - type_ = 'mood' - namespace = nbxmpp.NS_MOOD - - def _extract_info(self, items): - mood_dict = {} - - for item in items.getTags('item'): - mood_tag = item.getTag('mood') - if mood_tag: - for child in mood_tag.getChildren(): - name = child.getName().strip() - if name == 'text': - mood_dict['text'] = child.getData() - else: - mood_dict['mood'] = name - - retracted = items.getTag('retract') or not 'mood' in mood_dict - return (mood_dict, retracted) - - def asMarkupText(self): - assert not self._retracted - untranslated_mood = self._pep_specific_data['mood'] - mood = self._translate_mood(untranslated_mood) - markuptext = '<b>%s</b>' % GLib.markup_escape_text(mood) - if 'text' in self._pep_specific_data: - text = self._pep_specific_data['text'] - markuptext += ' (%s)' % GLib.markup_escape_text(text) - return markuptext - - def _translate_mood(self, mood): - if mood in MOODS: - return MOODS[mood] - else: - return mood - - -class UserNicknamePEP(AbstractPEP): - '''XEP-0172: User Nickname''' - - type_ = 'nickname' - namespace = nbxmpp.NS_NICK - - def _extract_info(self, items): - nick = '' - for item in items.getTags('item'): - child = item.getTag('nick') - if child: - nick = child.getData() - break - - retracted = items.getTag('retract') or not nick - return (nick, retracted) - - def _update_contacts(self, jid, account): - nick = '' if self._retracted else self._pep_specific_data - for contact in app.contacts.get_contacts(account, jid): - contact.contact_name = nick - - def _update_account(self, account): - if self._retracted: - app.nicks[account] = app.config.get_per('accounts', account, 'name') - else: - app.nicks[account] = self._pep_specific_data - - -class UserLocationPEP(AbstractPEP): - '''XEP-0080: User Location''' - - type_ = 'location' - namespace = nbxmpp.NS_LOCATION - - def _extract_info(self, items): - location_dict = {} - - for item in items.getTags('item'): - location_tag = item.getTag('geoloc') - if location_tag: - for child in location_tag.getChildren(): - name = child.getName().strip() - data = child.getData().strip() - if child.getName() in LOCATION_DATA: - location_dict[name] = data - - retracted = items.getTag('retract') or not location_dict - return (location_dict, retracted) - - def _update_account(self, account): - AbstractPEP._update_account(self, account) - con = app.connections[account].location_info = \ - self._pep_specific_data - - def asMarkupText(self): - assert not self._retracted - location = self._pep_specific_data - location_string = '' - - for entry in location.keys(): - text = location[entry] - text = GLib.markup_escape_text(text) - # Translate standard location tag - tag = LOCATION_DATA.get(entry, entry) - location_string += '\n<b>%(tag)s</b>: %(text)s' % \ - {'tag': tag.capitalize(), 'text': text} - - return location_string.strip() - - class AvatarNotificationPEP(AbstractPEP): '''XEP-0084: Avatars''' @@ -347,5 +124,4 @@ class AvatarNotificationPEP(AbstractPEP): SUPPORTED_PERSONAL_USER_EVENTS = [ - UserMoodPEP, - UserNicknamePEP, UserLocationPEP, AvatarNotificationPEP] + AvatarNotificationPEP] ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_handlers_zeroconf.py +++ b/gajim/common/zeroconf/connection_handlers_zeroconf.py @@ -50,7 +50,7 @@ class ConnectionVcard: class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionSocks5BytestreamZeroconf, ConnectionCommands, -connection_handlers.ConnectionPEP, connection_handlers.ConnectionHandlersBase, +connection_handlers.ConnectionHandlersBase, connection_handlers.ConnectionJingle): def __init__(self): ConnectionVcard.__init__(self) ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -52,6 +52,7 @@ from gajim.common import ged from gajim.common import const from gajim.options_dialog import OptionsDialog from gajim.common.const import Option, OptionKind, OptionType, ACTIVITIES +from gajim.common.const import MOODS from gajim.common import app from gajim.common import helpers @@ -505,7 +506,7 @@ class ChangeMoodDialog: # Order them first self.MOODS = [] - for mood in pep.MOODS: + for mood in MOODS: self.MOODS.append(mood) self.MOODS.sort() @@ -515,7 +516,7 @@ class ChangeMoodDialog: self.mood_buttons[mood].set_mode(False) self.mood_buttons[mood].add(gtkgui_helpers.load_mood_icon(mood)) self.mood_buttons[mood].set_relief(Gtk.ReliefStyle.NONE) - self.mood_buttons[mood].set_tooltip_text(pep.MOODS[mood]) + self.mood_buttons[mood].set_tooltip_text(MOODS[mood]) self.mood_buttons[mood].connect('clicked', self.on_mood_button_clicked, mood) table.attach(self.mood_buttons[mood], x, y, 1, 1) @@ -526,9 +527,9 @@ class ChangeMoodDialog: x = 0 y += 1 - if self.mood in pep.MOODS: + if self.mood in MOODS: self.mood_buttons[self.mood].set_active(True) - self.label.set_text(pep.MOODS[self.mood]) + self.label.set_text(MOODS[self.mood]) self.entry.set_sensitive(True) if self.text: self.entry.set_text(self.text) @@ -543,7 +544,7 @@ class ChangeMoodDialog: def on_mood_button_clicked(self, widget, data): if data: - self.label.set_text(pep.MOODS[data]) + self.label.set_text(MOODS[data]) self.entry.set_sensitive(True) else: self.label.set_text(_('None')) @@ -705,7 +706,7 @@ class ChangeStatusMessageDialog(TimeoutDialog): """ img = self.xml.get_object('mood_image') label = self.xml.get_object('mood_button_label') - if 'mood' in self.pep_dict and self.pep_dict['mood'] in pep.MOODS: + if 'mood' in self.pep_dict and self.pep_dict['mood'] in MOODS: img.set_from_pixbuf(gtkgui_helpers.load_mood_icon( self.pep_dict['mood']).get_pixbuf()) if self.pep_dict['mood_text']: ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -28,7 +28,6 @@ ## import xml.sax.saxutils -import gi from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -50,9 +49,8 @@ log = logging.getLogger('gajim.gtkgui_helpers') from gajim.common import i18n from gajim.common import app -from gajim.common import pep from gajim.common import configpaths -from gajim.common.const import PEPEventType, ACTIVITIES +from gajim.common.const import PEPEventType, ACTIVITIES, MOODS from gajim.filechoosers import AvatarSaveDialog gtk_icon_theme = Gtk.IconTheme.get_default() @@ -623,10 +621,9 @@ def load_activity_icon(category, activity = None): return icon_list[activity] def get_pep_as_pixbuf(pep_class): - if isinstance(pep_class, pep.UserMoodPEP): - assert not pep_class._retracted + if pep_class == PEPEventType.MOOD: received_mood = pep_class._pep_specific_data['mood'] - mood = received_mood if received_mood in pep.MOODS else 'unknown' + mood = received_mood if received_mood in MOODS else 'unknown' pixbuf = load_mood_icon(mood).get_pixbuf() return pixbuf elif pep_class == PEPEventType.TUNE: @@ -652,7 +649,7 @@ def get_pep_as_pixbuf(pep_class): return load_activity_icon(activity).get_pixbuf() else: return load_activity_icon('unknown').get_pixbuf() - elif isinstance(pep_class, pep.UserLocationPEP): + elif pep_class == PEPEventType.LOCATION: icon = get_icon_pixmap('applications-internet', quiet=True) if not icon: icon = get_icon_pixmap('gajim-earth') ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -97,9 +97,9 @@ from gajim.common.connection_handlers_events import ( HTTPUploadProgressEvent) from gajim.common.connection import Connection from gajim.common.file_props import FilesProp -from gajim.common import pep from gajim import emoticons -from gajim.common.const import AvatarSize, SSLError, PEPEventType, ACTIVITIES +from gajim.common.const import AvatarSize, SSLError, PEPEventType +from gajim.common.const import ACTIVITIES, MOODS from gajim import roster_window from gajim import profile_window @@ -2474,9 +2474,9 @@ class Interface: @staticmethod def get_pep_icon(pep_obj): - if isinstance(pep_obj, pep.UserMoodPEP): + if pep_obj == PEPEventType.MOOD: received_mood = pep_obj._pep_specific_data['mood'] - mood = received_mood if received_mood in pep.MOODS else 'unknown' + mood = received_mood if received_mood in MOODS else 'unknown' return gtkgui_helpers.load_mood_icon(mood).get_pixbuf() elif pep_obj == PEPEventType.TUNE: path = os.path.join( @@ -2500,7 +2500,7 @@ class Interface: get_pixbuf() else: return gtkgui_helpers.load_activity_icon('unknown').get_pixbuf() - elif isinstance(pep_obj, pep.UserLocationPEP): + elif pep_obj == PEPEventType.LOCATION: icon = gtkgui_helpers.get_icon_pixmap('applications-internet', quiet=True) return icon ===================================== gajim/profile_window.py ===================================== --- a/gajim/profile_window.py +++ b/gajim/profile_window.py @@ -329,9 +329,9 @@ class ProfileWindow(Gtk.ApplicationWindow): nick = '' if 'NICKNAME' in vcard_: nick = vcard_['NICKNAME'] - app.connections[self.account].send_nickname(nick) + app.connections[self.account].get_module('UserNickname').send(nick) if nick == '': - app.connections[self.account].retract_nickname() + app.connections[self.account].get_module('UserNickname').retract() nick = app.config.get_per('accounts', self.account, 'name') app.nicks[self.account] = nick app.connections[self.account].get_module('VCardTemp').send_vcard( ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -1090,10 +1090,10 @@ class RosterWindow: else: self.model[child_iter][Column.TUNE_PIXBUF] = empty_pixbuf - if app.config.get('show_location_in_roster') and 'location' in \ + if app.config.get('show_location_in_roster') and 'geoloc' in \ pep_dict: self.model[child_iter][Column.LOCATION_PIXBUF] = \ - gtkgui_helpers.get_pep_as_pixbuf(pep_dict['location']) + gtkgui_helpers.get_pep_as_pixbuf(pep_dict['geoloc']) else: self.model[child_iter][Column.LOCATION_PIXBUF] = empty_pixbuf @@ -1354,7 +1354,7 @@ class RosterWindow: return app.config.get('show_activity_in_roster') elif pep_type == 'tune': return app.config.get('show_tunes_in_roster') - elif pep_type == 'location': + elif pep_type == 'geoloc': return app.config.get('show_location_in_roster') else: return False @@ -2107,9 +2107,9 @@ class RosterWindow: if 'mood' in pep_dict: mood = pep_dict['mood'] mood_text = pep_dict.get('mood_text', None) - connection.send_mood(mood, mood_text) + connection.get_module('UserMood').send((mood, mood_text)) else: - connection.retract_mood() + connection.get_module('UserMood').retract() def delete_pep(self, jid, account): if jid == app.get_jid_from_account(account): @@ -2651,7 +2651,7 @@ class RosterWindow: if obj.jid == app.get_jid_from_account(obj.conn.name): self.draw_account(obj.conn.name) - if obj.pep_type == 'nickname': + if obj.pep_type == 'nick': self.draw_contact(obj.jid, obj.conn.name) else: self.draw_pep(obj.jid, obj.conn.name, obj.pep_type) @@ -3610,7 +3610,7 @@ class RosterWindow: if active: location_listener.enable() else: - app.connections[account].retract_location() + app.connections[account].get_module('UserLocation').retract() helpers.update_optional_features(account) @@ -5728,7 +5728,7 @@ class RosterWindow: self.renderers_propertys ={} self._pep_type_to_model_column = {'mood': Column.MOOD_PIXBUF, 'activity': Column.ACTIVITY_PIXBUF, 'tune': Column.TUNE_PIXBUF, - 'location': Column.LOCATION_PIXBUF} + 'geoloc': Column.LOCATION_PIXBUF} renderer_text = Gtk.CellRendererText() self.renderers_propertys[renderer_text] = ('ellipsize', @@ -5761,7 +5761,7 @@ class RosterWindow: 'pixbuf', Column.TUNE_PIXBUF, self._fill_pep_pixbuf_renderer, Column.TUNE_PIXBUF), - ('location', Gtk.CellRendererPixbuf(), False, + ('geoloc', Gtk.CellRendererPixbuf(), False, 'pixbuf', Column.LOCATION_PIXBUF, self._fill_pep_pixbuf_renderer, Column.LOCATION_PIXBUF)) ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -577,8 +577,8 @@ class RosterTooltip(Gtk.Window, StatusTable): self.tune.show() self.tune_label.show() - if 'location' in contact.pep: - location = contact.pep['location'].asMarkupText() + if 'geoloc' in contact.pep: + location = contact.pep['geoloc'].asMarkupText() self.location.set_markup(location) self.location.show() self.location_label.show() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1712743fd5372b18c011163d0b8fa7668… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1712743fd5372b18c011163d0b8fa7668… You're receiving this email because of your account on dev.gajim.org.

1 0

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