rpms/gnome-panel/devel gnome-panel-2.26.0-show-emblemed-icons.patch, NONE, 1.1 gnome-panel.spec, 1.349, 1.350

[David Zeuthen]

Author: davidz

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26013

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.26.0-show-emblemed-icons.patch 
Log Message:
* Mon Apr 13 2009 David Zeuthen <davidz at redhat.com> - 2.26.0-2
- Handle emblemed icons (GNOME #578859)



gnome-panel-2.26.0-show-emblemed-icons.patch:

--- NEW FILE gnome-panel-2.26.0-show-emblemed-icons.patch ---
--- gnome-panel-2.26.0/gnome-panel/panel-util.h.orig	2009-04-13 15:12:27.000000000 -0400
+++ gnome-panel-2.26.0/gnome-panel/panel-util.h	2009-04-13 15:19:17.000000000 -0400
@@ -65,6 +65,9 @@ void panel_util_set_tooltip_text (GtkWid
 char *panel_util_get_icon_name_from_g_icon (GIcon *gicon);
 GdkPixbuf *panel_util_get_pixbuf_from_g_loadable_icon (GIcon *gicon,
 						       int    size);
+GdkPixbuf *panel_util_get_pixbuf_from_gicon (GtkIconTheme  *icon_theme,
+                                             GIcon         *gicon,
+                                             int            size);
 GFile *panel_util_get_file_optional_homedir (const char *location);
 
 G_END_DECLS
--- gnome-panel-2.26.0/gnome-panel/panel-util.c.orig	2009-04-13 15:12:22.000000000 -0400
+++ gnome-panel-2.26.0/gnome-panel/panel-util.c	2009-04-13 15:19:09.000000000 -0400
@@ -832,6 +832,33 @@ panel_util_get_pixbuf_from_g_loadable_ic
 	return pixbuf;
 }
 
+GdkPixbuf *
+panel_util_get_pixbuf_from_gicon (GtkIconTheme  *icon_theme,
+				  GIcon *gicon,
+				  int    size)
+{
+	GdkPixbuf    *pixbuf;
+	GtkIconInfo  *icon_info;
+
+	g_return_val_if_fail (G_IS_ICON (gicon), NULL);
+
+	pixbuf = NULL;
+
+	icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme,
+						    gicon,
+						    size,
+						    0);
+	if (icon_info == NULL)
+		goto out;
+
+	pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+
+	gtk_icon_info_free (icon_info);
+
+ out:
+	return pixbuf;
+}
+
 static char *
 panel_util_get_file_display_name_if_mount (GFile *file)
 {
--- gnome-panel-2.26.0/gnome-panel/menu.c.orig	2009-04-13 15:05:37.000000000 -0400
+++ gnome-panel-2.26.0/gnome-panel/menu.c	2009-04-13 15:22:38.000000000 -0400
@@ -599,7 +599,7 @@ load_icons_handler_again:
 						   &long_operation);
 			g_free (icon_name);
 		} else {
-			pb = panel_util_get_pixbuf_from_g_loadable_icon (icon->gicon, icon_height);
+                        pb = panel_util_get_pixbuf_from_gicon (icon->icon_theme, icon->gicon, icon_height);
 			if (!pb && icon->fallback_image) {
 				pb = panel_make_menu_icon (icon->icon_theme,
 							   NULL,


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- gnome-panel.spec	17 Mar 2009 05:03:24 -0000	1.349
+++ gnome-panel.spec	13 Apr 2009 19:30:49 -0000	1.350
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar.bz2
 
@@ -115,6 +115,9 @@
 
 Patch35: clock-wakeups.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=578859
+Patch100: gnome-panel-2.26.0-show-emblemed-icons.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -161,6 +164,7 @@
 %patch11 -p1 -b .applet-error
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch35 -p1 -b .clock-wakeups
+%patch100 -p1 -b .emblemed-icons
 
 libtoolize --force --copy
 
@@ -362,6 +366,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Apr 13 2009 David Zeuthen <davidz at redhat.com> - 2.26.0-2
+- Handle emblemed icons (GNOME #578859)
+
 * Tue Mar 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0