[gtk+] widget-factory: Avoid a runtime warning



commit 228fe00eccb43226a1808e0e543d50158d35b28a
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jul 22 15:32:45 2014 -0400

    widget-factory: Avoid a runtime warning
    
    Don't set accelerators too early. GTK+ has not yet been initialized
    at that point in main.

 demos/widget-factory/widget-factory.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index d992402..e9f7cfb 100644
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -586,6 +586,8 @@ activate (GApplication *app)
     const gchar *action_and_target;
     const gchar *accelerators[2];
   } accels[] = {
+    { "app.about", { "F1", NULL } },
+    { "app.quit", { "<Primary>q", NULL } },
     { "win.dark", { "<Primary>d", NULL } },
     { "win.search", { "<Primary>s", NULL } },
     { "win.delete", { "Delete", NULL } }
@@ -704,14 +706,6 @@ main (int argc, char *argv[])
     { "dessert", NULL, "s", "'bars'", NULL },
     { "pay", NULL, "s", NULL, NULL }
   };
-  struct {
-    const gchar *action_and_target;
-    const gchar *accelerators[2];
-  } accels[] = {
-    { "app.about", { "F1", NULL } },
-    { "app.quit", { "<Primary>q", NULL } },
-  };
-  gint i;
   gint status;
 
   app = gtk_application_new ("org.gtk.WidgetFactory", G_APPLICATION_NON_UNIQUE);
@@ -719,8 +713,6 @@ main (int argc, char *argv[])
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
-  for (i = 0; i < G_N_ELEMENTS (accels); i++)
-    gtk_application_set_accels_for_action (GTK_APPLICATION (app), accels[i].action_and_target, 
accels[i].accelerators);
 
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]