Bug fix: Copy icon not displayed

[geeqie.git] / src / ui-misc.cc

diff --git a/src/ui-misc.cc b/src/ui-misc.cc
index ed169d6..901364f 100644 (file)
--- a/src/ui-misc.cc
+++ b/src/ui-misc.cc
@@ -253,7 +253,11 @@ GtkWidget *pref_button_new(GtkWidget *parent_box, const gchar *stock_id,
 
                button = gtk_button_new();
 
-               if (stock_id) image = gtk_image_new_from_icon_name(stock_id, GTK_ICON_SIZE_BUTTON);
+               if (stock_id)
+                       {
+                       image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_BUTTON);
+                       }
+
                if (text)
                        {
                        label = gtk_label_new_with_mnemonic(text);
@@ -374,12 +378,12 @@ void pref_checkbox_link_sensitivity(GtkWidget *button, GtkWidget *widget)
        pref_checkbox_link_sensitivity_cb(button, widget);
 }
 
-static void pref_checkbox_link_sensitivity_swap_cb(GtkWidget *button, gpointer data)
-{
-       GtkWidget *widget = static_cast<GtkWidget *>(data);
+//static void pref_checkbox_link_sensitivity_swap_cb(GtkWidget *button, gpointer data)
+//{
+       //GtkWidget *widget = static_cast<GtkWidget *>(data);
 
-       gtk_widget_set_sensitive(widget, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
-}
+       //gtk_widget_set_sensitive(widget, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
+//}
 
 //void pref_checkbox_link_sensitivity_swap(GtkWidget *button, GtkWidget *widget)
 //{
@@ -439,15 +443,15 @@ GtkWidget *pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *sibling,
 
 #define PREF_RADIO_VALUE_KEY "pref_radio_value"
 
-static void pref_radiobutton_int_cb(GtkWidget *widget, gpointer data)
-{
-       gboolean *result = static_cast<gboolean *>(data);
+//static void pref_radiobutton_int_cb(GtkWidget *widget, gpointer data)
+//{
+       //gboolean *result = static_cast<gboolean *>(data);
 
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
-               {
-               *result = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), PREF_RADIO_VALUE_KEY));
-               }
-}
+       //if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
+               //{
+               //*result = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), PREF_RADIO_VALUE_KEY));
+               //}
+//}
 
 //GtkWidget *pref_radiobutton_new_int(GtkWidget *parent_box, GtkWidget *sibling,
                                    //const gchar *text, gboolean active,