[gnome-pilot] 2009-10-25 complete removal of libgnomeui. Matt Davey <mcdavey mrao cam ac uk>

[Matthew Charles Davey <mcdavey src gnome org>]

commit 4282b16a7cb8f4501deb5daba58e4b2dae8abc4e
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Sun Oct 25 21:50:46 2009 +0000

    2009-10-25 complete removal of libgnomeui.  Matt Davey  <mcdavey mrao cam ac uk>
    	* complete removal of libgnomeui.  simply had to change from
                LIBGNOMEUI_MODULE to LIBGNOME_MODULE
            * conduits/file/gpilot_install_file.c: remove libgnomeui
            * configure.in: ditto.
            * gpilotd/gpilotd.c: ditto.
            * utils/gpilotd-client.c: ditto.
            * utils/gpilotdcm-client.c: ditto.

 conduits/file/gpilot_install_file.c |    4 ++--
 configure.in                        |    2 --
 gpilotd/gpilotd.c                   |    3 +--
 utils/gpilotd-client.c              |    4 ++--
 utils/gpilotdcm-client.c            |    4 ++--
 5 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/conduits/file/gpilot_install_file.c b/conduits/file/gpilot_install_file.c
index bd08059..94b02cc 100644
--- a/conduits/file/gpilot_install_file.c
+++ b/conduits/file/gpilot_install_file.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-ui-init.h>
+#include <libgnome/gnome-init.h>
 #include <gpilotd/gnome-pilot-client.h>
 
 #include <bonobo.h>
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
 
 	option_context = g_option_context_new (PACKAGE);
 	g_option_context_add_main_entries (option_context, options, NULL);
-	program = gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE,
+	program = gnome_program_init(PACKAGE, VERSION, LIBGNOME_MODULE,
 	                            argc, argv,
 				    GNOME_PARAM_GOPTION_CONTEXT, option_context,
 				    GNOME_PARAM_NONE);
diff --git a/configure.in b/configure.in
index ca97837..e42cda1 100644
--- a/configure.in
+++ b/configure.in
@@ -152,7 +152,6 @@ dnl Library Checks
 dnl ******************************
 LIBXML_REQUIRED="libxml-2.0"
 LIBGNOME_REQUIRED="libgnome-2.0 >= 2.0.0"
-LIBGNOMEUI_REQUIRED="libgnomeui-2.0 >= 2.0.0"
 LIBGTK_REQUIRED="gtk+-2.0 >= 2.13.0"
 ORBIT_REQUIRED="ORBit-2.0 >= 2.0.0"
 LIBBONOBO_REQUIRED="libbonobo-2.0 >= 2.0.0"
@@ -165,7 +164,6 @@ PKG_CHECK_MODULES(GNOME_PILOT,
 [
 	$LIBXML_REQUIRED
 	$LIBGNOME_REQUIRED
-	$LIBGNOMEUI_REQUIRED
 	$LIBGTK_REQUIRED
 	$LIBBONOBO_REQUIRED
 	$LIBBONOBOUI_REQUIRED
diff --git a/gpilotd/gpilotd.c b/gpilotd/gpilotd.c
index cc134d6..d484ec2 100644
--- a/gpilotd/gpilotd.c
+++ b/gpilotd/gpilotd.c
@@ -29,7 +29,6 @@
 
 #include <glib.h>
 #include <libgnome/gnome-init.h>
-#include <libgnomeui/gnome-ui-init.h>
 #include <glib/gi18n.h>
 
 /* for crypt () */
@@ -1686,7 +1685,7 @@ main (int argc, char *argv[])
 	
 	/*	gtk_init(&argc, &argv);*/
 	program = gnome_program_init (PACKAGE, VERSION,
-	    LIBGNOMEUI_MODULE, argc, argv, GNOME_PARAM_NONE);
+	    LIBGNOME_MODULE, argc, argv, GNOME_PARAM_NONE);
 
 #ifdef WITH_HAL
 	if ((hal_ctx = gpilotd_hal_init ()) != NULL)
diff --git a/utils/gpilotd-client.c b/utils/gpilotd-client.c
index af35d38..0a52c85 100644
--- a/utils/gpilotd-client.c
+++ b/utils/gpilotd-client.c
@@ -5,9 +5,9 @@
  */
 #include <config.h>
 
-#include <libgnomeui/gnome-ui-init.h>
 #include <bonobo-activation/bonobo-activation.h>
 
+#include <libgnome/gnome-init.h>
 #include <gpilotd/gnome-pilot-client.h>
 
 GnomePilotClient *gpc;
@@ -356,7 +356,7 @@ main (int argc, char *argv[]) {
 
 	option_context = g_option_context_new (PACKAGE);
 	g_option_context_add_main_entries (option_context, options, NULL);
-	program = gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE,
+	program = gnome_program_init(PACKAGE, VERSION, LIBGNOME_MODULE,
 	                            argc, argv,
 				    GNOME_PARAM_GOPTION_CONTEXT, option_context,
 				    GNOME_PARAM_NONE);
diff --git a/utils/gpilotdcm-client.c b/utils/gpilotdcm-client.c
index 6eb70cd..865326d 100644
--- a/utils/gpilotdcm-client.c
+++ b/utils/gpilotdcm-client.c
@@ -6,8 +6,8 @@
 #include <config.h>
 
 #include <glib/gi18n.h>
-#include <libgnomeui/gnome-ui-init.h>
 #include <bonobo-activation/bonobo-activation.h>
+#include <libgnome/gnome-init.h>
 
 #include <libgpilotdCM/gnome-pilot-conduit-management.h>
 #include <libgpilotdCM/gnome-pilot-conduit-config.h>
@@ -105,7 +105,7 @@ main (int argc, char *argv[]) {
 
 	option_context = g_option_context_new (PACKAGE);
 	g_option_context_add_main_entries (option_context, options, NULL);
-	program = gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE,
+	program = gnome_program_init(PACKAGE, VERSION, LIBGNOME_MODULE,
 	                            argc, argv,
 				    GNOME_PARAM_GOPTION_CONTEXT, option_context,
 				    GNOME_PARAM_NONE);