[gnome-packagekit] trivial: Port to GApplication API from git master

[Richard Hughes <rhughes src gnome org>]

commit d0866dcb1d9bf2b09952d3445be2eb8273d9145d
Author: Richard Hughes <richard hughsie com>
Date:   Thu Jun 17 17:09:23 2010 +0100

    trivial: Port to GApplication API from git master

 src/gpk-application-main.c   |    4 ++--
 src/gpk-log.c                |    6 +++---
 src/gpk-prefs.c              |    2 +-
 src/gpk-repo.c               |    2 +-
 src/gpk-service-pack.c       |    6 +++---
 src/gpk-update-icon.c        |    4 ++--
 src/gpk-update-viewer-main.c |    4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/gpk-application-main.c b/src/gpk-application-main.c
index 623717f..d5604d1 100644
--- a/src/gpk-application-main.c
+++ b/src/gpk-application-main.c
@@ -42,7 +42,7 @@
 static void
 gpk_application_close_cb (GpkApplication *app, GApplication *application)
 {
-	g_application_quit (application, 0);
+	g_application_quit_with_data (application, NULL);
 }
 
 /**
@@ -108,7 +108,7 @@ main (int argc, char *argv[])
 	app = gpk_application_new ();
 
 	/* are we already activated? */
-	application = g_application_new_and_register ("org.freedesktop.PackageKit.Application", argc, argv);
+	application = g_application_new ("org.freedesktop.PackageKit.Application", argc, argv);
 	g_signal_connect (application, "prepare-activation",
 			  G_CALLBACK (gpk_application_prepare_action_cb), app);
 
diff --git a/src/gpk-log.c b/src/gpk-log.c
index 20ae507..38c616d 100644
--- a/src/gpk-log.c
+++ b/src/gpk-log.c
@@ -671,7 +671,7 @@ gpk_log_entry_filter_cb (GtkWidget *widget, GdkEventKey *event, gpointer user_da
 static gboolean
 gpk_log_delete_event_cb (GtkWidget *widget, GdkEvent *event, GApplication *application)
 {
-	g_application_quit (application, 0);
+	g_application_quit_with_data (application, NULL);
 	return FALSE;
 }
 
@@ -681,7 +681,7 @@ gpk_log_delete_event_cb (GtkWidget *widget, GdkEvent *event, GApplication *appli
 static void
 gpk_log_button_close_cb (GtkWidget *widget, GApplication *application)
 {
-	g_application_quit (application, 0);
+	g_application_quit_with_data (application, NULL);
 }
 
 /**
@@ -736,7 +736,7 @@ main (int argc, char *argv[])
 		return 1;
 
 	/* are we already activated? */
-	application = g_application_new_and_register ("org.freedesktop.PackageKit.LogViewer", argc, argv);
+	application = g_application_new ("org.freedesktop.PackageKit.LogViewer", argc, argv);
 	g_signal_connect (application, "prepare-activation",
 			  G_CALLBACK (gpk_log_application_prepare_action_cb), NULL);
 
diff --git a/src/gpk-prefs.c b/src/gpk-prefs.c
index dc65c49..e18f881 100644
--- a/src/gpk-prefs.c
+++ b/src/gpk-prefs.c
@@ -436,7 +436,7 @@ main (int argc, char *argv[])
 	}
 
 	/* are we already activated? */
-	application = g_application_new_and_register ("org.freedesktop.PackageKit.Prefs", argc, argv);
+	application = g_application_new ("org.freedesktop.PackageKit.Prefs", argc, argv);
 	g_signal_connect (application, "prepare-activation",
 			  G_CALLBACK (gpk_prefs_application_prepare_action_cb), NULL);
 
diff --git a/src/gpk-repo.c b/src/gpk-repo.c
index 41e9f23..6095b2a 100644
--- a/src/gpk-repo.c
+++ b/src/gpk-repo.c
@@ -644,7 +644,7 @@ main (int argc, char *argv[])
                                            GPK_DATA G_DIR_SEPARATOR_S "icons");
 
 	/* are we already activated? */
-	application = g_application_new_and_register ("org.freedesktop.PackageKit.Repo", argc, argv);
+	application = g_application_new ("org.freedesktop.PackageKit.Repo", argc, argv);
 	g_signal_connect (application, "prepare-activation",
 			  G_CALLBACK (gpk_repo_application_prepare_action_cb), NULL);
 
diff --git a/src/gpk-service-pack.c b/src/gpk-service-pack.c
index 9d2c6f5..e02df43 100644
--- a/src/gpk-service-pack.c
+++ b/src/gpk-service-pack.c
@@ -677,7 +677,7 @@ gpk_pack_radio_copy_cb (GtkWidget *widget2, gpointer data)
 static gboolean
 gpk_pack_delete_event_cb (GtkWidget *widget, GdkEvent *event, GApplication *application)
 {
-	g_application_quit (application, 0);
+	g_application_quit_with_data (application, NULL);
 	return FALSE;
 }
 
@@ -687,7 +687,7 @@ gpk_pack_delete_event_cb (GtkWidget *widget, GdkEvent *event, GApplication *appl
 static void
 gpk_pack_button_close_cb (GtkWidget *widget, GApplication *application)
 {
-	g_application_quit (application, 0);
+	g_application_quit_with_data (application, NULL);
 }
 
 /**
@@ -753,7 +753,7 @@ main (int argc, char *argv[])
 	gtk_init (&argc, &argv);
 
 	/* are we already activated? */
-	application = g_application_new_and_register ("org.freedesktop.PackageKit.ServicePack", argc, argv);
+	application = g_application_new ("org.freedesktop.PackageKit.ServicePack", argc, argv);
 	g_signal_connect (application, "prepare-activation",
 			  G_CALLBACK (gpk_pack_application_prepare_action_cb), NULL);
 
diff --git a/src/gpk-update-icon.c b/src/gpk-update-icon.c
index e731c15..85c1430 100644
--- a/src/gpk-update-icon.c
+++ b/src/gpk-update-icon.c
@@ -48,7 +48,7 @@
 static gboolean
 gpk_icon_timed_exit_cb (GApplication *application)
 {
-	g_application_quit (application, 0);
+	g_application_quit_with_data (application, NULL);
 	return FALSE;
 }
 
@@ -113,7 +113,7 @@ main (int argc, char *argv[])
 	}
 
 	/* are we already activated? */
-	application = g_application_new_and_register ("org.freedesktop.PackageKit.UpdateIcon", argc, argv);
+	application = g_application_new ("org.freedesktop.PackageKit.UpdateIcon", argc, argv);
 
 	/* add application specific icons to search path */
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
diff --git a/src/gpk-update-viewer-main.c b/src/gpk-update-viewer-main.c
index ffed5b5..1dbacfd 100644
--- a/src/gpk-update-viewer-main.c
+++ b/src/gpk-update-viewer-main.c
@@ -37,7 +37,7 @@
 static void
 gpk_update_viewer_close_cb (GpkUpdateViewer *update_viewer, GApplication *application)
 {
-	g_application_quit (application, 0);
+	g_application_quit_with_data (application, NULL);
 }
 
 /**
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
 	update_viewer = gpk_update_viewer_new ();
 
 	/* are we already activated? */
-	application = g_application_new_and_register ("org.freedesktop.PackageKit.UpdateViewer", argc, argv);
+	application = g_application_new ("org.freedesktop.PackageKit.UpdateViewer", argc, argv);
 	g_signal_connect (application, "prepare-activation",
 			  G_CALLBACK (gpk_update_viewer_application_prepare_action_cb), update_viewer);