From 4101d8c468b0f1a89e8c6fb8229a72469fed12ad Mon Sep 17 00:00:00 2001 From: Mike Massonnet Date: Sun, 21 Nov 2010 14:06:40 +0100 Subject: [PATCH] Drop sige-changed signal and use XfcePanelImage for the panel button --- panel-plugin/main-panel-plugin.c | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/panel-plugin/main-panel-plugin.c b/panel-plugin/main-panel-plugin.c index 3c8042e..cee2443 100644 --- a/panel-plugin/main-panel-plugin.c +++ b/panel-plugin/main-panel-plugin.c @@ -74,8 +74,7 @@ panel_plugin_register (XfcePanelPlugin *panel_plugin) /* Panel Button */ plugin->button = xfce_create_panel_toggle_button (); - /* The image is set through the set_size callback */ - plugin->image = gtk_image_new (); + plugin->image = xfce_panel_image_new_from_source (GTK_STOCK_PASTE); gtk_container_add (GTK_CONTAINER (plugin->button), plugin->image); gtk_container_add (GTK_CONTAINER (panel_plugin), plugin->button); xfce_panel_plugin_add_action_widget (panel_plugin, plugin->button); @@ -83,8 +82,6 @@ panel_plugin_register (XfcePanelPlugin *panel_plugin) G_CALLBACK (cb_button_pressed), plugin); /* Signals */ - g_signal_connect_swapped (panel_plugin, "size-changed", - G_CALLBACK (panel_plugin_set_size), plugin); xfce_panel_plugin_menu_show_about (panel_plugin); g_signal_connect_swapped (panel_plugin, "about", G_CALLBACK (plugin_about), plugin); @@ -102,28 +99,6 @@ panel_plugin_register (XfcePanelPlugin *panel_plugin) } static gboolean -panel_plugin_set_size (MyPlugin *plugin, - gint size) -{ - GdkPixbuf *pixbuf; - GtkWidget *image; - - gtk_widget_set_size_request (plugin->button, size, size); - - size -= 2 + 2 * MAX (gtk_widget_get_style (plugin->button)->xthickness, - gtk_widget_get_style (plugin->button)->ythickness); - - image = gtk_image_new_from_stock("GTK_STOCK_PASTE", GTK_ICON_SIZE_LARGE_TOOLBAR); - pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(image)); - pixbuf = gdk_pixbuf_scale_simple(pixbuf, size, size, GDK_INTERP_HYPER); - gtk_image_set_from_pixbuf (GTK_IMAGE (plugin->image), pixbuf); - - g_object_unref (G_OBJECT (pixbuf)); - - return TRUE; -} - -static gboolean cb_button_pressed (GtkButton *button, GdkEventButton *event, MyPlugin *plugin) -- 1.7.3.2