Philipp Hörist pushed to branch master at gajim / gajim

Commits: e722ac2b by lovetox at 2020-05-17T08:40:25+02:00 Roster: Remove reconnect menuitem on groupchats

Fixes #10106

- - - - - 29f7b897 by lovetox at 2020-05-17T20:50:08+02:00 Remove shortcut for Accounts window

- - - - -

3 changed files:

- gajim/application.py - gajim/data/gui/shortcuts_window.ui - gajim/roster_window.py

Changes:

===================================== gajim/application.py ===================================== @@ -554,7 +554,6 @@ class GajimApplication(Gtk.Application): 'app.file-transfer': ['<Primary>T'], 'app.ipython': ['<Primary><Alt>I'], 'app.start-chat::': ['<Primary>N'], - 'app.accounts::': ['<Alt>A'], 'app.create-groupchat::': ['<Primary>G'], 'win.show-roster': ['<Primary>R'], 'win.show-offline': ['<Primary>O'],

===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -196,13 +196,6 @@ <property name="title" translatable="yes">Create new group chat</property> </object> </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator">&lt;alt&gt;a</property> - <property name="title" translatable="yes">Accounts</property> - </object> - </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property>

===================================== gajim/roster_window.py ===================================== @@ -2973,15 +2973,6 @@ class RosterWindow: ctrl.leave() self.remove_groupchat(jid, account)

- def on_reconnect(self, widget, jid, account): - """ - When reconnect menuitem is activated: join the room - """ - if jid in app.interface.minimized_controls[account]: - ctrl = app.interface.minimized_controls[account][jid] - app.interface.join_gc_room(account, jid, ctrl.nick, - app.gc_passwords.get(jid, '')) - def on_send_single_message_menuitem_activate(self, widget, account, contact=None): if contact is None: @@ -5121,12 +5112,6 @@ class RosterWindow: account) menu.append(rename_menuitem)

- if not app.gc_connected[account].get(jid, False): - connect_menuitem = Gtk.MenuItem.new_with_mnemonic(_( - '_Reconnect')) - connect_menuitem.connect('activate', self.on_reconnect, jid, - account) - menu.append(connect_menuitem) disconnect_menuitem = Gtk.MenuItem.new_with_mnemonic(_( '_Leave')) disconnect_menuitem.connect('activate', self.on_disconnect, jid,

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9b3497de13ba056dacbbbb18cc5a978a...