diff options
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/main.c | 18 |
2 files changed, 13 insertions, 11 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 73f93333f4..cdf167aa1d 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2000-06-08 Miguel de Icaza <miguel@helixcode.com> + + * main.c (development_warning): Use version here. Add padding to + the message. + Only destroy object if its window was not closed. + 2000-06-08 Ettore Perazzoli <ettore@helixcode.com> * e-shell-view.c (setup_bonobo_ui_handler): Oops. Don't create diff --git a/shell/main.c b/shell/main.c index c4d8735eb9..f42260d143 100644 --- a/shell/main.c +++ b/shell/main.c @@ -31,12 +31,10 @@ #include "e-shell.h" - #define STARTUP_URI "evolution:/local/Inbox" static EShell *shell; - static void no_views_left_cb (EShell *shell, gpointer data) { @@ -49,7 +47,6 @@ destroy_cb (GtkObject *object, gpointer data) gtk_main_quit (); } - #ifdef USING_OAF #include <liboaf/liboaf.h> @@ -85,14 +82,14 @@ init_corba (int *argc, char **argv) #endif /* USING_OAF */ - static void development_warning () { GtkWidget *label, *warning_dialog; - + int ret; + warning_dialog = gnome_dialog_new ( - "Evolution 0.0", + "Evolution" VERSION, GNOME_STOCK_BUTTON_OK, NULL); @@ -123,7 +120,7 @@ development_warning () gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), - label, TRUE, TRUE, 0); + label, TRUE, TRUE, 4); label = gtk_label_new ( _( @@ -137,9 +134,9 @@ development_warning () gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), label, TRUE, TRUE, 0); - gnome_dialog_run (GNOME_DIALOG (warning_dialog)); - - gtk_object_destroy (GTK_OBJECT (warning_dialog)); + ret = gnome_dialog_run (GNOME_DIALOG (warning_dialog)); + if (ret != -1) + gtk_object_destroy (GTK_OBJECT (warning_dialog)); } static void @@ -187,7 +184,6 @@ idle_cb (gpointer data) return FALSE; } - int main (int argc, char **argv) { |