aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-setup.c
diff options
context:
space:
mode:
authorIain Holmes <iain@helixcode.com>2000-10-18 18:56:11 +0800
committerIain Holmes <iain@src.gnome.org>2000-10-18 18:56:11 +0800
commit80dbb750f559f058ef656b012c24b031f0881126 (patch)
tree5c6b0dcffc27eed9503f2c67675eae81778e8988 /shell/e-setup.c
parent8d91a9c1c66077eb71a0bdab2bd946be70afa1ac (diff)
downloadgsoc2013-evolution-80dbb750f559f058ef656b012c24b031f0881126.tar.gz
gsoc2013-evolution-80dbb750f559f058ef656b012c24b031f0881126.tar.zst
gsoc2013-evolution-80dbb750f559f058ef656b012c24b031f0881126.zip
Save the settings before the view is destroyed. (e_shell_quit): Don't save
2000-10-17 Iain Holmes <iain@helixcode.com> * e-shell.c (view_deleted_cb): Save the settings before the view is destroyed. (e_shell_quit): Don't save the settings when there are no views. 2000-10-16 Iain Holmes <iain@helixcode.com> * e-setup.c (check_evolution_directory): Better dialog. * e-splash.c (icon_free): Don't unref the canvas item. (e_splash_construct): Add a frame round the splash screen. svn path=/trunk/; revision=5985
Diffstat (limited to 'shell/e-setup.c')
-rw-r--r--shell/e-setup.c37
1 files changed, 12 insertions, 25 deletions
diff --git a/shell/e-setup.c b/shell/e-setup.c
index 4e261dd808..85bed117a1 100644
--- a/shell/e-setup.c
+++ b/shell/e-setup.c
@@ -90,8 +90,7 @@ static gboolean
check_evolution_directory (const char *evolution_directory)
{
GtkWidget *dialog;
- GtkWidget *scroller, *clist;
- GtkWidget *label;
+ GtkWidget *label1, *label2;
gboolean retval;
GList *newfiles, *l;
char *defaultdir;
@@ -104,31 +103,19 @@ check_evolution_directory (const char *evolution_directory)
if (newfiles == NULL)
return TRUE;
- dialog = gnome_dialog_new (_("Evolution Installation"),
- GNOME_STOCK_BUTTON_OK,
- GNOME_STOCK_BUTTON_CANCEL,
+ dialog = gnome_dialog_new (_("Evolution installation"),
+ GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
NULL);
- label = gtk_label_new (_("Since Evolution was installed,"
- "\nthe following files need to be updated"));
- gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label,
- TRUE, TRUE, 0);
- scroller = gtk_scrolled_window_new (NULL, NULL);
- clist = gtk_clist_new (1);
- gtk_clist_column_titles_hide (GTK_CLIST (clist));
-
- for (l = newfiles; l; l = l->next) {
- char *row[1];
-
- row[0] = l->data;
- gtk_clist_append (GTK_CLIST (clist), row);
- }
-
- gtk_container_add (GTK_CONTAINER (scroller), clist);
- gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), scroller,
- TRUE, TRUE, 0);
+
+ label1 = gtk_label_new (_("This new version of Evolution needs to install additional files\ninto your personal Evolution directory"));
+ label2 = gtk_label_new (_("Please click \"OK\" to install the files, or \"Cancel\" to exit."));
+
+ gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label1, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label2, TRUE, TRUE, 0);
+
+ gtk_widget_show (label1);
+ gtk_widget_show (label2);
- gtk_widget_show (label);
- gtk_widget_show_all (scroller);
result = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
if (result != 0)