rpms/gnome-pilot/devel gnome-pilot-2.0.17-fix-missing-icons.patch, NONE, 1.1 gnome-pilot.spec, 1.70, 1.71

[Matthew Barnes]

Author: mbarnes

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

Modified Files:
	gnome-pilot.spec 
Added Files:
	gnome-pilot-2.0.17-fix-missing-icons.patch 
Log Message:

* Tue Jul 28 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.17-4
- Add patch for RH bug #512004 (missing icon in applet).


gnome-pilot-2.0.17-fix-missing-icons.patch:
 pilot.c |   29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

--- NEW FILE gnome-pilot-2.0.17-fix-missing-icons.patch ---
diff -up gnome-pilot-2.0.17/applet/pilot.c.fix-missing-icons gnome-pilot-2.0.17/applet/pilot.c
--- gnome-pilot-2.0.17/applet/pilot.c.fix-missing-icons	2007-01-11 03:32:39.000000000 -0500
+++ gnome-pilot-2.0.17/applet/pilot.c	2009-07-28 10:38:02.000000000 -0400
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <gnome.h>
 #include <glade/glade.h>
-#include <libgnomeui/gnome-window-icon.h>
+#include <gtk/gtk.h>
 #include <panel-applet-gconf.h>
 
 #include <signal.h>
@@ -131,6 +131,7 @@ gpilotd_connect_cb (GnomePilotClient *cl
 {
 	GdkColormap *colormap;
 	gchar *buf;
+	GError *error;
 	PilotApplet *applet = PILOT_APPLET (user_data);
 
 	gtk_tooltips_set_tip (applet->tooltips, GTK_WIDGET(applet->applet),
@@ -146,8 +147,8 @@ gpilotd_connect_cb (GnomePilotClient *cl
 	if (applet->properties.popups == FALSE) return;
 
 	if (applet->progressDialog == NULL) {
-		gnome_window_icon_set_default_from_file (
-				GNOME_ICONDIR "/sync_icon.png");
+		gtk_window_set_default_icon_from_file (
+		    GNOME_ICONDIR "/sync_icon.png", &error);
 		GladeXML *xml              = glade_xml_new (applet->glade_file,"ProgressDialog",NULL);
 		applet->progressDialog       = glade_xml_get_widget (xml,"ProgressDialog");
 		applet->sync_label           = glade_xml_get_widget (xml,"sync_label");
@@ -427,7 +428,10 @@ handle_client_error (PilotApplet *self)
 
 static void
 about_cb(BonoboUIComponent *uic, PilotApplet *pilot, const gchar *verbname)
+
 {
+	GError *error;
+
 	GtkWidget *about;
 	const gchar *authors[] = {"Vadim Strizhevsky <vadim at optonline.net>",
 				  "Eskil Heyn Olsen, <eskil at eskil.dk>",
@@ -437,8 +441,15 @@ about_cb(BonoboUIComponent *uic, PilotAp
 				  "Matt Davey <mcdavey at mrao.cam.ac.uk>",
 				  NULL};
 
-	gnome_window_icon_set_default_from_file (
-				GNOME_ICONDIR "/sync_icon.png");
+	gtk_window_set_default_icon_from_file (
+	    GNOME_ICONDIR "/sync_icon.png", &error);
+
+
+	if (error)
+	{
+		g_warning ("Can't find icon: " GNOME_ICONDIR "/sync_icon.png" );
+	}
+
 	about = gnome_about_new (_("gnome-pilot applet"), 
 				 VERSION,
 				 _("Copyright 2000-2006 Free Software Foundation, Inc."),
@@ -493,8 +504,9 @@ properties_cb (BonoboUIComponent *uic, g
 	PilotApplet *self = user_data;
 	GtkWidget *button, *entry, *dialog;
 	GladeXML *xml;
+	GError *error;
 
-	gnome_window_icon_set_default_from_file (GNOME_ICONDIR "/sync_icon.png");
+	gtk_window_set_default_icon_from_file (GNOME_ICONDIR "/sync_icon.png", &error);
 	xml =glade_xml_new (self->glade_file,"PropertiesDialog", NULL);
 	dialog=glade_xml_get_widget (xml,"PropertiesDialog");
 	
@@ -1325,7 +1337,6 @@ static void
 create_pilot_widgets (GtkWidget *widget, PilotApplet *self) 
 { 
 	GtkStyle *style; 
-	int i; 
 
 	static GtkTargetEntry drop_types [] = {  
 		{ "text/uri-list", 0, TARGET_URI_LIST }, 
@@ -1345,10 +1356,6 @@ create_pilot_widgets (GtkWidget *widget,
 
 	self->curstate = INITIALISING; 
 
-	for (i = 0; i < sizeof (pixmaps)/sizeof (pixmaps[0]); i++) 
-		pixmaps[i] = gnome_program_locate_file(
-		    NULL, GNOME_FILE_DOMAIN_PIXMAP, pixmaps[i], TRUE, NULL);
-
 	self->image = gtk_image_new_from_file (pixmaps[self->curstate]); 
 
 	gtk_signal_connect (GTK_OBJECT (widget), "button-press-event", 


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- gnome-pilot.spec	25 Jul 2009 00:43:59 -0000	1.70
+++ gnome-pilot.spec	28 Jul 2009 14:44:07 -0000	1.71
@@ -4,7 +4,7 @@
 
 Name: gnome-pilot
 Version: 2.0.17
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+ and GPLv2+
 Group: Applications/Communications
 Summary: GNOME pilot programs
@@ -17,6 +17,9 @@ ExcludeArch: s390 s390x
 # RH bug #135304 (sort of)
 Patch1: gnome-pilot-2.0.17-fix-conduit-dir.patch
 
+# RH bug #512004 / GNOME bug #584894
+Patch2: gnome-pilot-2.0.17-fix-missing-icons.patch
+
 ### Dependencies ###
 
 Requires(post): scrollkeeper
@@ -66,6 +69,7 @@ gpilotd libraries and includes.
 %prep
 %setup -q
 %patch1 -p1 -b .fix-conduit-dir
+%patch2 -p1 -b .fix-missing-icons
 
 %build
 autoreconf --force --install
@@ -163,6 +167,9 @@ scrollkeeper-update -q
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Jul 28 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.17-4
+- Add patch for RH bug #512004 (missing icon in applet).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild