diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-21 23:02:32 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-21 23:02:32 +0800 |
| commit | c3bfa60a7b27cb0cc44e134dcb9951ab9d41e6f6 (patch) | |
| tree | 0e250e4cf1a618a0e5a036243121d40ff28d18da /addressbook/tools | |
| parent | 19282b39b651f26b60258cc9ce0f93d27e6dd3e5 (diff) | |
| download | gsoc2013-evolution-c3bfa60a7b27cb0cc44e134dcb9951ab9d41e6f6.tar gsoc2013-evolution-c3bfa60a7b27cb0cc44e134dcb9951ab9d41e6f6.tar.gz gsoc2013-evolution-c3bfa60a7b27cb0cc44e134dcb9951ab9d41e6f6.tar.bz2 gsoc2013-evolution-c3bfa60a7b27cb0cc44e134dcb9951ab9d41e6f6.tar.lz gsoc2013-evolution-c3bfa60a7b27cb0cc44e134dcb9951ab9d41e6f6.tar.xz gsoc2013-evolution-c3bfa60a7b27cb0cc44e134dcb9951ab9d41e6f6.tar.zst gsoc2013-evolution-c3bfa60a7b27cb0cc44e134dcb9951ab9d41e6f6.zip | |
Kill EDropdownButton.
Migrate off of gnome_program_init().
svn path=/branches/kill-bonobo/; revision=37303
Diffstat (limited to 'addressbook/tools')
3 files changed, 8 insertions, 14 deletions
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) |