[gnome-initial-setup] gnome-initial-setup: Rename args

[Jasper St. Pierre <jstpierre src gnome org>]

commit 3f648116f7fa84189460a1953eaf22249538bd4e
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Jun 22 14:24:51 2012 -0400

    gnome-initial-setup: Rename args
    
    The consistent form is "setup", not "data"

 gnome-initial-setup/gis-summary-page.c    |   13 +++++++------
 gnome-initial-setup/gnome-initial-setup.c |   16 ++++++++--------
 gnome-initial-setup/gnome-initial-setup.h |    8 ++++----
 3 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/gnome-initial-setup/gis-summary-page.c b/gnome-initial-setup/gis-summary-page.c
index e4e995c..d1e7e67 100644
--- a/gnome-initial-setup/gis-summary-page.c
+++ b/gnome-initial-setup/gis-summary-page.c
@@ -174,16 +174,17 @@ static void
 prepare_summary_page (SetupData *setup)
 {
         GtkWidget *button;
+        GKeyFile *overrides = gis_get_overrides (setup);
         gchar *s;
 
-        s = g_key_file_get_locale_string (setup->overrides,
+        s = g_key_file_get_locale_string (overrides,
                                           "Summary", "summary-title",
                                           NULL, NULL);
         if (s)
                 gtk_label_set_text (GTK_LABEL (WID ("summary-title")), s);
         g_free (s);
 
-        s = g_key_file_get_locale_string (setup->overrides,
+        s = g_key_file_get_locale_string (overrides,
                                           "Summary", "summary-details",
                                           NULL, NULL);
         if (s) {
@@ -191,28 +192,28 @@ prepare_summary_page (SetupData *setup)
         }
         g_free (s);
 
-        s = g_key_file_get_locale_string (setup->overrides,
+        s = g_key_file_get_locale_string (overrides,
                                           "Summary", "summary-details2",
                                           NULL, NULL);
         if (s)
                 gtk_label_set_text (GTK_LABEL (WID ("summary-details2")), s);
         g_free (s);
 
-        s = g_key_file_get_locale_string (setup->overrides,
+        s = g_key_file_get_locale_string (overrides,
                                           "Summary", "summary-start-button",
                                           NULL, NULL);
         if (s)
                 gtk_button_set_label (GTK_BUTTON (WID ("summary-start-button")), s);
         g_free (s);
 
-        s = g_key_file_get_locale_string (setup->overrides,
+        s = g_key_file_get_locale_string (overrides,
                                           "Summary", "summary-tour-details",
                                           NULL, NULL);
         if (s)
                 gtk_label_set_text (GTK_LABEL (WID ("summary-tour-details")), s);
         g_free (s);
 
-        s = g_key_file_get_locale_string (setup->overrides,
+        s = g_key_file_get_locale_string (overrides,
                                           "Summary", "summary-tour-button",
                                           NULL, NULL);
         if (s)
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 13deeeb..9f61997 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -124,27 +124,27 @@ prepare_main_window (SetupData *setup)
 }
 
 GKeyFile *
-gis_get_overrides (SetupData *data)
+gis_get_overrides (SetupData *setup)
 {
-        return g_key_file_ref (data->overrides);
+        return g_key_file_ref (setup->overrides);
 }
 
 GtkBuilder *
-gis_get_builder (SetupData *data)
+gis_get_builder (SetupData *setup)
 {
-        return data->builder;
+        return setup->builder;
 }
 
 GtkWindow *
-gis_get_main_window (SetupData *data)
+gis_get_main_window (SetupData *setup)
 {
-        return data->main_window;
+        return setup->main_window;
 }
 
 GisAssistant *
-gis_get_assistant (SetupData *data)
+gis_get_assistant (SetupData *setup)
 {
-        return data->assistant;
+        return setup->assistant;
 }
 
 /* main {{{1 */
diff --git a/gnome-initial-setup/gnome-initial-setup.h b/gnome-initial-setup/gnome-initial-setup.h
index 9de1d52..f57bd2d 100644
--- a/gnome-initial-setup/gnome-initial-setup.h
+++ b/gnome-initial-setup/gnome-initial-setup.h
@@ -11,10 +11,10 @@ G_BEGIN_DECLS
 
 typedef struct _SetupData SetupData;
 
-GtkBuilder *gis_get_builder (SetupData *data);
-GtkWindow *gis_get_main_window (SetupData *data);
-GKeyFile *gis_get_overrides (SetupData *data);
-GisAssistant * gis_get_assistant (SetupData *data);
+GtkBuilder *gis_get_builder (SetupData *setup);
+GtkWindow *gis_get_main_window (SetupData *setup);
+GKeyFile *gis_get_overrides (SetupData *setup);
+GisAssistant * gis_get_assistant (SetupData *setup);
 
 #define OBJ(type,name) ((type)gtk_builder_get_object(gis_get_builder(setup),(name)))
 #define WID(name) OBJ(GtkWidget*,name)