[gnome-packagekit/glib2: 9/79] moo

[Richard Hughes <rhughes src gnome org>]

commit 2cade86b20d86e8c8697b131586fa136e79935b9
Author: Richard Hughes <richard hughsie com>
Date:   Thu Sep 10 10:58:28 2009 +0100

    moo

 src/Makefile.am          |   11 ++++++++++-
 src/gpk-backend-status.c |    4 +---
 src/gpk-prefs.c          |   29 +++++++++++++++++++++++++----
 3 files changed, 36 insertions(+), 8 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index b3dc149..208e320 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -215,10 +215,19 @@ gpk_service_pack_LDADD =				\
 
 gpk_prefs_SOURCES =					\
 	gpk-prefs.c					\
+	egg-debug.c					\
+	egg-debug.h					\
+	gpk-enum.h					\
+	gpk-enum.c					\
+	gpk-common.h					\
+	gpk-common.c					\
+	gpk-gnome.h					\
+	gpk-gnome.c					\
+	gpk-animated-icon.c				\
+	gpk-animated-icon.h				\
 	$(NULL)
 
 gpk_prefs_LDADD =					\
-	libgpkshared.a					\
 	$(shared_LIBS)					\
 	$(NULL)
 
diff --git a/src/gpk-backend-status.c b/src/gpk-backend-status.c
index d72c997..3ccb885 100644
--- a/src/gpk-backend-status.c
+++ b/src/gpk-backend-status.c
@@ -282,9 +282,6 @@ main (int argc, char *argv[])
 		goto out;
 	}
 
-	widget = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_backend"));
-	gtk_window_set_icon_name (GTK_WINDOW (widget), GPK_ICON_SOFTWARE_LOG);
-
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_close"));
 	g_signal_connect (widget, "clicked",
 			  G_CALLBACK (gpk_backend_status_close_cb), loop);
@@ -292,6 +289,7 @@ main (int argc, char *argv[])
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_backend"));
 	g_signal_connect (widget, "delete_event",
 			  G_CALLBACK (gpk_backend_status_delete_event_cb), loop);
+	gtk_window_set_icon_name (GTK_WINDOW (widget), GPK_ICON_SOFTWARE_LOG);
 	gtk_widget_show (GTK_WIDGET (widget));
 
 	/* get properties */
diff --git a/src/gpk-prefs.c b/src/gpk-prefs.c
index cddf8ea..1e70c74 100644
--- a/src/gpk-prefs.c
+++ b/src/gpk-prefs.c
@@ -443,6 +443,27 @@ out:
 }
 
 /**
+ * gpk_prefs_close_cb:
+ **/
+static void
+gpk_prefs_close_cb (GtkWidget *widget, gpointer data)
+{
+	GMainLoop *loop = (GMainLoop *) data;
+	egg_debug ("emitting action-close");
+	g_main_loop_quit (loop);
+}
+
+/**
+ * gpk_prefs_delete_event_cb:
+ **/
+static gboolean
+gpk_prefs_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+	gpk_prefs_close_cb (widget, data);
+	return FALSE;
+}
+
+/**
  * main:
  **/
 int
@@ -527,15 +548,15 @@ main (int argc, char *argv[])
 	/* Hide window first so that the dialogue resizes itself without redrawing */
 	gtk_widget_hide (main_window);
 	gtk_window_set_icon_name (GTK_WINDOW (main_window), GPK_ICON_SOFTWARE_UPDATE_PREFS);
-
-	/* Get the main window quit */
-	g_signal_connect_swapped (main_window, "delete_event", G_CALLBACK (gtk_main_quit), NULL);
+	g_signal_connect (main_window, "delete_event",
+			  G_CALLBACK (gpk_prefs_delete_event_cb), loop);
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "checkbutton_mobile_broadband"));
 	gpk_prefs_notify_checkbutton_setup (widget, GPK_CONF_CONNECTION_USE_MOBILE);
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_close"));
-	g_signal_connect_swapped (widget, "clicked", G_CALLBACK (gtk_main_quit), NULL);
+	g_signal_connect (widget, "clicked",
+			  G_CALLBACK (gpk_prefs_close_cb), loop);
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_help"));
 	g_signal_connect (widget, "clicked",
 			  G_CALLBACK (pk_button_help_cb), NULL);