code cleanup

Author: zisoft

src/gui/gtk.c

@@ -5077,7 +5077,8 @@ GtkWidget *dt_gui_popover_menu_from_model(GtkWidget *parent, GMenu *menu)
   GtkWidget *popover_menu;
 
 #if GTK_CHECK_VERSION(4, 0, 0)
-  popover_menu = gtk_popover_menu_new_from_model(G_MENU_MODEL(menu));
+  popover_menu = gtk_popover_menu_new_from_model_full(G_MENU_MODEL(menu),
+                                                      GTK_POPOVER_MENU_NESTED);
   gtk_widget_set_parent(popover_menu, parent);
 #else
   popover_menu = gtk_popover_new_from_model(parent, G_MENU_MODEL(menu));

src/libs/collect.c

@@ -3139,22 +3139,11 @@ static void _menuitem_mode_change(GSimpleAction *action,
                                   GVariant *parameter,
                                   gpointer userdata)
 {
-<<<<<<< HEAD
-  dt_lib_collect_t *m = (dt_lib_collect_t *)userdata;
-
-  dt_lib_collect_mode_t mode = 0;
-  int rule_index = 0;
-
-  g_variant_get(parameter, "(ii)", &mode, &rule_index);
-
-  dt_lib_collect_rule_t *d = &m->rule[rule_index];
-=======
   dt_lib_collect_mode_t mode;
   dt_lib_collect_rule_t *d = NULL;
 
   if(!_process_variant_params(parameter, userdata, &mode, &d))
     return;
->>>>>>> 0566cb200c (migrate collection popover menu)
 
   // add next row with and operator
   const int num = d->num + 1;

src/libs/lib.c

@@ -513,8 +513,6 @@ static void _dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo,
   const gboolean hide_default = dt_conf_get_bool("plugins/lighttable/hide_default_presets");
   const gboolean default_first = dt_conf_get_bool("modules/default_presets_first");
 
-  // g_signal_connect(G_OBJECT(menu), "destroy", G_CALLBACK(_free_module_info), minfo);
-
   int cnt = 0;
   gchar *active_preset_name = NULL;
   gboolean selected_writeprotect = FALSE;