Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 12:28:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(gtk): fix conflicting hotkeys (#2201)" (#3718)

Browse Source 
This reverts commit a0305a3a12.
This commit is contained in:
Charles Kerr
2022-08-26 19:45:46 -05:00
committed by GitHub
parent 291d2fcb9b
commit 6e44adabf1
6 changed files with 66 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/Application.cc
View File

@@ -562,13 +562,12 @@ void Application::Impl::on_startup()
/* init the ui manager */
ui_builder_ = Gtk::Builder::create_from_resource(gtr_get_full_resource_path("transmission-ui.xml"s));
auto const actions_window = gtr_actions_init_window(ui_builder_, this);
auto const actions_torrent = gtr_actions_init_torrent(this);
auto const actions = gtr_actions_init(ui_builder_, this);
app_.set_menubar(gtr_action_get_object<Gio::Menu>("main-window-menu"));
/* create main window now to be a parent to any error dialogs */
wind_ = MainWindow::create(app_, actions_window, actions_torrent, core_);
wind_ = MainWindow::create(app_, actions, core_);
wind_->signal_size_allocate().connect(sigc::mem_fun(*this, &Impl::on_main_window_size_allocated));
app_.hold();
app_setup();