[ekiga] Fix showing assistant bug introduced recently

[Eugen Dedu <ededu src gnome org>]

commit 87cdd7b93b6a089da14887e7fe1e1838b748939d
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Mon Jul 19 12:54:53 2010 +0200

    Fix showing assistant bug introduced recently
    
    The bug was introduced with commit a45cb1b.  The assistant was not
    shown anymore when there was no configuration file.

 src/gui/main_window.cpp |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 5f83ecb..66e4586 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -4476,29 +4476,32 @@ main (int argc,
   engine_init (service_core, argc, argv);
 
   GnomeMeeting::Process ()->BuildGUI (service_core);
-
-  /* Show the window if there is no error, exit with a popup if there
-   * is a fatal error.
-   */
   main_window = GnomeMeeting::Process ()->GetMainWindow ();
   boost::shared_ptr<Ekiga::CallCore> call_core = service_core->get<Ekiga::CallCore> ("call-core");
 
   const int schema_version = MAJOR_VERSION * 1000
                              + MINOR_VERSION * 10
                              + BUILD_NUMBER;
-  if (gm_conf_get_int (GENERAL_KEY "version") < schema_version) {
+  int crt_version = gm_conf_get_int (GENERAL_KEY "version");
+  if (crt_version < schema_version) {
 
     gnomemeeting_conf_upgrade ();
 
+    // show the assistant if there is no config file
+    if (crt_version == 0)
+      gtk_widget_show_all (GnomeMeeting::Process ()->GetAssistantWindow ());
+
     /* Update the version number */
     gm_conf_set_int (GENERAL_KEY "version", schema_version);
   }
 
-  /* Show the main window */
-  if (!gm_conf_get_bool (USER_INTERFACE_KEY "start_hidden"))
-    gtk_widget_show (main_window);
-  else
-    g_timeout_add_seconds (15, (GtkFunction) gnomemeeting_tray_hack_cb, NULL);
+  /* Show the main window if there was a config file */
+  if (crt_version > 0) {
+    if (!gm_conf_get_bool (USER_INTERFACE_KEY "start_hidden"))
+      gtk_widget_show (main_window);
+    else
+      g_timeout_add_seconds (15, (GtkFunction) gnomemeeting_tray_hack_cb, NULL);
+  }
 
   /* Call the given host if needed */
   if (url)