[ekiga] Moved main() method outside of the MainWindow code.

[Damien Sandras <dsandras src gnome org>]

commit 6a120fd37d3bf29f797b96889d5fbd510055d45c
Author: Damien Sandras <dsandras beip be>
Date:   Sun Apr 29 18:08:07 2012 +0200

    Moved main() method outside of the MainWindow code.

 src/Makefile.am         |    1 +
 src/gui/main.cpp        |  282 +++++++++++++++++++++++++++++++++++++++++++++++
 src/gui/main_window.cpp |  254 +-----------------------------------------
 3 files changed, 286 insertions(+), 251 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c4732a2..20d5cff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,7 @@ ekiga_SOURCES +=			\
 	gui/default_devices.h	        \
 	gui/call_window.h		\
 	gui/call_window.cpp		\
+	gui/main.cpp		        \
 	gui/main_window.h		\
 	gui/main_window.cpp		\
 	gui/notify.h		        \
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
new file mode 100644
index 0000000..09d0e5e
--- /dev/null
+++ b/src/gui/main.cpp
@@ -0,0 +1,282 @@
+
+/* Ekiga -- A VoIP and Video-Conferencing application
+ * Copyright (C) 2000-2012 Damien Sandras <dsandras seconix com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ *
+ * Ekiga is licensed under the GPL license and as a special exception,
+ * you have permission to link or otherwise combine this program with the
+ * programs OPAL, OpenH323 and PWLIB, and distribute the combination,
+ * without applying the requirements of the GNU GPL to the OPAL, OpenH323
+ * and PWLIB programs, as long as you do follow the requirements of the
+ * GNU GPL for all the rest of the software thus combined.
+ */
+
+
+/*
+ *                         main.cpp  -  description
+ *                         -------------------------------
+ *   begin                : Sun Apr 29 2012
+ *   copyright            : (C) 2000-2012 by Damien Sandras
+ *   description          : This file contains the main method.
+ */
+
+#include "revision.h"
+#include "config.h"
+#include "common.h"
+
+#include "platform/gm-platform.h"
+
+#include <glib/gi18n.h>
+
+#ifdef HAVE_DBUS
+#include "dbus-helper/dbus.h"
+#endif
+
+#ifndef WIN32
+#include <signal.h>
+#include <gdk/gdkx.h>
+#else
+#include "platform/winpaths.h"
+#include <gdk/gdkwin32.h>
+#include <cstdio>
+#endif
+
+#include "gmconf.h"
+#include "engine.h"
+
+#include "call-core.h"
+
+#include "conf.h" // FIXME: Kill Me
+
+#include "ekiga.h"
+
+#ifdef WIN32
+// the linker must not find main
+#define main(c,v,e) ekigas_real_main(c,v,e)
+#endif
+
+/* The main () */
+int
+main (int argc,
+      char ** argv,
+      char ** /*envp*/)
+{
+  GOptionContext *context = NULL;
+
+  Ekiga::ServiceCorePtr service_core(new Ekiga::ServiceCore);
+
+  GtkWidget *main_window = NULL;
+
+  gchar *path = NULL;
+  gchar *url = NULL;
+
+  int debug_level = 0;
+
+  /* Globals */
+#ifndef WIN32
+  if (!XInitThreads ())
+    exit (1);
+#endif
+
+  /* GTK+ initialization */
+  g_type_init ();
+  g_thread_init (NULL);
+#ifndef WIN32
+  signal (SIGPIPE, SIG_IGN);
+#endif
+
+  /* Application name */
+  g_set_application_name (_("Ekiga Softphone"));
+#ifndef WIN32
+  setenv ("PULSE_PROP_application.name", _("Ekiga Softphone"), true);
+#endif
+
+  /* initialize platform-specific code */
+  gm_platform_init ();
+
+  /* Configuration backend initialization */
+  gm_conf_init ();
+
+  /* Gettext initialization */
+  path = g_build_filename (DATA_DIR, "locale", NULL);
+  textdomain (GETTEXT_PACKAGE);
+  bindtextdomain (GETTEXT_PACKAGE, path);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  g_free (path);
+
+  /* Arguments initialization */
+  GOptionEntry arguments [] =
+    {
+      {
+	"debug", 'd', 0, G_OPTION_ARG_INT, &debug_level,
+       N_("Prints debug messages in the console (level between 1 and 8)"),
+       NULL
+      },
+      {
+	"call", 'c', 0, G_OPTION_ARG_STRING, &url,
+	N_("Makes Ekiga call the given URI"),
+	NULL
+      },
+      {
+	NULL, 0, 0, (GOptionArg)0, NULL,
+	NULL,
+	NULL
+      }
+    };
+  context = g_option_context_new (NULL);
+  g_option_context_add_main_entries (context, arguments, PACKAGE_NAME);
+  g_option_context_set_help_enabled (context, TRUE);
+
+  g_option_context_add_group (context, gtk_get_option_group (TRUE));
+  g_option_context_parse (context, &argc, &argv, NULL);
+  g_option_context_free (context);
+
+#ifndef WIN32
+  char* text_label =  g_strdup_printf ("%d", debug_level);
+  setenv ("PTLIB_TRACE_CODECS", text_label, TRUE);
+  g_free (text_label);
+#else
+  char* text_label =  g_strdup_printf ("PTLIB_TRACE_CODECS=%d", debug_level);
+  _putenv (text_label);
+  g_free (text_label);
+  if (debug_level != 0) {
+    std::string desk_path = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
+    if (!desk_path.empty ())
+      std::freopen((desk_path + "\\ekiga-stderr.txt").c_str (), "w", stderr);
+  }
+#endif
+
+#if PTRACING
+  if (debug_level != 0)
+    PTrace::Initialise (PMAX (PMIN (8, debug_level), 0), NULL,
+			PTrace::Timestamp | PTrace::Thread
+			| PTrace::Blocks | PTrace::DateAndTime);
+#endif
+
+  PTRACE(1, "Ekiga version " << MAJOR_VERSION << "." << MINOR_VERSION << "." << BUILD_NUMBER);
+#ifdef EKIGA_REVISION
+  PTRACE(1, "Ekiga git revision: " << EKIGA_REVISION);
+#endif
+  PTRACE(1, "Debug level: " << debug_level);
+
+#ifdef HAVE_DBUS
+  if (!ekiga_dbus_claim_ownership ()) {
+    ekiga_dbus_client_show ();
+    if (url != NULL)
+      ekiga_dbus_client_connect (url);
+    exit (0);
+  }
+#endif
+
+  /* Ekiga initialisation */
+  // should come *after* ptrace initialisation, to track codec loading for ex.
+  GnomeMeeting instance;
+  GnomeMeeting::Process ()->Exit ();
+  Ekiga::Runtime::init ();
+  engine_init (service_core, argc, argv);
+
+  GnomeMeeting::Process ()->BuildGUI (service_core);
+  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;
+  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 there was a config file */
+  if (crt_version > 0) {
+    if (!gm_conf_get_bool (USER_INTERFACE_KEY "start_hidden"))
+      gtk_widget_show (main_window);
+  }
+
+  /* Call the given host if needed */
+  if (url)
+    call_core->dial (url);
+
+#ifdef HAVE_DBUS
+  EkigaDBusComponent *dbus_component = ekiga_dbus_component_new (service_core);
+#endif
+
+  /* The GTK loop */
+  gtk_main ();
+
+#ifdef HAVE_DBUS
+  g_object_unref (dbus_component);
+#endif
+
+  /* Exit Ekiga */
+  service_core.reset ();
+  Ekiga::Runtime::quit ();
+
+  /* Save and shutdown the configuration */
+  gm_conf_save ();
+  gm_conf_shutdown ();
+
+  /* deinitialize platform-specific code */
+  gm_platform_shutdown ();
+
+  return 0;
+}
+
+
+#ifdef WIN32
+
+typedef struct {
+  int newmode;
+} _startupinfo;
+
+extern "C" void __getmainargs (int *argcp, char ***argvp, char ***envp, int glob, _startupinfo *sinfo);
+int
+APIENTRY WinMain (HINSTANCE hInstance,
+		  HINSTANCE hPrevInstance,
+		  LPSTR     lpCmdLine,
+		  int       nCmdShow)
+{
+  HANDLE ekr_mutex;
+  int iresult = 0;
+  char **env;
+  char **argv;
+  int argc;
+  _startupinfo info = {0};
+
+  ekr_mutex = CreateMutex (NULL, FALSE, "EkigaIsRunning");
+  if (GetLastError () == ERROR_ALREADY_EXISTS)
+    MessageBox (NULL, "Ekiga is running already !", "Ekiga - 2nd instance", MB_ICONEXCLAMATION | MB_OK);
+  else {
+
+    /* use msvcrt.dll to parse command line */
+    __getmainargs (&argc, &argv, &env, 0, &info);
+
+    iresult = main (argc, argv, env);
+  }
+  CloseHandle (ekr_mutex);
+  return iresult;
+}
+#endif
+
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 03720cd..fce5ff2 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -35,14 +35,11 @@
  *                          build the main window.
  */
 
-#include "revision.h"
-
 #include "config.h"
 
 #include "main_window.h"
 
 #include "ekiga.h"
-#include "conf.h"
 #include "dialpad.h"
 #include "statusmenu.h"
 #include "notify.h"
@@ -52,35 +49,14 @@
 #include "gmentrydialog.h"
 #include "gmstatusbar.h"
 #include "gmstockicons.h"
-#include "gmconf.h"
-#include <boost/smart_ptr.hpp>
 #include "gmmenuaddon.h"
 #include "trigger.h"
 #include "menu-builder-tools.h"
 #include "menu-builder-gtk.h"
 
-#include "platform/gm-platform.h"
-
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
-#ifdef HAVE_DBUS
-#include "dbus-helper/dbus.h"
-#endif
-
-#ifndef WIN32
-#include <signal.h>
-#include <gdk/gdkx.h>
-#else
-#include "platform/winpaths.h"
-#include <gdk/gdkwin32.h>
-#include <cstdio>
-#endif
-
-#if defined(P_FREEBSD) || defined (P_MACOSX)
-#include <libintl.h>
-#endif
-
 #include "engine.h"
 
 #include "videoinput-core.h"
@@ -1248,27 +1224,21 @@ window_closed_cb (G_GNUC_UNUSED GtkWidget *widget,
 		  G_GNUC_UNUSED GdkEvent *event,
 		  gpointer data)
 {
-  std::cout << "FIXME" << std::endl << std::flush;
-  /*
-  StatusIcon *statusicon = GnomeMeeting::Process ()->GetStatusicon ();
   // If we have persistent notifications:
   //  - we can hide the window
   //  - clicking on a notification should show the window back
   //  - launching the application again should show the window back
   // If we do not have persistent notifications:
-  //  - If the status icon is enabled, it allows showing the window back
-  //  - If not, we quit
+  //  - the status icon allows showing the window back
   gtk_widget_hide (GTK_WIDGET (data));
-  if (!notify_has_persistence () && statusicon && !gtk_status_icon_is_embedded (GTK_STATUS_ICON (statusicon)))
-    quit_callback (NULL, widget);
-*/
+
   return (TRUE);
 }
 
 
 static void
 window_closed_from_menu_cb (GtkWidget *widget,
-                           gpointer data)
+                            gpointer data)
 {
   window_closed_cb (widget, NULL, data);
 }
@@ -2242,221 +2212,3 @@ ekiga_main_window_push_message (EkigaMainWindow *mw,
   gm_statusbar_push_message (GM_STATUSBAR (mw->priv->statusbar), "%s", buffer);
   va_end (args);
 }
-
-#ifdef WIN32
-// the linker must not find main
-#define main(c,v,e) ekigas_real_main(c,v,e)
-#endif
-
-/* The main () */
-int
-main (int argc,
-      char ** argv,
-      char ** /*envp*/)
-{
-  GOptionContext *context = NULL;
-
-  Ekiga::ServiceCorePtr service_core(new Ekiga::ServiceCore);
-
-  GtkWidget *main_window = NULL;
-
-  gchar *path = NULL;
-  gchar *url = NULL;
-
-  int debug_level = 0;
-
-  /* Globals */
-#ifndef WIN32
-  if (!XInitThreads ())
-    exit (1);
-#endif
-
-  /* GTK+ initialization */
-  g_type_init ();
-  g_thread_init (NULL);
-#ifndef WIN32
-  signal (SIGPIPE, SIG_IGN);
-#endif
-
-  /* Application name */
-  g_set_application_name (_("Ekiga Softphone"));
-#ifndef WIN32
-  setenv ("PULSE_PROP_application.name", _("Ekiga Softphone"), true);
-#endif
-
-  /* initialize platform-specific code */
-  gm_platform_init ();
-
-  /* Configuration backend initialization */
-  gm_conf_init ();
-
-  /* Gettext initialization */
-  path = g_build_filename (DATA_DIR, "locale", NULL);
-  textdomain (GETTEXT_PACKAGE);
-  bindtextdomain (GETTEXT_PACKAGE, path);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-  g_free (path);
-
-  /* Arguments initialization */
-  GOptionEntry arguments [] =
-    {
-      {
-	"debug", 'd', 0, G_OPTION_ARG_INT, &debug_level,
-       N_("Prints debug messages in the console (level between 1 and 8)"),
-       NULL
-      },
-      {
-	"call", 'c', 0, G_OPTION_ARG_STRING, &url,
-	N_("Makes Ekiga call the given URI"),
-	NULL
-      },
-      {
-	NULL, 0, 0, (GOptionArg)0, NULL,
-	NULL,
-	NULL
-      }
-    };
-  context = g_option_context_new (NULL);
-  g_option_context_add_main_entries (context, arguments, PACKAGE_NAME);
-  g_option_context_set_help_enabled (context, TRUE);
-
-  g_option_context_add_group (context, gtk_get_option_group (TRUE));
-  g_option_context_parse (context, &argc, &argv, NULL);
-  g_option_context_free (context);
-
-#ifndef WIN32
-  char* text_label =  g_strdup_printf ("%d", debug_level);
-  setenv ("PTLIB_TRACE_CODECS", text_label, TRUE);
-  g_free (text_label);
-#else
-  char* text_label =  g_strdup_printf ("PTLIB_TRACE_CODECS=%d", debug_level);
-  _putenv (text_label);
-  g_free (text_label);
-  if (debug_level != 0) {
-    std::string desk_path = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
-    if (!desk_path.empty ())
-      std::freopen((desk_path + "\\ekiga-stderr.txt").c_str (), "w", stderr);
-  }
-#endif
-
-#if PTRACING
-  if (debug_level != 0)
-    PTrace::Initialise (PMAX (PMIN (8, debug_level), 0), NULL,
-			PTrace::Timestamp | PTrace::Thread
-			| PTrace::Blocks | PTrace::DateAndTime);
-#endif
-
-  PTRACE(1, "Ekiga version " << MAJOR_VERSION << "." << MINOR_VERSION << "." << BUILD_NUMBER);
-#ifdef EKIGA_REVISION
-  PTRACE(1, "Ekiga git revision: " << EKIGA_REVISION);
-#endif
-  PTRACE(1, "Debug level: " << debug_level);
-
-#ifdef HAVE_DBUS
-  if (!ekiga_dbus_claim_ownership ()) {
-    ekiga_dbus_client_show ();
-    if (url != NULL)
-      ekiga_dbus_client_connect (url);
-    exit (0);
-  }
-#endif
-
-  /* Ekiga initialisation */
-  // should come *after* ptrace initialisation, to track codec loading for ex.
-  GnomeMeeting instance;
-  GnomeMeeting::Process ()->Exit ();
-  Ekiga::Runtime::init ();
-  engine_init (service_core, argc, argv);
-
-  GnomeMeeting::Process ()->BuildGUI (service_core);
-  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;
-  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 there was a config file */
-  if (crt_version > 0) {
-    if (!gm_conf_get_bool (USER_INTERFACE_KEY "start_hidden"))
-      gtk_widget_show (main_window);
-  }
-
-  /* Call the given host if needed */
-  if (url)
-    call_core->dial (url);
-
-#ifdef HAVE_DBUS
-  /* Create the dbus server instance */
-  EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (main_window);
-  EkigaDBusComponent *dbus_component = ekiga_dbus_component_new (mw->priv->core);
-#endif
-
-  /* The GTK loop */
-  gtk_main ();
-
-#ifdef HAVE_DBUS
-  g_object_unref (dbus_component);
-#endif
-
-  /* Exit Ekiga */
-  service_core.reset ();
-  Ekiga::Runtime::quit ();
-
-  /* Save and shutdown the configuration */
-  gm_conf_save ();
-  gm_conf_shutdown ();
-
-  /* deinitialize platform-specific code */
-  gm_platform_shutdown ();
-
-  return 0;
-}
-
-
-#ifdef WIN32
-
-typedef struct {
-  int newmode;
-} _startupinfo;
-
-extern "C" void __getmainargs (int *argcp, char ***argvp, char ***envp, int glob, _startupinfo *sinfo);
-int
-APIENTRY WinMain (HINSTANCE hInstance,
-		  HINSTANCE hPrevInstance,
-		  LPSTR     lpCmdLine,
-		  int       nCmdShow)
-{
-  HANDLE ekr_mutex;
-  int iresult = 0;
-  char **env;
-  char **argv;
-  int argc;
-  _startupinfo info = {0};
-
-  ekr_mutex = CreateMutex (NULL, FALSE, "EkigaIsRunning");
-  if (GetLastError () == ERROR_ALREADY_EXISTS)
-    MessageBox (NULL, "Ekiga is running already !", "Ekiga - 2nd instance", MB_ICONEXCLAMATION | MB_OK);
-  else {
-
-    /* use msvcrt.dll to parse command line */
-    __getmainargs (&argc, &argv, &env, 0, &info);
-
-    iresult = main (argc, argv, env);
-  }
-  CloseHandle (ekr_mutex);
-  return iresult;
-}
-#endif