From f4cea63565f0f1e9485027108292d87143b0eba2 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 18 Jun 2004 18:16:28 +0000 Subject: test for skip_warning_dialog value in gconf here and not in 2004-06-18 Radek Doulik * main.c (main): test for skip_warning_dialog value in gconf here and not in show_development_warning, otherwise we don't add or call idle_cb and evo will not run (show_development_warning): do not read skip_warning_dialog here svn path=/trunk/; revision=26423 --- shell/ChangeLog | 7 +++++++ shell/main.c | 20 +++++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 2a4ac3608f..7da02fabf5 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2004-06-18 Radek Doulik + + * main.c (main): test for skip_warning_dialog value in gconf here + and not in show_development_warning, otherwise we don't add or + call idle_cb and evo will not run + (show_development_warning): do not read skip_warning_dialog here + 2004-06-18 Not Zed ** See bug #54498. diff --git a/shell/main.c b/shell/main.c index 7287f7e7f5..e6a1a4dc70 100644 --- a/shell/main.c +++ b/shell/main.c @@ -202,18 +202,8 @@ show_development_warning(void) GtkWidget *warning_dialog; GtkWidget *dont_bother_me_again_checkbox; GtkWidget *alignment; - GConfClient *client; char *text; - client = gconf_client_get_default (); - - if (gconf_client_get_bool (client, "/apps/evolution/shell/skip_warning_dialog", NULL)) { - g_object_unref (client); - return; - } - - g_object_unref (client); - warning_dialog = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (warning_dialog), "Evolution " VERSION); gtk_window_set_modal (GTK_WINDOW (warning_dialog), TRUE); @@ -488,6 +478,10 @@ main (int argc, char **argv) POPT_AUTOHELP { NULL, '\0', 0, NULL, 0, NULL, NULL } }; +#ifdef DEVELOPMENT + GConfClient *client; + gboolean skip_warning_dialog; +#endif GSList *uri_list; GValue popt_context_value = { 0, }; GnomeProgram *program; @@ -577,7 +571,11 @@ main (int argc, char **argv) gnome_sound_init ("localhost"); #ifdef DEVELOPMENT - if (!getenv ("EVOLVE_ME_HARDER")) + client = gconf_client_get_default (); + skip_warning_dialog = gconf_client_get_bool (client, "/apps/evolution/shell/skip_warning_dialog", NULL); + g_object_unref (client); + + if (!skip_warning_dialog && !getenv ("EVOLVE_ME_HARDER")) show_development_warning(); else #endif -- cgit v1.2.3