diff options
| author | David Zeuthen <davidz@fedoraproject.org> | 2009-04-13 19:30:49 +0000 |
|---|---|---|
| committer | David Zeuthen <davidz@fedoraproject.org> | 2009-04-13 19:30:49 +0000 |
| commit | 6fbb99a1d0054b7e08b8376a94599ff37587f305 (patch) | |
| tree | baa2f0bcb674fa77f06f26bd3b745dead8cc00b5 | |
| parent | 3c4fadbdaa357388ec8f2132ce15df45ab72c05c (diff) | |
| download | gnome-panel-6fbb99a1d0054b7e08b8376a94599ff37587f305.tar.gz gnome-panel-6fbb99a1d0054b7e08b8376a94599ff37587f305.tar.xz gnome-panel-6fbb99a1d0054b7e08b8376a94599ff37587f305.zip | |
- Handle emblemed icons (GNOME #578859)gnome-panel-2_26_0-2_fc11
| -rw-r--r-- | gnome-panel-2.26.0-show-emblemed-icons.patch | 59 | ||||
| -rw-r--r-- | gnome-panel.spec | 9 |
2 files changed, 67 insertions, 1 deletions
diff --git a/gnome-panel-2.26.0-show-emblemed-icons.patch b/gnome-panel-2.26.0-show-emblemed-icons.patch new file mode 100644 index 0000000..203b30f --- /dev/null +++ b/gnome-panel-2.26.0-show-emblemed-icons.patch @@ -0,0 +1,59 @@ +--- 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, diff --git a/gnome-panel.spec b/gnome-panel.spec index 175052b..d820fdc 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -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 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch 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 @@ Panel Applets using the libpanel-applet library. %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 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Mon Apr 13 2009 David Zeuthen <davidz@redhat.com> - 2.26.0-2 +- Handle emblemed icons (GNOME #578859) + * Tue Mar 17 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.0-1 - Update to 2.26.0 |