bug-buddy r2555 - in trunk: . pixmaps src

[cosimoc svn gnome org]

Author: cosimoc
Date: Tue Jul 15 17:33:57 2008
New Revision: 2555
URL: http://svn.gnome.org/viewvc/bug-buddy?rev=2555&view=rev

Log:
2008-07-15  Cosimo Cecchi  <cosimoc gnome org>

	* pixmaps/Makefile.am:
	* src/Makefile.am:
	* src/bug-buddy.c: (main):
	Use gtk_image_set_from_icon_name instead of custom code to
	load the application icons.
	Based on a patch from David Farning (#435948).


Modified:
   trunk/ChangeLog
   trunk/pixmaps/Makefile.am
   trunk/src/Makefile.am
   trunk/src/bug-buddy.c

Modified: trunk/pixmaps/Makefile.am
==============================================================================
--- trunk/pixmaps/Makefile.am	(original)
+++ trunk/pixmaps/Makefile.am	Tue Jul 15 17:33:57 2008
@@ -1,7 +1,3 @@
-pixmapdir = $(datadir)/bug-buddy
-pixmap_DATA = \
-	bug-buddy.png
-
 icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = \
 	bug-buddy.png
@@ -20,4 +16,4 @@
 	fi
 
 EXTRA_DIST = \
-	$(pixmap_DATA)
+	$(icon_DATA)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Jul 15 17:33:57 2008
@@ -7,7 +7,6 @@
 	$(BUG_BUDDY_CFLAGS) -I$(includedir)		\
 	$(LIBNM_CFLAGS)                                 \
 	-DBUDDY_DATADIR=\""$(buddydir)"\"		\
-        -DBUDDY_ICONDIR=\""$(datadir)/pixmaps"\"	\
 	$(DISABLE_DEPRECATED)                           \
 	$(BUG_BUDDY_EDS_CFLAGS)				\
 	-DGMENU_I_KNOW_THIS_IS_UNSTABLE			\

Modified: trunk/src/bug-buddy.c
==============================================================================
--- trunk/src/bug-buddy.c	(original)
+++ trunk/src/bug-buddy.c	Tue Jul 15 17:33:57 2008
@@ -1658,38 +1658,6 @@
 	g_string_free (stderr_info, TRUE);
 }
 
-
-static GdkPixbuf*
-load_icon (const char *icon)
-{
-	GdkPixbuf *pixbuf = NULL;
-
-	if (g_path_is_absolute (icon)) {
-		pixbuf = gdk_pixbuf_new_from_file_at_size (icon, 48, 48, NULL);
-	}
-	if (pixbuf == NULL) {
-		pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-						   icon, 48, 0, NULL);
-	}
-	if (pixbuf == NULL && strrchr (icon, '.') != NULL) {
-		char *name;
-		name = g_strndup (icon, strlen (icon) - strlen (strrchr (icon, '.')));
-		pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-						   name, 48, 0, NULL);
-		g_free (name);
-	}
-
-	if (pixbuf == NULL) {
-		char *filename;
-		filename = g_strdup_printf (BUDDY_ICONDIR"/pixmaps/%s", icon);
-		pixbuf = gdk_pixbuf_new_from_file_at_size (filename, 48, 48, NULL);
-		g_free (filename);
-	}
-
-	return pixbuf;
-}
-	
-
 int
 main (int argc, char *argv[])
 {
@@ -1806,13 +1774,9 @@
 			g_object_set_data (G_OBJECT (ui), "app", app);
 	
 			if (app->icon) {
-				GdkPixbuf *pixbuf;
-				pixbuf = load_icon (app->icon);
-				if (pixbuf) {
-					gtk_image_set_from_pixbuf (GTK_IMAGE (gtk_builder_get_object (ui, "app-image")),
-			                           	   	   pixbuf);
-					g_object_unref(pixbuf);
-				}
+				gtk_image_set_from_icon_name (GTK_IMAGE (gtk_builder_get_object (ui, "app-image")),
+							      app->icon,
+							      GTK_ICON_SIZE_DIALOG);
 			}
 			fill_gnome_info (app, gnome_version, ui);
 		}
@@ -1874,14 +1838,9 @@
 		g_object_set_data (G_OBJECT (ui), "app", app);
 	
 		if (app->icon) {
-			GdkPixbuf *pixbuf;
-			
-			pixbuf = load_icon (app->icon);
-			if (pixbuf) {
-				gtk_image_set_from_pixbuf (GTK_IMAGE (gtk_builder_get_object (ui, "app-image")),
-							   pixbuf);
-				g_object_unref (pixbuf);
-			}
+			gtk_image_set_from_icon_name (GTK_IMAGE (gtk_builder_get_object (ui, "app-image")),
+						      app->icon,
+						      GTK_ICON_SIZE_DIALOG);
 		}
 		fill_gnome_info (app, gnome_version, ui);
 		fill_custom_info (app, ui);