rpms/gai-temp/devel gai-temp-0.1.1-gerror.patch, NONE, 1.1 gai-temp-0.1.1-glib-gobject-critical.patch, NONE, 1.1 gai-temp.spec, 1.11, 1.12

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/gai-temp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26661

Modified Files:
	gai-temp.spec 
Added Files:
	gai-temp-0.1.1-gerror.patch 
	gai-temp-0.1.1-glib-gobject-critical.patch 
Log Message:
* Mon Aug 20 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.1.1-8
- Patch GError and GObject issues.


gai-temp-0.1.1-gerror.patch:

--- NEW FILE gai-temp-0.1.1-gerror.patch ---
diff -Nur gai-temp-0.1.1-orig/readtemp.c gai-temp-0.1.1/readtemp.c
--- gai-temp-0.1.1-orig/readtemp.c	2005-05-30 23:44:18.000000000 +0200
+++ gai-temp-0.1.1/readtemp.c	2007-08-20 01:58:56.000000000 +0200
@@ -119,8 +119,10 @@
 	if (!g_file_get_contents (*pf,
 				   &content, &length,&error))
 	{
+        g_clear_error(&error);
 	    continue; /* could not open the file, try the next one */
 	}
+    g_clear_error(&error);
 	
 	progress_info[0]++;    
 
@@ -377,9 +379,11 @@
 	fprintf (stderr, "lm_sensor_temp: error while reading %s\n"
 		 "Do you use kernel 2.6 and have lm_sensor modules loaded?\n", 
 		 path);
+        g_clear_error(&error);
 	*state = ERROR_READING;
 	return s_list;
     }
+    g_clear_error(&error);
 	
     /* look for i2c-? */
 
@@ -410,9 +414,11 @@
 		    fprintf (stderr, "lm_sensor_temp: internal error?\n"
 			     "  could not open %s\n", full_path);
 		    g_free (full_path);
+            g_clear_error(&error);
 
 		    return s_list;
 		}
+        g_clear_error(&error);
 
 		while ( (subdname = (gchar*) g_dir_read_name (subdir)) )
 		{
@@ -476,6 +482,7 @@
 					g_free (dev);
 					
 				    } /* if got content */
+                    g_clear_error(&error);
 				    
 				} /* if file exists */
 				else

gai-temp-0.1.1-glib-gobject-critical.patch:

--- NEW FILE gai-temp-0.1.1-glib-gobject-critical.patch ---
diff -Nur gai-temp-0.1.1-orig/gai-temp.c gai-temp-0.1.1/gai-temp.c
--- gai-temp-0.1.1-orig/gai-temp.c	2005-05-30 23:44:18.000000000 +0200
+++ gai-temp-0.1.1/gai-temp.c	2007-08-20 02:15:17.000000000 +0200
@@ -274,7 +274,7 @@
 	fprintf (stdlog, "New applet size: %ix%i\n", bg_w, bg_h);
 
 	/* free the old pixmap*/
-	g_object_unref (setup.bg);
+	if (setup.bg) { g_object_unref (setup.bg); }
 
 	/* allocate space for the new background pixmap */
 	setup.bg = gdk_pixbuf_new (GDK_COLORSPACE_RGB,


Index: gai-temp.spec
===================================================================
RCS file: /cvs/extras/rpms/gai-temp/devel/gai-temp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gai-temp.spec	2 Aug 2007 20:06:03 -0000	1.11
+++ gai-temp.spec	20 Aug 2007 00:20:36 -0000	1.12
@@ -1,12 +1,14 @@
 Summary:	Applet that displays HDD and CPU temperature
 Name:		gai-temp
 Version:	0.1.1
-Release:	7
+Release:	8
 Source0:	http://leidola.newcon.de/daten/gai-temp/%{name}-%{version}.tar.gz
 URL:		http://leidola.newcon.de/projekte/gai-temp/gai-temp-en.html
 License:	GPL+
 Group:		User Interface/Desktops
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:     gai-temp-0.1.1-gerror.patch
+Patch1:     gai-temp-0.1.1-glib-gobject-critical.patch
 BuildRequires: gai-devel
 
 %description
@@ -16,6 +18,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gerror
+%patch1 -p1 -b .glib-gobject-critical
 
 
 %build
@@ -41,6 +45,9 @@
 
 
 %changelog
+* Mon Aug 20 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.1.1-8
+- Patch GError and GObject issues.
+
 * Thu Aug  2 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.1.1-7
 - Clarify licence (GPL+).