gnome-power-manager r2794 - in trunk: . libunique

[rhughes svn gnome org]

Author: rhughes
Date: Wed May 14 14:45:34 2008
New Revision: 2794
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=2794&view=rev

Log:
2008-05-14  Richard Hughes  <richard hughsie com>

* configure.ac:
Correct the Unique buildrequire.

* libunique/libunique.c: (libunique_assign):
Fix build for non-HAV_UNIQUE


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/libunique/libunique.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed May 14 14:45:34 2008
@@ -59,7 +59,7 @@
 LIBNOTIFY_REQUIRED=0.4.3
 LIBWNCK_REQUIRED=2.10.0
 CAIRO_REQUIRED=1.0.0
-UNIQUE_REQUIRED=0.9.1
+UNIQUE_REQUIRED=0.9.4
 LIBPANEL_REQUIRED=2.0.0
 GSTREAMER_REQUIRED=0.10
 XRANDR_REQUIRED=1.2.0

Modified: trunk/libunique/libunique.c
==============================================================================
--- trunk/libunique/libunique.c	(original)
+++ trunk/libunique/libunique.c	Wed May 14 14:45:34 2008
@@ -38,9 +38,10 @@
 
 struct LibUniquePrivate
 {
-	gboolean		 dummy;
 #if HAVE_UNIQUE
 	UniqueApp		*uniqueapp;
+#else
+	gpointer		 uniqueapp;
 #endif
 };
 
@@ -87,7 +88,7 @@
 	/* check to see if the user has another instance open */
 	libunique->priv->uniqueapp = unique_app_new (service, NULL);
 	if (unique_app_is_running (libunique->priv->uniqueapp)) {
-		g_warning ("You have another instance running. This program will now close");
+		g_debug ("You have another instance running. This program will now close");
 		unique_app_send_message (libunique->priv->uniqueapp, UNIQUE_ACTIVATE, NULL);
 		return FALSE;
 	}