[gnome-dictionary] Pass the application pointer to the window constructor

[Emmanuele Bassi <ebassi src gnome org>]

commit e01fd79c298423096dbfc4b98692dc246fcb9f78
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Apr 3 14:25:22 2015 +0100

    Pass the application pointer to the window constructor
    
    We don't need to set the application ourselves.

 src/gdict-app.c    |    8 ++++----
 src/gdict-window.c |   13 ++++++++-----
 src/gdict-window.h |    1 +
 3 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/src/gdict-app.c b/src/gdict-app.c
index ddd8b8b..d644d47 100644
--- a/src/gdict-app.c
+++ b/src/gdict-app.c
@@ -225,12 +225,12 @@ gdict_app_command_line (GApplication            *application,
       gdict_match_words == NULL)
     {
       GtkWidget *window = gdict_window_new (GDICT_WINDOW_ACTION_CLEAR,
+                                            GTK_APPLICATION (application),
                                             app->loader,
                                             gdict_source_name,
                                             gdict_database_name,
                                             gdict_strategy_name,
                                             NULL);
-      gtk_window_set_application (GTK_WINDOW (window), GTK_APPLICATION (application));
       gtk_widget_show (window);
 
       goto out;
@@ -247,13 +247,13 @@ gdict_app_command_line (GApplication            *application,
       GtkWidget *window;
 
       window = gdict_window_new (GDICT_WINDOW_ACTION_LOOKUP,
+                                 GTK_APPLICATION (application),
                                  app->loader,
                                  gdict_source_name,
                                  gdict_database_name,
                                  gdict_strategy_name,
                                  word);
       
-      gtk_window_set_application (GTK_WINDOW (window), GTK_APPLICATION (application));
       gtk_widget_show (window);
     }
 
@@ -268,13 +268,13 @@ gdict_app_command_line (GApplication            *application,
       GtkWidget *window;
 
       window = gdict_window_new (GDICT_WINDOW_ACTION_MATCH,
+                                 GTK_APPLICATION (application),
                                  app->loader,
                                 gdict_source_name,
                                  gdict_database_name,
                                  gdict_strategy_name,
                                 word);
       
-      gtk_window_set_application (GTK_WINDOW (window), GTK_APPLICATION (application));
       gtk_widget_show (window);
     }
 
@@ -290,11 +290,11 @@ gdict_app_activate (GApplication *application)
 {
   GdictApp *app = GDICT_APP (application);
   GtkWidget *window = gdict_window_new (GDICT_WINDOW_ACTION_CLEAR,
+                                        GTK_APPLICATION (application),
                                         app->loader,
                                         NULL, NULL, NULL,
                                         NULL);
 
-  gtk_window_set_application (GTK_WINDOW (window), GTK_APPLICATION (application));
   gtk_widget_show (window);
 }
 
diff --git a/src/gdict-window.c b/src/gdict-window.c
index cf20b9a..d756e64 100644
--- a/src/gdict-window.c
+++ b/src/gdict-window.c
@@ -872,6 +872,7 @@ gdict_window_cmd_file_new (GSimpleAction   *action,
                            gpointer         user_data)
 {
   GdictWindow *window = user_data;
+  GtkApplication *application = gtk_window_get_application (GTK_WINDOW (window));
   GtkWidget *new_window;
   gchar *word = NULL;
 
@@ -881,6 +882,7 @@ gdict_window_cmd_file_new (GSimpleAction   *action,
   if (word)
     {
       new_window = gdict_window_new (GDICT_WINDOW_ACTION_LOOKUP,
+                                     application,
                                      window->loader,
                                      NULL,
                                      NULL,
@@ -890,14 +892,13 @@ gdict_window_cmd_file_new (GSimpleAction   *action,
     }
   else
     new_window = gdict_window_new (GDICT_WINDOW_ACTION_CLEAR,
+                                   application,
                                    window->loader,
                                    NULL,
                                    NULL,
                                    NULL,
                                    NULL);
 
-  gtk_window_set_application (GTK_WINDOW (new_window),
-                              gtk_window_get_application (GTK_WINDOW (window)));
   gtk_widget_show (new_window);
   
   g_signal_emit (window, gdict_window_signals[CREATED], 0, new_window);
@@ -1500,17 +1501,17 @@ gdict_window_link_clicked (GdictDefbox *defbox,
                            GdictWindow *window)
 {
   GtkWidget *new_window;
+  GtkApplication *application = gtk_window_get_application (GTK_WINDOW (window));
 
   gdict_window_store_state (window);
 
   new_window = gdict_window_new (GDICT_WINDOW_ACTION_LOOKUP,
+                                 application,
                                  window->loader,
                                  NULL,
                                  NULL,
                                  NULL,
                                  link_text);
-  gtk_window_set_application (GTK_WINDOW (new_window),
-                              gtk_window_get_application (GTK_WINDOW (window)));
   gtk_widget_show (new_window);
   
   g_signal_emit (window, gdict_window_signals[CREATED], 0, new_window);
@@ -1993,6 +1994,7 @@ gdict_window_init (GdictWindow *window)
 
 GtkWidget *
 gdict_window_new (GdictWindowAction  action,
+                  GtkApplication    *app,
                  GdictSourceLoader *loader,
                  const gchar       *source_name,
                   const gchar       *database_name,
@@ -2001,10 +2003,11 @@ gdict_window_new (GdictWindowAction  action,
 {
   GtkWidget *retval;
   GdictWindow *window;
-  
+
   g_return_val_if_fail (GDICT_IS_SOURCE_LOADER (loader), NULL);
   
   retval = g_object_new (GDICT_TYPE_WINDOW,
+                         "application", app,
                         "action", action,
                          "source-loader", loader,
                         "source-name", source_name,
diff --git a/src/gdict-window.h b/src/gdict-window.h
index cb807f9..1190765 100644
--- a/src/gdict-window.h
+++ b/src/gdict-window.h
@@ -120,6 +120,7 @@ struct _GdictWindowClass
 
 GType      gdict_window_get_type (void) G_GNUC_CONST;
 GtkWidget *gdict_window_new      (GdictWindowAction  action,
+                                  GtkApplication    *app,
                                  GdictSourceLoader *loader,
                                  const gchar       *source_name,
                                   const gchar       *database_name,