From 4ce3d9c321888226b2bcbf67e189261d0edb5a53 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 30 Apr 2009 22:03:28 -0400
Subject: Bug 580892 – Kill libgnomeui/gnome-app and gnome-app-helper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The only remaining case is widgets/test/test-dropdown-button.c, but this
file will be removed when the kill-bonobo branch is merged.
---
 addressbook/gui/contact-editor/test-editor.c               |  4 +---
 .../tools/evolution-addressbook-export-list-cards.c        |  4 +---
 .../tools/evolution-addressbook-export-list-folders.c      |  4 +---
 addressbook/tools/evolution-addressbook-export.c           | 14 ++++++--------
 4 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'addressbook')

diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index 44703c9e57..2f55e4777c 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -24,8 +24,6 @@
 
 #include <stdlib.h>
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-ui-init.h>
 #include <glade/glade.h>
 #include "e-contact-editor.h"
 #include "ebook/e-card.h"
@@ -97,7 +95,7 @@ int main( int argc, char *argv[] )
 	char *cardstr;
 	EContactEditor *ce;
 
-	gnome_program_init("Contact Editor Test", VERSION, LIBGNOMEUI_MODULE, argc, argv, NULL);
+	gtk_init (&argc, &argv);
 
 	glade_init ();
 
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index 4b98bc77ac..417214691b 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -27,10 +27,8 @@
 #include <unistd.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <libbonobo.h>
-#include <libgnome/libgnome.h>
 
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>
diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c
index f9679b3378..86affe41ff 100644
--- a/addressbook/tools/evolution-addressbook-export-list-folders.c
+++ b/addressbook/tools/evolution-addressbook-export-list-folders.c
@@ -24,10 +24,8 @@
 #include <config.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <libbonobo.h>
-#include <libgnome/libgnome.h>
 
 #include <libebook/e-book.h>
 
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c
index 38a73b7b02..bfcaca980c 100644
--- a/addressbook/tools/evolution-addressbook-export.c
+++ b/addressbook/tools/evolution-addressbook-export.c
@@ -25,9 +25,6 @@
 #include <string.h>
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <bonobo/bonobo-main.h>
-#include <libgnome/gnome-init.h>
 
 #include <libebook/e-book.h>
 
@@ -71,8 +68,8 @@ int
 main (int argc, char **argv)
 {
 	ActionContext actctx;
-	GnomeProgram *program;
 	GOptionContext *context;
+	GError *error = NULL;
 
 	int current_action = ACTION_NOTHING;
 	int IsCSV = FALSE;
@@ -85,10 +82,11 @@ main (int argc, char **argv)
 
 	context = g_option_context_new (NULL);
 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
-	program = gnome_program_init (
-		PACKAGE, VERSION, GNOME_BONOBO_MODULE, argc, argv,
-		GNOME_PARAM_GOPTION_CONTEXT, context,
-		GNOME_PARAM_NONE);
+	if (!g_option_context_parse (context, &argc, &argv, &error)) {
+		g_printerr ("%s\n", error->message);
+		g_error_free (error);
+		exit (-1);
+	}
 
 	/* Parsing Parameter */
 	if (opt_remaining && g_strv_length (opt_remaining) > 0)
-- 
cgit