From: Ryan Lortie <desrt@desrt.ca>
Date: Tue, 21 Feb 2012 00:15:50 +0000 (+0100)
Subject: bloatpad: adjust to G(tk)Application 'quit' change
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=8ec0cfd571da29b02dbdd3464cd9508ebec4cac1;hp=ef2df583f2459bf38690db24fc476eb5f2654360;p=~andy%2Fgtk

bloatpad: adjust to G(tk)Application 'quit' change

https://bugzilla.gnome.org/show_bug.cgi?id=670485
---

diff --git a/examples/bloatpad.c b/examples/bloatpad.c
index 3b5654e95..d5f872f68 100644
--- a/examples/bloatpad.c
+++ b/examples/bloatpad.c
@@ -224,34 +224,14 @@ about_activated (GSimpleAction *action,
                          NULL);
 }
 
-static void
-quit_app (GtkApplication *app)
-{
-  GList *list, *next;
-  GtkWindow *win;
-
-  g_print ("Going down...\n");
-
-  list = gtk_application_get_windows (app);
-  while (list)
-    {
-      win = list->data;
-      next = list->next;
-
-      gtk_widget_destroy (GTK_WIDGET (win));
-
-      list = next;
-    }
-}
-
 static void
 quit_activated (GSimpleAction *action,
                 GVariant      *parameter,
                 gpointer       user_data)
 {
-  GtkApplication *app = user_data;
+  GApplication *app = user_data;
 
-  quit_app (app);
+  g_application_quit (app);
 }
 
 static GActionEntry app_entries[] = {
@@ -347,14 +327,6 @@ bloat_pad_class_init (BloatPadClass *class)
 
 }
 
-static void
-quit_cb (GtkApplication *app)
-{
-  g_print ("Session manager to us to quit\n");
-
-  quit_app (app);
-}
-
 BloatPad *
 bloat_pad_new (void)
 {
@@ -371,8 +343,6 @@ bloat_pad_new (void)
                             "register-session", TRUE,
                             NULL);
 
-  g_signal_connect (bloat_pad, "quit", G_CALLBACK (quit_cb), NULL);
-
   return bloat_pad;
 }