aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-06-18 14:49:40 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-06-18 14:49:40 +0800
commit01a1d4009633d920a823ed7085893082ac6b0187 (patch)
treef3b864d7c48474ebac13551cfb3d63388bea2e38
parent59baf2628710798c571144e6cfbbec7c719c1ddc (diff)
downloadgsoc2013-evolution-01a1d4009633d920a823ed7085893082ac6b0187.tar.gz
gsoc2013-evolution-01a1d4009633d920a823ed7085893082ac6b0187.tar.zst
gsoc2013-evolution-01a1d4009633d920a823ed7085893082ac6b0187.zip
** See bug #54498.
2004-06-18 Not Zed <NotZed@Ximian.com> ** See bug #54498. * main.c (idle_cb): don't do dev warning stuff here anymore. * main.c (main): show the dev warning before doing anything else if we are going to. (warning_dialog_response_callback): kick off the actual application once we're finished. (window_map_callback, new_window_created_callback): removed, not needed anymore. svn path=/trunk/; revision=26412
-rw-r--r--shell/ChangeLog13
-rw-r--r--shell/main.c45
2 files changed, 25 insertions, 33 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 6fe20bcd2e..2a4ac3608f 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,16 @@
+2004-06-18 Not Zed <NotZed@Ximian.com>
+
+ ** See bug #54498.
+
+ * main.c (idle_cb): don't do dev warning stuff here anymore.
+
+ * main.c (main): show the dev warning before doing anything else
+ if we are going to.
+ (warning_dialog_response_callback): kick off the actual
+ application once we're finished.
+ (window_map_callback, new_window_created_callback): removed, not
+ needed anymore.
+
2004-06-17 Jeffrey Stedfast <fejj@ximian.com>
* main.c (main): Call gnome_sound_init() before bonobo_main().
diff --git a/shell/main.c b/shell/main.c
index 5809c40f6d..7287f7e7f5 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -95,6 +95,8 @@ static gboolean killev = FALSE;
static gboolean force_migrate = FALSE;
#endif
+static gint idle_cb (void *data);
+
static char *default_component_id = NULL;
static char *evolution_debug_log = NULL;
@@ -188,10 +190,12 @@ warning_dialog_response_callback (GtkDialog *dialog,
g_object_unref (client);
gtk_widget_destroy (GTK_WIDGET (dialog));
+
+ idle_cb(NULL);
}
static void
-show_development_warning (GtkWindow *parent)
+show_development_warning(void)
{
GtkWidget *vbox;
GtkWidget *label;
@@ -214,7 +218,6 @@ show_development_warning (GtkWindow *parent)
gtk_window_set_title (GTK_WINDOW (warning_dialog), "Evolution " VERSION);
gtk_window_set_modal (GTK_WINDOW (warning_dialog), TRUE);
gtk_dialog_add_button (GTK_DIALOG (warning_dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
- e_dialog_set_transient_for (GTK_WINDOW (warning_dialog), GTK_WIDGET (parent));
gtk_dialog_set_has_separator (GTK_DIALOG (warning_dialog), FALSE);
@@ -274,28 +277,6 @@ show_development_warning (GtkWindow *parent)
dont_bother_me_again_checkbox);
}
-/* The following signal handlers are used to display the development warning as
- soon as the first view is created. */
-
-static void
-window_map_callback (GtkWidget *widget,
- void *data)
-{
- g_signal_handlers_disconnect_by_func (widget, G_CALLBACK (window_map_callback), data);
-
- show_development_warning (GTK_WINDOW (widget));
-}
-
-static void
-new_window_created_callback (EShell *shell,
- EShellWindow *window,
- void *data)
-{
- g_signal_handlers_disconnect_by_func (shell, G_CALLBACK (new_window_created_callback), data);
-
- g_signal_connect (window, "map", G_CALLBACK (window_map_callback), NULL);
-}
-
static void
destroy_config (void)
{
@@ -375,13 +356,6 @@ idle_cb (void *data)
case E_SHELL_CONSTRUCT_RESULT_OK:
g_signal_connect (shell, "no_windows_left", G_CALLBACK (no_windows_left_cb), NULL);
g_object_weak_ref (G_OBJECT (shell), shell_weak_notify, NULL);
-
-#ifdef DEVELOPMENT
- if (!getenv ("EVOLVE_ME_HARDER"))
- g_signal_connect (shell, "new_window_created",
- G_CALLBACK (new_window_created_callback), NULL);
-#endif
-
corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell));
corba_shell = CORBA_Object_duplicate (corba_shell, &ev);
break;
@@ -600,9 +574,14 @@ main (int argc, char **argv)
uri_list = g_slist_reverse (uri_list);
g_value_unset (&popt_context_value);
- g_idle_add (idle_cb, uri_list);
-
gnome_sound_init ("localhost");
+
+#ifdef DEVELOPMENT
+ if (!getenv ("EVOLVE_ME_HARDER"))
+ show_development_warning();
+ else
+#endif
+ g_idle_add (idle_cb, uri_list);
bonobo_main ();