rpms/gnome-panel/FC-6 gnome-panel-2.16.3-no-seconds.patch, NONE, 1.1 .cvsignore, 1.47, 1.48 gnome-panel.spec, 1.157, 1.158 sources, 1.47, 1.48

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv11081

Modified Files:
	.cvsignore gnome-panel.spec sources 
Added Files:
	gnome-panel-2.16.3-no-seconds.patch 
Log Message:
2.16.3


gnome-panel-2.16.3-no-seconds.patch:
 clock.c |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

--- NEW FILE gnome-panel-2.16.3-no-seconds.patch ---
--- gnome-panel-2.16.3/applets/clock/clock.c.no-seconds	2007-01-31 14:35:04.000000000 -0500
+++ gnome-panel-2.16.3/applets/clock/clock.c	2007-01-31 14:35:53.000000000 -0500
@@ -50,6 +50,7 @@
 #ifdef HAVE_LANGINFO_H
 #include <langinfo.h>
 #endif
+#include <sys/time.h>
 
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
@@ -245,6 +246,7 @@
 {
 	ClockData *cd = data;
 	time_t new_time;
+	int timeouttime;
 
         time (&new_time);
 
@@ -264,7 +266,20 @@
 		update_clock (cd);
 	}
 
-	return TRUE;
+	if (cd->format == CLOCK_FORMAT_INTERNET)
+		timeouttime = INTERNETSECOND;
+	else {
+		struct timeval tv;
+		gettimeofday(&tv, NULL);
+		timeouttime = (1000000 - tv.tv_usec)/1000+1;
+		if (!cd->showseconds)
+			timeouttime += 1000 * (59 - cd->current_time % 60);
+	}
+        cd->timeout = g_timeout_add (timeouttime,
+				     clock_timeout_callback,
+                                     cd);
+
+	return FALSE;
 }
 
 static float
@@ -491,8 +506,13 @@
 	
 	if (cd->format == CLOCK_FORMAT_INTERNET)
 		timeouttime = INTERNETSECOND;
-	else
-		timeouttime = 1000;
+ 	else {
+ 		struct timeval tv;
+		gettimeofday(&tv, NULL);
+ 		timeouttime = (1000000 - tv.tv_usec)/1000+1;
+ 		if (!cd->showseconds)
+ 			timeouttime += 1000 * (59 - cd->current_time % 60);
+ 	}
 	
 	cd->timeout = g_timeout_add (timeouttime,
 	                             clock_timeout_callback,


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-6/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	6 Nov 2006 17:13:51 -0000	1.47
+++ .cvsignore	31 Jan 2007 19:27:54 -0000	1.48
@@ -1 +1 @@
-gnome-panel-2.16.1.tar.bz2
+gnome-panel-2.16.3.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-6/gnome-panel.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- gnome-panel.spec	16 Nov 2006 21:39:46 -0000	1.157
+++ gnome-panel.spec	31 Jan 2007 19:27:54 -0000	1.158
@@ -20,8 +20,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.16.1
-Release: 3%{?dist} 
+Version: 2.16.3
+Release: 1%{?dist} 
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -85,10 +85,9 @@
 Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
 Patch12: gnome-panel-2.14.2-xio-error.patch
 Patch13: gnome-panel-2.15.90-move-suspend-to-menu.patch
-Patch14: gnome-panel-2.15.92-no-seconds.patch
+Patch14: gnome-panel-2.16.3-no-seconds.patch
 Patch15: gnome-panel-2.16.0-compiz-support.patch
 Patch16: gnome-panel-2.16.0-fix-chinese.patch
-Patch17: gnome-panel-2.16.1-launcher-copy.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -123,7 +122,6 @@
 %patch14 -p1 -b .no-seconds
 %patch15 -p0 -b .compiz-support
 %patch16 -p1 -b .fix-chinese
-%patch17 -p1 -b .launcher-copy
 
 . %{SOURCE4}
 
@@ -295,6 +293,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jan 31 2007 Matthias Clasen <mclasen at redhat.com> - 2.16.3-1
+- Update to 2.16.3
+
 * Thu Nov 16 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.1-3
 - Fix previous patch and also include the fix
   for gnome bug 359707


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-6/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	6 Nov 2006 17:13:51 -0000	1.47
+++ sources	31 Jan 2007 19:27:54 -0000	1.48
@@ -1 +1 @@
-d0131e0b33a63b17b22b4d78b00291f8  gnome-panel-2.16.1.tar.bz2
+4af0a1ecb940f2bb27a27db50e3071c8  gnome-panel-2.16.3.tar.bz2