diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-02-25 22:44:16 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-02-25 22:44:16 +0800 |
| commit | 71caaeddaabff9f25d0f89acab421554e661fbe9 (patch) | |
| tree | cf251584f969afd48e0aa62ddeada13f7a5e6167 | |
| parent | f446063c572a9278fa3ce8e6b359c541ace68814 (diff) | |
| download | gsoc2013-evolution-71caaeddaabff9f25d0f89acab421554e661fbe9.tar gsoc2013-evolution-71caaeddaabff9f25d0f89acab421554e661fbe9.tar.gz gsoc2013-evolution-71caaeddaabff9f25d0f89acab421554e661fbe9.tar.bz2 gsoc2013-evolution-71caaeddaabff9f25d0f89acab421554e661fbe9.tar.lz gsoc2013-evolution-71caaeddaabff9f25d0f89acab421554e661fbe9.tar.xz gsoc2013-evolution-71caaeddaabff9f25d0f89acab421554e661fbe9.tar.zst gsoc2013-evolution-71caaeddaabff9f25d0f89acab421554e661fbe9.zip | |
Use g_signal_connect_after to connect to the "prepare" signal to work
* e-shell-startup-wizard.c (connect_page, make_importer_page): Use
g_signal_connect_after to connect to the "prepare" signal to work
around a GnomeDruidPageStandard bug (b.g.o 81869)
(e_shell_startup_wizard_create): Remove the "return TRUE" that was
added here a while back to disable the startup wizard.
* glade/evolution-startup-wizard.glade: Change "Next" and "Finish"
in the text to "Forward" and "Apply" to match the gnome 2 druid
buttons.
svn path=/trunk/; revision=20049
| -rw-r--r-- | shell/ChangeLog | 12 | ||||
| -rw-r--r-- | shell/e-shell-startup-wizard.c | 17 | ||||
| -rw-r--r-- | shell/glade/evolution-startup-wizard.glade | 4 |
3 files changed, 25 insertions, 8 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 4a8f100fcc..3b56711524 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,15 @@ +2003-02-25 Dan Winship <danw@ximian.com> + + * e-shell-startup-wizard.c (connect_page, make_importer_page): Use + g_signal_connect_after to connect to the "prepare" signal to work + around a GnomeDruidPageStandard bug (b.g.o 81869) + (e_shell_startup_wizard_create): Remove the "return TRUE" that was + added here a while back to disable the startup wizard. + + * glade/evolution-startup-wizard.glade: Change "Next" and "Finish" + in the text to "Forward" and "Apply" to match the gnome 2 druid + buttons. + 2003-02-24 Rodney Dawes <dobey@ximian.com> * e-shell-view.c: Doh, forgot to remove the e-gray-bar.h include diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c index 97afc874df..9e90180704 100644 --- a/shell/e-shell-startup-wizard.c +++ b/shell/e-shell-startup-wizard.c @@ -385,12 +385,19 @@ connect_page (GtkWidget *page, { g_signal_connect (page, "next", G_CALLBACK (next_func), data); - g_signal_connect (page, "prepare", - G_CALLBACK (prepare_func), data); g_signal_connect (page, "back", G_CALLBACK (back_func), data); g_signal_connect (page, "finish", G_CALLBACK (finish_func), data); + + /* At least in 2.0 (and probably 2.2 too), + * GnomeDruidPageStandard is broken and you need to + * connect_after to "prepare" or else its default method will + * run after your signal handler and undo its button + * sensitivity changes. + */ + g_signal_connect_after (page, "prepare", + G_CALLBACK (prepare_func), data); } static MailDialogPage * @@ -807,8 +814,8 @@ make_importer_page (SWData *data) page->page = glade_xml_get_widget (data->wizard, "import-page"); g_return_val_if_fail (page->page != NULL, NULL); - g_signal_connect (page->page, "prepare", - G_CALLBACK (prepare_importer_page), data); + g_signal_connect_after (page->page, "prepare", + G_CALLBACK (prepare_importer_page), data); page->vbox = GNOME_DRUID_PAGE_STANDARD (page->page)->vbox; gtk_container_set_border_width (GTK_CONTAINER (page->vbox), 4); @@ -847,8 +854,6 @@ e_shell_startup_wizard_create (void) SWData *data; GSList *accounts; - return TRUE; - client = gconf_client_get_default (); accounts = gconf_client_get_list (client, "/apps/evolution/mail/accounts", GCONF_VALUE_STRING, NULL); g_object_unref (client); diff --git a/shell/glade/evolution-startup-wizard.glade b/shell/glade/evolution-startup-wizard.glade index 240466a228..73c8c987a3 100644 --- a/shell/glade/evolution-startup-wizard.glade +++ b/shell/glade/evolution-startup-wizard.glade @@ -24,7 +24,7 @@ Evolution to connect to your email accounts, and to import files from other applications. -Please click the "Next" button to continue. </property> +Please click the "Forward" button to continue. </property> <property name="logo_image">evolution.png</property> <property name="position">GNOME_EDGE_START</property> <property name="visible">yes</property> @@ -238,7 +238,7 @@ Please click the "Next" button to continue. </property> <property name="text" translatable="yes">You have successfully entered all of the information needed to set up Evolution. -Click the "Finish" button to save your settings. </property> +Click the "Apply" button to save your settings. </property> <property name="logo_image">evolution.png</property> <property name="position">GNOME_EDGE_FINISH</property> <property name="visible">yes</property> |