rpms/galeon/devel galeon-2.0.7-spinnericon.patch, NONE, 1.1 galeon.spec, 1.69, 1.70

[Yanko Kaneti]

Author: yaneti

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10266

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.7-spinnericon.patch 
Log Message:
- Avoid warnings (#514289) and empty looking spinner button


galeon-2.0.7-spinnericon.patch:
 galeon-spinner.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE galeon-2.0.7-spinnericon.patch ---
 When gnome-spinner-rest theme icon can't be found don't complain
 and use the main galeon window icon which is slightly less inappropriate
 than an empty lookin space on the toolbar.

---
 src/galeon-spinner.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/galeon-spinner.c b/src/galeon-spinner.c
index 519caad..860641a 100644
--- a/src/galeon-spinner.c
+++ b/src/galeon-spinner.c
@@ -199,7 +199,8 @@ select_spinner_image (GaleonSpinner *spinner)
 	GList *element;
 
 	if (spinner->details->timer_task == 0) {
-		return g_object_ref (spinner->details->quiescent_pixbuf);
+		return (spinner->details->quiescent_pixbuf != NULL) ?
+		        g_object_ref (spinner->details->quiescent_pixbuf) : NULL;
 	}
 	
 	if (spinner->details->image_list == NULL) {
@@ -594,8 +595,7 @@ galeon_spinner_load_images (GaleonSpinner *spinner)
 					   wanted_size, 0, NULL);
 
 	if (pixbuf == NULL) {
-		g_warning ("Spinner rest icon not found");
-		return;
+        	pixbuf = gdk_pixbuf_new_from_file (DATADIR "/pixmaps/galeon.png", NULL);
 	}
 
 	spinner->details->quiescent_pixbuf = 
-- 
1.6.5.2



Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- galeon.spec	7 Dec 2009 08:34:44 -0000	1.69
+++ galeon.spec	8 Dec 2009 03:02:19 -0000	1.70
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	21%{?dist}
+Release:	22%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -20,6 +20,7 @@ Patch8:         galeon-1.3.2-home.patch
 Patch9:         galeon-2.0.7-dockcrash.patch
 Patch10:        galeon-2.0.7-moz192.patch
 Patch12:        galeon-2.0.7-nojavaconsole.patch
+Patch13:        galeon-2.0.7-spinnericon.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -63,6 +64,7 @@ makes sense. Galeon was written to do ju
 %patch9 -p1 -b .dock
 %patch10 -p1 -b .moz192
 %patch12 -p1 -b .nojavaconsole
+%patch13 -p1 -b .spinnericon
 
 
 %build
@@ -137,6 +139,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Mon Dec  8 2009 Yanko Kaneti <yaneti at declera.com> - 2.0.7-22
+- Avoid warnings (#514289) and empty looking spinner button
+
 * Mon Dec  7 2009 Yanko Kaneti <yaneti at declera.com> - 2.0.7-21
 - Add patches so that it actually builds against newer gecko