Fix View > Toolbar item

2 files changed, 17 insertions, 11 deletions

diff --git a/gui/viewtorrents.glade b/gui/viewtorrents.glade
index 877da78..a217daf 100644
--- a/gui/viewtorrents.glade
+++ b/gui/viewtorrents.glade
@@ -42,6 +42,11 @@
         <property name="stock_id">gtk-connect</property>
       </object>
     </child>
+    <child>
+      <object class="GtkToggleAction" id="toolbaraction">
+        <property name="label" translatable="yes">Toolbar</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="torrentmenu">
     <property name="visible">True</property>
@@ -237,7 +242,8 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkCheckMenuItem" id="viewtoolbaritem">
-                        <property name="use_action_appearance">False</property>
+                        <property name="use_action_appearance">True</property>
+                        <property name="related_action">toolbaraction</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="active">True</property>
diff --git a/src/main.c b/src/main.c
index 06adbdb..14b8492 100644
--- a/src/main.c
+++ b/src/main.c
@@ -64,7 +64,7 @@ typedef struct
     GtkWidget* top;
     GtkAction* connectaction, * disconnectaction;
     GtkAction* startaction, * stopaction, * rehashaction;
-    GtkCheckMenuItem* viewtoolbaritem;
+    GtkToggleAction* toolbaraction;
     GtkWidget* torrentmenu;
 
     GtkToolbar* toolbar;
@@ -269,7 +269,7 @@ static gboolean do_popupmenu(GtkWidget* treeview, gpointer data);
 static gboolean do_buttonpressed(GtkWidget *treeview, GdkEventButton *event,
                                  gpointer data);
 
-static void do_viewtoolbaritem(GtkCheckMenuItem* checkmenuitem, gpointer data);
+static void do_viewtoolbar(GtkToggleAction* action, gpointer data);
 
 static void do_about(GtkMenuItem* menuitem, gpointer data);
 
@@ -398,11 +398,11 @@ int main(int argc, char** argv)
 
     master.toolbar = GTK_TOOLBAR(gtk_builder_get_object(builder, "toolbar"));
 
-    master.viewtoolbaritem =
-        GTK_CHECK_MENU_ITEM(gtk_builder_get_object(builder,
-                                                   "viewtoolbaritem"));
-    g_signal_connect(master.viewtoolbaritem,
-                     "toggled", G_CALLBACK(do_viewtoolbaritem), &master);
+    master.toolbaraction =
+        GTK_TOGGLE_ACTION(gtk_builder_get_object(builder,
+                                                 "toolbaraction"));
+    g_signal_connect(master.toolbaraction,
+                     "toggled", G_CALLBACK(do_viewtoolbar), &master);
 
     pwddlg = GTK_WIDGET(gtk_builder_get_object(builder, "pwddlg"));
     gtk_dialog_set_default_response(GTK_DIALOG(pwddlg), GTK_RESPONSE_OK);
@@ -497,7 +497,7 @@ int main(int argc, char** argv)
             g_clear_error(&error);
             view = TRUE; /* default */
         }
-        gtk_check_menu_item_set_active(master.viewtoolbaritem, view);
+        gtk_toggle_action_set_active(master.toolbaraction, view);
         if (!view)
         {
             gtk_widget_hide(GTK_WIDGET(master.toolbar));
@@ -2301,10 +2301,10 @@ void listselection_changed(GtkTreeSelection* selection,
     gtk_action_set_sensitive(master->rehashaction, FALSE);
 }
 
-void do_viewtoolbaritem(GtkCheckMenuItem* checkmenuitem, gpointer data)
+void do_viewtoolbar(GtkToggleAction* action, gpointer data)
 {
     master_t* master = data;
-    gboolean active = gtk_check_menu_item_get_active(checkmenuitem);
+    gboolean active = gtk_toggle_action_get_active(action);
     if (active != gtk_widget_get_visible(GTK_WIDGET(master->toolbar)))
     {
         if (active)