anjuta r3976 - in trunk: . plugins/debug-manager

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Mon Jun  2 17:35:10 2008
New Revision: 3976
URL: http://svn.gnome.org/viewvc/anjuta?rev=3976&view=rev

Log:
	* plugins/debug-manager/anjuta-marshal.list,
	plugins/debug-manager/sexy-icon-entry.c:
	Fix #536254: gtk_marshal_VOID__INT_INT shouldn't be used
	Update sexy icon entry


Modified:
   trunk/ChangeLog
   trunk/plugins/debug-manager/anjuta-marshal.list
   trunk/plugins/debug-manager/sexy-icon-entry.c

Modified: trunk/plugins/debug-manager/anjuta-marshal.list
==============================================================================
--- trunk/plugins/debug-manager/anjuta-marshal.list	(original)
+++ trunk/plugins/debug-manager/anjuta-marshal.list	Mon Jun  2 17:35:10 2008
@@ -1,2 +1,3 @@
 VOID:ULONG,ULONG
 VOID:VOID
+VOID:INT,INT

Modified: trunk/plugins/debug-manager/sexy-icon-entry.c
==============================================================================
--- trunk/plugins/debug-manager/sexy-icon-entry.c	(original)
+++ trunk/plugins/debug-manager/sexy-icon-entry.c	Mon Jun  2 17:35:10 2008
@@ -23,6 +23,8 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
+#include "anjuta-marshal.h"
+
 #define ICON_MARGIN 2
 #define MAX_ICONS 2
 
@@ -129,7 +131,7 @@
 					 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 					 G_STRUCT_OFFSET(SexyIconEntryClass, icon_pressed),
 					 NULL, NULL,
-					 gtk_marshal_VOID__INT_INT,
+					 anjuta_marshal_VOID__INT_INT,
 					 G_TYPE_NONE, 2,
 					 G_TYPE_INT,
 					 G_TYPE_INT);
@@ -149,7 +151,7 @@
 					 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 					 G_STRUCT_OFFSET(SexyIconEntryClass, icon_released),
 					 NULL, NULL,
-					 gtk_marshal_VOID__INT_INT,
+					 anjuta_marshal_VOID__INT_INT,
 					 G_TYPE_NONE, 2,
 					 G_TYPE_INT,
 					 G_TYPE_INT);
@@ -469,9 +471,10 @@
 get_pixbuf_from_icon(SexyIconEntry *entry, SexyIconEntryPosition icon_pos)
 {
 	GdkPixbuf *pixbuf = NULL;
-	gchar *stock_id;
+	const gchar *stock_id;
 	SexyIconInfo *icon_info = &entry->priv->icons[icon_pos];
 	GtkIconSize size;
+	int w, h;
 
 	switch (gtk_image_get_storage_type(GTK_IMAGE(icon_info->icon)))
 	{
@@ -481,11 +484,17 @@
 			break;
 
 		case GTK_IMAGE_STOCK:
-			gtk_image_get_stock(GTK_IMAGE(icon_info->icon), &stock_id, &size);
+			gtk_image_get_stock(GTK_IMAGE(icon_info->icon), (char**)&stock_id, &size);
 			pixbuf = gtk_widget_render_icon(GTK_WIDGET(entry),
 											stock_id, size, NULL);
 			break;
 
+		case GTK_IMAGE_ICON_NAME:
+			gtk_image_get_icon_name (GTK_IMAGE(icon_info->icon), &stock_id, &size);
+			gtk_icon_size_lookup (size, &w, &h);
+			pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), stock_id, size, 0, NULL);
+			break;
+          
 		default:
 			return NULL;
 	}
@@ -571,7 +580,6 @@
 
 		scale = height - (2 * ICON_MARGIN);
 
-		printf("scale = %d (height = %d)\n", scale, height);
 		temp_pixbuf = gdk_pixbuf_scale_simple(pixbuf, scale, scale,
 											  GDK_INTERP_BILINEAR);
 
@@ -657,7 +665,8 @@
 
 		if (strcmp(name, "pixbuf")   && strcmp(name, "stock")  &&
 			strcmp(name, "image")    && strcmp(name, "pixmap") &&
-			strcmp(name, "icon_set") && strcmp(name, "pixbuf_animation"))
+			strcmp(name, "icon-set") && strcmp(name, "pixbuf-animation") &&
+			strcmp(name, "icon-name"))
 		{
 			return;
 		}