aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/importer/import.glade3
-rw-r--r--shell/importer/importer.c26
2 files changed, 26 insertions, 3 deletions
diff --git a/shell/importer/import.glade b/shell/importer/import.glade
index 3ff4cbaee0..d3163c9bbe 100644
--- a/shell/importer/import.glade
+++ b/shell/importer/import.glade
@@ -90,8 +90,7 @@ importing external files into Evolution.</text>
<name>page3</name>
<cxx_use_heap>True</cxx_use_heap>
<title>Import</title>
- <text>Click &quot;Finish&quot; to begin importing the file into Evolution.
-***FIXME: Change the name of the finish button***</text>
+ <text>Click &quot;Import&quot; to begin importing the file into Evolution. </text>
<background_color>153,174,191</background_color>
<logo_background_color>255,255,255</logo_background_color>
<textbox_color>255,255,255</textbox_color>
diff --git a/shell/importer/importer.c b/shell/importer/importer.c
index 21e110b361..a59ef54a4f 100644
--- a/shell/importer/importer.c
+++ b/shell/importer/importer.c
@@ -341,6 +341,7 @@ start_import (const char *filename,
bonobo_object_unref (BONOBO_OBJECT (icd->client));
gtk_object_unref (GTK_OBJECT (icd->dialog));
g_free (icd);
+ return;
}
icd->filename = g_strdup (filename);
@@ -544,6 +545,28 @@ prepare_file_page (GnomeDruidPage *page,
return FALSE;
}
+/* Hack to change the Finish button */
+static void
+druid_finish_button_change (GnomeDruid *druid)
+{
+ GtkWidget *button = druid->finish;
+ GtkWidget *hbox = GTK_BIN (button)->child, *hbox2;
+ GtkBoxChild *child;
+ GtkWidget *label;
+
+ /* Get the second item from the children list */
+ hbox2 = ((GtkBoxChild *)GTK_BOX (hbox)->children->data)->widget;
+
+ g_return_if_fail (GTK_IS_BOX (hbox2));
+ child = (GtkBoxChild *)g_list_nth_data (GTK_BOX (hbox2)->children, 0);
+ label = child->widget;
+
+ /* Safety check :) */
+ g_return_if_fail (GTK_IS_LABEL (label));
+
+ gtk_label_set_text (GTK_LABEL (label), _("Import"));
+}
+
void
show_import_wizard (void)
{
@@ -560,7 +583,8 @@ show_import_wizard (void)
data->druid = glade_xml_get_widget (data->wizard, "druid1");
gtk_signal_connect (GTK_OBJECT (data->druid), "cancel",
GTK_SIGNAL_FUNC (import_druid_cancel), data);
-
+
+ druid_finish_button_change (GNOME_DRUID (data->druid));
start = GNOME_DRUID_PAGE_START (glade_xml_get_widget (data->wizard, "page1"));
data->filedialog = glade_xml_get_widget (data->wizard, "page2");
gtk_signal_connect (GTK_OBJECT (data->filedialog), "prepare",