[gedit] Move loading the accels file in app::startup

[Paolo Borelli <pborelli src gnome org>]

commit a0c9c5168933db932a7c6f8d3cd1ec0a7b1aa541
Author: Paolo Borelli <pborelli gnome org>
Date:   Sun Apr 13 19:39:41 2014 +0200

    Move loading the accels file in app::startup
    
    Bug https://bugzilla.gnome.org/show_bug.cgi?id=723626
    Patch by nixahn gmail com

 gedit/gedit-app.c |   43 ++++++++++++++++++-------------------------
 1 files changed, 18 insertions(+), 25 deletions(-)
---
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index e844162..2051c5f 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -405,6 +405,22 @@ gedit_app_has_app_menu (GeditApp *app)
 }
 
 static void
+load_accels (void)
+{
+       gchar *filename;
+
+       filename = g_build_filename (gedit_dirs_get_user_config_dir (),
+                                    "accels",
+                                    NULL);
+       if (filename != NULL)
+       {
+               gedit_debug_message (DEBUG_APP, "Loading keybindings from %s\n", filename);
+               gtk_accel_map_load (filename);
+               g_free (filename);
+       }
+}
+
+static void
 gedit_app_startup (GApplication *application)
 {
        GeditApp *app = GEDIT_APP (application);
@@ -548,6 +564,8 @@ gedit_app_startup (GApplication *application)
                                         "<Primary><Alt>Page_Down",
                                         "win.next-document", NULL);
 
+       load_accels ();
+
        /* Load custom css */
        error = NULL;
        css_file = g_file_new_for_uri ("resource:///org/gnome/gedit/ui/gedit-style.css");
@@ -1077,30 +1095,6 @@ gedit_app_shutdown (GApplication *app)
        G_APPLICATION_CLASS (gedit_app_parent_class)->shutdown (app);
 }
 
-static void
-load_accels (void)
-{
-       gchar *filename;
-
-       filename = g_build_filename (gedit_dirs_get_user_config_dir (),
-                                    "accels",
-                                    NULL);
-       if (filename != NULL)
-       {
-               gedit_debug_message (DEBUG_APP, "Loading keybindings from %s\n", filename);
-               gtk_accel_map_load (filename);
-               g_free (filename);
-       }
-}
-
-static void
-gedit_app_constructed (GObject *object)
-{
-       G_OBJECT_CLASS (gedit_app_parent_class)->constructed (object);
-
-       load_accels ();
-}
-
 static gboolean
 window_delete_event (GeditWindow *window,
                      GdkEvent    *event,
@@ -1147,7 +1141,6 @@ gedit_app_class_init (GeditAppClass *klass)
 
        object_class->dispose = gedit_app_dispose;
        object_class->get_property = gedit_app_get_property;
-       object_class->constructed = gedit_app_constructed;
 
        app_class->startup = gedit_app_startup;
        app_class->activate = gedit_app_activate;