r11059 - in /desktop/unstable/gnome-panel/debian: changelog patches/02_custom-launcher-icon.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat May 19 15:27:08 2007
New Revision: 11059

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11059
Log:
* 02_custom-launcher-icon.patch: patch from Ubuntu to provide a 
  default icon for custom application launchers (closes: #422401).

Added:
    desktop/unstable/gnome-panel/debian/patches/02_custom-launcher-icon.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=11059&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog (original)
+++ desktop/unstable/gnome-panel/debian/changelog Sat May 19 15:27:08 2007
@@ -19,7 +19,11 @@
   * New patch, 06_gksu_time_admin; use gksu to launch time-admin; from Ubuntu
     (Closes: #412074)
 
- -- Sebastian Dröge <slomo at debian.org>  Tue,  8 May 2007 13:07:04 +0200
+  [ Josselin Mouette ]
+  * 02_custom-launcher-icon.patch: patch from Ubuntu to provide a 
+    default icon for custom application launchers (closes: #422401).
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 19 May 2007 17:26:11 +0200
 
 gnome-panel (2.18.1-1) unstable; urgency=low
 

Added: desktop/unstable/gnome-panel/debian/patches/02_custom-launcher-icon.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/02_custom-launcher-icon.patch?rev=11059&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/02_custom-launcher-icon.patch (added)
+++ desktop/unstable/gnome-panel/debian/patches/02_custom-launcher-icon.patch Sat May 19 15:27:08 2007
@@ -1,0 +1,34 @@
+diff -Nur gnome-panel-2.18.1/gnome-panel/button-widget.c gnome-panel-2.18.1.new/gnome-panel/button-widget.c
+--- gnome-panel-2.18.1/gnome-panel/button-widget.c	2007-04-10 21:16:55.000000000 +0200
++++ gnome-panel-2.18.1.new/gnome-panel/button-widget.c	2007-04-12 10:06:14.000000000 +0200
+@@ -181,22 +181,19 @@
+ 	if (button->size <= 1 || button->icon_theme == NULL)
+ 		return;
+ 
+-	if (button->filename != NULL && button->filename [0] != '\0') {
+-		char *error = NULL;
+-
++	if (button->filename != NULL && button->filename [0] != '\0')
+ 		button->pixbuf = panel_load_icon (button->icon_theme,
+ 						  button->filename,
+ 						  button->size,
+ 						  button->orientation & PANEL_VERTICAL_MASK   ? button->size : -1,
+ 						  button->orientation & PANEL_HORIZONTAL_MASK ? button->size : -1,
+-						  &error);
+-		if (error) {
+-			button->pixbuf = gtk_widget_render_icon (GTK_WIDGET (button),
+-								 GTK_STOCK_MISSING_IMAGE,
+-								 (GtkIconSize) -1, NULL);
+-			g_free (error);
+-		}
+-	}
++						  NULL);
++
++	if (!button->pixbuf)
++		button->pixbuf = gtk_widget_render_icon (GTK_WIDGET (button),
++							 GTK_STOCK_MISSING_IMAGE,
++							 (GtkIconSize) -1,
++							 NULL);
+ 
+ 	button->pixbuf_hc = make_hc_pixbuf (button->pixbuf);
+