gnome-terminal r3076 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Wed Sep 24 20:10:48 2008
New Revision: 3076
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3076&view=rev

Log:
libgnome* exorcism V: remove gnome_program_init call.

Removed:
   trunk/src/eggsmclient-libgnomeui.c
   trunk/src/eggsmclient-libgnomeui.h
Modified:
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/eggusershell.h
   trunk/src/terminal.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Sep 24 20:10:48 2008
@@ -39,18 +39,17 @@
 GCONF_REQUIRED=2.14.0
 STARTUP_NOTIFICATION_REQUIRED=0.8
 VTE_REQUIRED=0.17.0
-LIBGNOME_REQUIRED=2.14.0
 
 ## here we get the flags we'll actually use
-PKG_CHECK_MODULES(TERM, dnl
- glib-2.0 >= $GLIB_REQUIRED dnl
- gtk+-2.0 >= $GTK_REQUIRED dnl
- gconf-2.0 >= $GCONF_REQUIRED dnl
- gio-2.0 dnl
- libgnomeui-2.0 dnl
- libgnome-2.0 >= $LIBGNOME_REQUIRED dnl
- libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_REQUIRED dnl
- vte >= $VTE_REQUIRED)
+PKG_CHECK_MODULES([TERM],
+  [vte >= $VTE_REQUIRED
+   glib-2.0 >= $GLIB_REQUIRED
+   gio-2.0
+   gtk+-2.0 >= $GTK_REQUIRED
+   gconf-2.0 >= $GCONF_REQUIRED
+   libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_REQUIRED
+   libbonobo-2.0
+   bonobo-activation-2.0])
 
 # Check the smclient backend
 GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)"

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Sep 24 20:10:48 2008
@@ -73,8 +73,6 @@
 	eggdesktopfile.h \
 	eggsmclient.c \
 	eggsmclient.h \
-	eggsmclient-libgnomeui.c \
-	eggsmclient-libgnomeui.h \
 	eggsmclient-private.h \
 	$(NULL)
 if WITH_SMCLIENT_XSMP

Modified: trunk/src/eggusershell.h
==============================================================================
--- trunk/src/eggusershell.h	(original)
+++ trunk/src/eggusershell.h	Wed Sep 24 20:10:48 2008
@@ -29,8 +29,6 @@
 
 #include <stdlib.h>
 #include <glib.h>
-#include <libgnome/gnome-init.h>
-#include <libgnome/gnome-program.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Wed Sep 24 20:10:48 2008
@@ -38,15 +38,14 @@
 #include <bonobo-activation/bonobo-activation-register.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-listener.h>
-#include <libgnome/gnome-program.h>
-#include <libgnomeui/gnome-ui-init.h>
+#include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
 #include <gdk/gdkx.h>
 
 #ifdef WITH_SMCLIENT
-#include "eggsmclient-libgnomeui.h"
+#include "eggsmclient.h"
 #endif
 
 #define ACT_IID "OAFIID:GNOME_Terminal_Factory"
@@ -1148,8 +1147,8 @@
   const char *startup_id;
   const char *display_name;
   GdkDisplay *display;
-  GnomeProgram *program;
   OptionParsingResults *parsing_results;
+  GError *error = NULL;
 
   bindtextdomain (GETTEXT_PACKAGE, TERM_LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -1175,19 +1174,20 @@
                                                      */
 
   context = get_goption_context (parsing_results);
+  g_option_context_add_group (context, gtk_get_option_group (TRUE));
+  g_option_context_add_group (context, egg_sm_client_get_option_group ());
 
-  /* This automagically makes GOption parse */
-  program = gnome_program_init (PACKAGE, VERSION,
-                                EGG_SM_CLIENT_LIBGNOMEUI_MODULE,
-                                argc,
-                                argv,
-                                GNOME_PARAM_GOPTION_CONTEXT, context,
-                                GNOME_PARAM_APP_PREFIX, TERM_PREFIX,
-                                GNOME_PARAM_APP_SYSCONFDIR, TERM_SYSCONFDIR,
-                                GNOME_PARAM_APP_DATADIR, TERM_PKGDATADIR,
-                                GNOME_PARAM_APP_LIBDIR, TERM_LIBDIR,
-                                NULL); 
+  if (!g_option_context_parse (context, &argc, &argv, &error))
+    {
+      g_printerr (_("Failed to parse arguments: %s\n"), error->message);
+      g_error_free (error);
+      g_option_context_free (context);
+      exit (1);
+    }
 
+  g_option_context_free (context);
+  g_set_application_name (_("Terminal"));
+  
  /* Do this here so that gdk_display is initialized */
   if (parsing_results->startup_id == NULL)
     {
@@ -1198,8 +1198,6 @@
       parsing_results->startup_id = g_strdup_printf ("_TIME%lu", timestamp);
     }
 
-  g_set_application_name (_("Terminal"));
-  
   display = gdk_display_get_default ();
   display_name = gdk_display_get_name (display);
   parsing_results->display_name = g_strdup (display_name);
@@ -1262,8 +1260,6 @@
   if (listener)
     bonobo_object_unref (BONOBO_OBJECT (listener));
 
-  g_object_unref (program);
-
   return 0;
 }