[gedit/gnome-3-10] GeditApp: always set application name and icon

[Sébastien Wilmet <swilmet src gnome org>]

commit 36281b9159651481e37eb8feb5ec42fd877ebedd
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Nov 2 15:21:52 2013 +0100

    GeditApp: always set application name and icon
    
    In GeditAppOsx, it was in the init() function. In GeditAppWin32, it was
    in startup(). Now it is in GeditApp's init().
    
    https://bugzilla.gnome.org/show_bug.cgi?id=707794

 gedit/gedit-app-osx.c   |    4 ----
 gedit/gedit-app-win32.c |    4 ----
 gedit/gedit-app.c       |    3 +++
 3 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/gedit/gedit-app-osx.c b/gedit/gedit-app-osx.c
index 810d1aa..e0c72f7 100644
--- a/gedit/gedit-app-osx.c
+++ b/gedit/gedit-app-osx.c
@@ -420,10 +420,6 @@ gedit_app_osx_init (GeditAppOSX *app)
        /* This is a singleton */
        osxapp = g_object_new (GTK_TYPE_OSX_APPLICATION, NULL);
 
-       /* manually set name and icon */
-       g_set_application_name ("gedit");
-       gtk_window_set_default_icon_name ("accessories-text-editor");
-
        g_signal_connect (osxapp,
                          "NSApplicationWillTerminate",
                          G_CALLBACK (on_osx_will_terminate),
diff --git a/gedit/gedit-app-win32.c b/gedit/gedit-app-win32.c
index f57b5b1..d548eeb 100644
--- a/gedit/gedit-app-win32.c
+++ b/gedit/gedit-app-win32.c
@@ -114,10 +114,6 @@ gedit_app_win32_startup (GApplication *application)
 
        setup_path ();
        prep_console ();
-
-       /* manually set name and icon */
-       g_set_application_name("gedit");
-       gtk_window_set_default_icon_name ("accessories-text-editor");
 }
 
 static void
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index 29553cf..89a227a 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -1241,6 +1241,9 @@ static void
 gedit_app_init (GeditApp *app)
 {
        app->priv = gedit_app_get_instance_private (app);
+
+       g_set_application_name ("gedit");
+       gtk_window_set_default_icon_name ("accessories-text-editor");
 }
 
 /* Generates a unique string for a window role */