gnome-packagekit r264 - in trunk: . libgbus src

[rhughes svn gnome org]

Author: rhughes
Date: Thu Aug  7 08:54:49 2008
New Revision: 264
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=264&view=rev

Log:
from git

Removed:
   trunk/libgbus/
Modified:
   trunk/Makefile.am
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/gpk-auto-refresh.c
   trunk/src/gpk-dbus.c
   trunk/src/gpk-update-icon.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Aug  7 08:54:49 2008
@@ -1,6 +1,5 @@
 SUBDIRS =						\
 	libselftest					\
-	libgbus						\
 	libunique					\
 	docs						\
 	man						\

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Aug  7 08:54:49 2008
@@ -210,7 +210,6 @@
 AC_OUTPUT([
 Makefile
 libselftest/Makefile
-libgbus/Makefile
 libunique/Makefile
 src/Makefile
 help/Makefile

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Aug  7 08:54:49 2008
@@ -21,7 +21,6 @@
 	-DLOCALEDIR=\""$(localedir)"\"			\
 	-DVERSION="\"$(VERSION)\"" 			\
 	-DPK_DATA=\"$(pkgdatadir)\"			\
-	-I$(top_srcdir)/libgbus				\
 	-I$(top_srcdir)/libunique			\
 	-I$(top_srcdir)/libselftest			\
 	$(NULL)

Modified: trunk/src/gpk-auto-refresh.c
==============================================================================
--- trunk/src/gpk-auto-refresh.c	(original)
+++ trunk/src/gpk-auto-refresh.c	Thu Aug  7 08:54:49 2008
@@ -34,7 +34,7 @@
 #endif /* HAVE_UNISTD_H */
 #include <glib/gi18n.h>
 #include <dbus/dbus-glib.h>
-#include <libgbus.h>
+#include <pk-dbus-monitor.h>
 #include <gconf/gconf-client.h>
 
 #include <pk-debug.h>
@@ -73,8 +73,8 @@
 	gboolean		 network_active;
 	gboolean		 session_delay;
 	gboolean		 sent_get_updates;
-	LibGBus			*gbus_gs;
-	LibGBus			*gbus_gpm;
+	PkDbusMonitor		*monitor_gs;
+	PkDbusMonitor		*monitor_gpm;
 	GConfClient		*gconf_client;
 	DBusGProxy		*proxy_gs;
 	DBusGProxy		*proxy_gpm;
@@ -420,7 +420,7 @@
  * pk_connection_gpm_changed_cb:
  **/
 static void
-pk_connection_gpm_changed_cb (LibGBus *libgbus, gboolean connected, GpkAutoRefresh *arefresh)
+pk_connection_gpm_changed_cb (PkDbusMonitor *pk_dbus_monitor, gboolean connected, GpkAutoRefresh *arefresh)
 {
 	GError *error = NULL;
 	gboolean on_battery;
@@ -473,7 +473,7 @@
  * pk_connection_gs_changed_cb:
  **/
 static void
-pk_connection_gs_changed_cb (LibGBus *libgbus, gboolean connected, GpkAutoRefresh *arefresh)
+pk_connection_gs_changed_cb (PkDbusMonitor *pk_dbus_monitor, gboolean connected, GpkAutoRefresh *arefresh)
 {
 	GError *error = NULL;
 
@@ -549,16 +549,16 @@
 	}
 
 	/* watch gnome-screensaver */
-	arefresh->priv->gbus_gs = libgbus_new ();
-	g_signal_connect (arefresh->priv->gbus_gs, "connection-changed",
+	arefresh->priv->monitor_gs = pk_dbus_monitor_new ();
+	g_signal_connect (arefresh->priv->monitor_gs, "connection-changed",
 			  G_CALLBACK (pk_connection_gs_changed_cb), arefresh);
-	libgbus_assign (arefresh->priv->gbus_gs, LIBGBUS_SESSION, GS_DBUS_SERVICE);
+	pk_dbus_monitor_assign (arefresh->priv->monitor_gs, PK_DBUS_MONITOR_SESSION, GS_DBUS_SERVICE);
 
 	/* watch gnome-power-manager */
-	arefresh->priv->gbus_gpm = libgbus_new ();
-	g_signal_connect (arefresh->priv->gbus_gpm, "connection-changed",
+	arefresh->priv->monitor_gpm = pk_dbus_monitor_new ();
+	g_signal_connect (arefresh->priv->monitor_gpm, "connection-changed",
 			  G_CALLBACK (pk_connection_gpm_changed_cb), arefresh);
-	libgbus_assign (arefresh->priv->gbus_gpm, LIBGBUS_SESSION, GPM_DBUS_SERVICE);
+	pk_dbus_monitor_assign (arefresh->priv->monitor_gpm, PK_DBUS_MONITOR_SESSION, GPM_DBUS_SERVICE);
 
 	/* we check this in case we miss one of the async signals */
 	g_timeout_add_seconds (GPK_AUTO_REFRESH_PERIODIC_CHECK, gpk_auto_refresh_timeout_cb, arefresh);
@@ -583,8 +583,8 @@
 	g_return_if_fail (arefresh->priv != NULL);
 
 	g_object_unref (arefresh->priv->control);
-	g_object_unref (arefresh->priv->gbus_gs);
-	g_object_unref (arefresh->priv->gbus_gpm);
+	g_object_unref (arefresh->priv->monitor_gs);
+	g_object_unref (arefresh->priv->monitor_gpm);
 	g_object_unref (arefresh->priv->gconf_client);
 
 	/* only unref the proxies if they were ever set */

Modified: trunk/src/gpk-dbus.c
==============================================================================
--- trunk/src/gpk-dbus.c	(original)
+++ trunk/src/gpk-dbus.c	Thu Aug  7 08:54:49 2008
@@ -36,7 +36,6 @@
 #include <fcntl.h>
 
 #include <glib/gi18n.h>
-#include <libgbus.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 

Modified: trunk/src/gpk-update-icon.c
==============================================================================
--- trunk/src/gpk-update-icon.c	(original)
+++ trunk/src/gpk-update-icon.c	Thu Aug  7 08:54:49 2008
@@ -32,7 +32,7 @@
 #include <locale.h>
 #include <libnotify/notify.h>
 
-#include <libgbus.h>
+#include <pk-dbus-monitor.h>
 
 #include <pk-debug.h>
 #include <pk-common.h>
@@ -98,7 +98,7 @@
  * pk_dbus_connection_replaced_cb:
  **/
 static void
-pk_dbus_connection_replaced_cb (LibGBus *libgbus, gpointer data)
+pk_dbus_connection_replaced_cb (PkDbusMonitor *monitor, gpointer data)
 {
 	pk_warning ("exiting as we have been replaced");
 	gtk_main_quit ();
@@ -120,7 +120,7 @@
 	GError *error = NULL;
 	gboolean ret;
 	DBusGConnection *connection;
-	LibGBus *libgbus;
+	PkDbusMonitor *monitor;
 
 	const GOptionEntry options[] = {
 		{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose,
@@ -175,9 +175,9 @@
 	firmware = gpk_firmware_new ();
 
 	/* find out when we are replaced */
-	libgbus = libgbus_new ();
-	libgbus_assign (libgbus, LIBGBUS_SESSION, PK_DBUS_SERVICE);
-	g_signal_connect (libgbus, "connection-replaced",
+	monitor = pk_dbus_monitor_new ();
+	pk_dbus_monitor_assign (monitor, PK_DBUS_MONITOR_SESSION, PK_DBUS_SERVICE);
+	g_signal_connect (monitor, "connection-replaced",
 			  G_CALLBACK (pk_dbus_connection_replaced_cb), NULL);
 
 	/* get the bus */
@@ -203,7 +203,7 @@
 	g_object_unref (cupdate);
 	g_object_unref (watch);
 	g_object_unref (firmware);
-	g_object_unref (libgbus);
+	g_object_unref (monitor);
 
 	return 0;
 }