Updated POTFILES.skip

[~andy/gtk] / examples / bloatpad.c

diff --git a/examples/bloatpad.c b/examples/bloatpad.c
index ba8164a708de901285660d24a0259251848f25c9..d5f872f68180e47112736bdd906166f7fe32ba05 100644 (file)
--- 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[] = {
@@ -275,25 +255,50 @@ bloat_pad_startup (GApplication *application)
                                "<interface>"
                                "  <menu id='app-menu'>"
                                "    <section>"
-                               "      <item label='_New Window' action='app.new' accel='&lt;Primary&gt;n'/>"
+                               "      <item>"
+                               "        <attribute name='label' translatable='yes'>_New Window</attribute>"
+                               "        <attribute name='action'>app.new</attribute>"
+                               "        <attribute name='accel'>&lt;Primary&gt;n</attribute>"
+                               "      </item>"
                                "    </section>"
                                "    <section>"
-                               "      <item label='_About Bloatpad' action='app.about'/>"
+                               "      <item>"
+                               "        <attribute name='label' translatable='yes'>_About Bloatpad</attribute>"
+                               "        <attribute name='action'>app.about</attribute>"
+                               "      </item>"
                                "    </section>"
                                "    <section>"
-                               "      <item label='_Quit' action='app.quit' accel='&lt;Primary&gt;q'/>"
+                               "      <item>"
+                               "        <attribute name='label' translatable='yes'>_Quit</attribute>"
+                               "        <attribute name='action'>app.quit</attribute>"
+                               "        <attribute name='accel'>&lt;Primary&gt;q</attribute>"
+                               "      </item>"
                                "    </section>"
                                "  </menu>"
                                "  <menu id='menubar'>"
-                               "    <submenu label='_Edit'>"
+                               "    <submenu>"
+                               "      <attribute name='label' translatable='yes'>_Edit</attribute>"
                                "      <section>"
-                               "        <item label='_Copy' action='win.copy' accel='&lt;Primary&gt;c'/>"
-                               "        <item label='_Paste' action='win.paste' accel='&lt;Primary&gt;v'/>"
+                               "        <item>"
+                               "          <attribute name='label' translatable='yes'>_Copy</attribute>"
+                               "          <attribute name='action'>win.copy</attribute>"
+                               "          <attribute name='accel'>&lt;Primary&gt;c</attribute>"
+                               "        </item>"
+                               "        <item>"
+                               "          <attribute name='label' translatable='yes'>_Parse</attribute>"
+                               "          <attribute name='action'>win.parse</attribute>"
+                               "          <attribute name='accel'>&lt;Primary&gt;v</attribute>"
+                               "        </item>"
                                "      </section>"
                                "    </submenu>"
-                               "    <submenu label='_View'>"
+                               "    <submenu>"
+                               "      <attribute name='label' translatable='yes'>_View</attribute>"
                                "      <section>"
-                               "        <item label='_Fullscreen' action='win.fullscreen'/>"
+                               "        <item>"
+                               "          <attribute name='label' translatable='yes'>_Fullscreen</attribute>"
+                               "          <attribute name='action'>win.fullscreen</attribute>"
+                               "          <attribute name='accel'>F11</attribute>"
+                               "        </item>"
                                "      </section>"
                                "    </submenu>"
                                "  </menu>"
@@ -322,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)
 {
@@ -346,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;
 }