[gnome-commander/gcmd-1-10] Remove references to GNOMEUIINFO_KEY_UIDATA, defined in libgnomeui's gnome-app-helper.h



commit 0ac87def0bf8282918ac924bc8640bd9361b1d37
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Wed May 20 13:08:28 2020 +0200

    Remove references to GNOMEUIINFO_KEY_UIDATA, defined in libgnomeui's gnome-app-helper.h

 plugins/fileroller/file-roller-plugin.cc | 2 +-
 plugins/test/test-plugin.cc              | 2 +-
 src/gnome-cmd-main-menu.cc               | 4 ++--
 src/utils.h                              | 6 ------
 4 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/plugins/fileroller/file-roller-plugin.cc b/plugins/fileroller/file-roller-plugin.cc
index 2f2176ae..b6623c19 100644
--- a/plugins/fileroller/file-roller-plugin.cc
+++ b/plugins/fileroller/file-roller-plugin.cc
@@ -449,7 +449,7 @@ static GtkWidget *create_menu_item (const gchar *name, gboolean show_pixmap,
     gtk_container_add (GTK_CONTAINER (item), label);
 
     // Connect to the signal and set user data
-    g_object_set_data (G_OBJECT (item), GNOMEUIINFO_KEY_UIDATA, data);
+    g_object_set_data (G_OBJECT (item), "uidata", data);
 
     if (callback)
         g_signal_connect (item, "activate", G_CALLBACK (callback), data);
diff --git a/plugins/test/test-plugin.cc b/plugins/test/test-plugin.cc
index 9fb5a374..2821db7d 100644
--- a/plugins/test/test-plugin.cc
+++ b/plugins/test/test-plugin.cc
@@ -101,7 +101,7 @@ static GtkWidget *create_menu_item (const gchar *name, gboolean show_pixmap, Gtk
     gtk_container_add (GTK_CONTAINER (item), label);
 
     // Connect to the signal and set user data
-    g_object_set_data (G_OBJECT (item), GNOMEUIINFO_KEY_UIDATA, data);
+    g_object_set_data (G_OBJECT (item), "uidata", data);
 
     if (callback)
         g_signal_connect (item, "activate", G_CALLBACK (callback), data);
diff --git a/src/gnome-cmd-main-menu.cc b/src/gnome-cmd-main-menu.cc
index 5ddf9828..686575b4 100644
--- a/src/gnome-cmd-main-menu.cc
+++ b/src/gnome-cmd-main-menu.cc
@@ -225,7 +225,7 @@ static GtkWidget *create_menu_item (GnomeCmdMainMenu *main_menu, GtkMenu *parent
     if (spec->type == MENU_TYPE_ITEM)
     {
         // Connect to the signal and set user data
-        g_object_set_data (G_OBJECT (item), GNOMEUIINFO_KEY_UIDATA, spec->user_data);
+        g_object_set_data (G_OBJECT (item), "uidata", spec->user_data);
         g_signal_connect (item, "activate", G_CALLBACK (spec->moreinfo), spec->user_data);
     }
 
@@ -297,7 +297,7 @@ add_menu_item (GnomeCmdMainMenu *main_menu,
     // Connect to the signal and set user data
     if (callback)
     {
-        g_object_set_data (G_OBJECT (item), GNOMEUIINFO_KEY_UIDATA, user_data);
+        g_object_set_data (G_OBJECT (item), "uidata", user_data);
         g_signal_connect (item, "activate", callback, user_data);
     }
 
diff --git a/src/utils.h b/src/utils.h
index 3bcdd50f..2dda74a8 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -277,12 +277,6 @@ inline void gnome_cmd_error_message (const gchar *title, GError *error)
 }
 
 
-// Insert an item with an inline xpm icon and a user data pointer
-#define GNOMEUIINFO_ITEM_FILENAME(label, tooltip, callback, filename) \
-    { GNOME_APP_UI_ITEM, label, tooltip, (gpointer) callback, NULL, NULL, \
-        GNOME_APP_PIXMAP_FILENAME, filename, 0, (GdkModifierType) 0, NULL }
-
-
 inline std::string truncate(const std::string &s, guint n=100)
 {
     if (s.size()<=n)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]