gnome-panel r10986 - trunk/applets/clock

[vuntz svn gnome org]

Author: vuntz
Date: Mon Apr  7 11:56:07 2008
New Revision: 10986
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=10986&view=rev

Log:
2008-04-07  Vincent Untz  <vuntz gnome org>

	* set-timezone.c: (set_time_notify): ignore no-reply dbus errors when
	setting the time because dbus doesn't use a monotonic clock.
	Patch by Matthias Clasen <mclasen redhat com>
	Fix bug #526266.


Modified:
   trunk/applets/clock/ChangeLog
   trunk/applets/clock/set-timezone.c

Modified: trunk/applets/clock/set-timezone.c
==============================================================================
--- trunk/applets/clock/set-timezone.c	(original)
+++ trunk/applets/clock/set-timezone.c	Mon Apr  7 11:56:07 2008
@@ -291,7 +291,17 @@
 			data->callback (data->data, NULL);
 	}
 	else {
-		if (dbus_g_error_has_name (error, "org.gnome.ClockApplet.Mechanism.NotPrivileged")) {
+		if (error->domain == DBUS_GERROR &&
+		    error->code == DBUS_GERROR_NO_REPLY) {
+			/* these errors happen because dbus doesn't
+			 * use monotonic clocks
+			 */	
+			g_warning ("ignoring no-reply error when setting time");
+			g_error_free (error);
+			if (data->callback)
+				data->callback (data->data, NULL);
+		}
+		else if (dbus_g_error_has_name (error, "org.gnome.ClockApplet.Mechanism.NotPrivileged")) {
 			gchar **tokens;
 
 			tokens = g_strsplit (error->message, " ", 2);