Don't use gnome when gtk/glib will do

diff --git a/ChangeLog b/ChangeLog
index 562b638..59d1287 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-10-14  Ross Burton  <ross@burtonini.com>
+
+       * configure.in: Remove unused dependencies from the pkg-config
+       calls and add E_FACTORY_CFLAGS/_LIBS.
+
+       * src/Makefile.am: Use E_FACTORY_*.
+
+       * libedataserver/e-sexp.c:
+       * libedataserver/test-source-list.c:
+       Don't use libgnome when GTK+ or GLib will do.
+
+       * libedataserver/libedataserver.pc.in:
+       Fix strings, update libraries.
+
 2005-09-17  Andre Klapper  <a9016009@gmx.de>
 
        Fixes #273149.

diff --git a/configure.in b/configure.in
index f824e1f..ff09790 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1119,27 +1119,19 @@ AC_DEFUN([EVO_SET_COMPILE_FLAGS], [
        $1_LIBS="[$]$1_LIBS $4"
 ])
 
-dnl --- Flags to get all the GNOME stuff
-
-FULL_GNOME_DEPS="gnome-vfs-2.0 libgnome-2.0 libxml-2.0 gconf-2.0 ORBit-2.0 >= $ORBIT_REQUIRED"
-
-EVO_SET_COMPILE_FLAGS(GNOME_FULL, $FULL_GNOME_DEPS)
-AC_SUBST(GNOME_FULL_CFLAGS)
-AC_SUBST(GNOME_FULL_LIBS)
-
 dnl ****************************************
 dnl Flags for the various libraries we build
 dnl ****************************************
 
 dnl --- libedataserver and libedataserverui flags
 
-E_DATA_SERVER_DEPS="libxml-2.0 gobject-2.0 >= $GLIB_REQUIRED libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gnome-vfs-2.0 $mozilla_nspr"
+E_DATA_SERVER_DEPS="libxml-2.0 gobject-2.0 >= $GLIB_REQUIRED libbonobo-2.0 >= $LIBBONOBO_REQUIRED gconf-2.0 $mozilla_nspr"
 
 EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
 AC_SUBST(E_DATA_SERVER_CFLAGS)
 AC_SUBST(E_DATA_SERVER_LIBS)
 
-E_DATA_SERVER_UI_DEPS="libxml-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gtk+-2.0 libgnomeui-2.0 libglade-2.0"
+E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0"
 
 EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS)
 AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
@@ -1161,6 +1153,14 @@ EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
 AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
 AC_SUBST(EVOLUTION_CALENDAR_LIBS)
 
+dnl --- factory flags
+
+E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED libbonobo-2.0 >= $LIBBONOBO_REQUIRED gconf-2.0 gnome-vfs-2.0 libgnome-2.0 $mozilla_nspr"
+
+EVO_SET_COMPILE_FLAGS(E_FACTORY, $E_FACTORY_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
+AC_SUBST(E_FACTORY_CFLAGS)
+AC_SUBST(E_FACTORY_LIBS)
+
 dnl --- Groupwise flags
 PKG_CHECK_MODULES(SOUPTEMP, libsoup-2.4, have_libsoup_24=yes, have_libsoup_24=no)
 if test $have_libsoup_24 = yes; then

diff --git a/libedataserver/e-sexp.c b/libedataserver/e-sexp.c
index c83eb23..bd4ce59 100644 (file)
--- a/libedataserver/e-sexp.c
+++ b/libedataserver/e-sexp.c
@@ -1356,7 +1356,7 @@ int main(int argc, char **argv)
        char *t = "(+ \"foo\" \"\\\"\" \"bar\" \"\\\\ blah \\x \")";
        ESExpResult *r;
 
-       gtk_init(&argc, &argv);
+       g_type_init();
 
        f = e_sexp_new();
 

diff --git a/libedataserver/libedataserver.pc.in b/libedataserver/libedataserver.pc.in
index 6c31965..b41ba1a 100644 (file)
--- a/libedataserver/libedataserver.pc.in
+++ b/libedataserver/libedataserver.pc.in
@@ -3,14 +3,11 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-idldir=@idldir@
-IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
-
 privincludedir=@privincludedir@
 
 Name: libedataserver
-Description: Utily library for evolution data servers
+Description: Utility library for Evolution Data Server
 Version: @VERSION@
-Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libxml-2.0 ORBit-2.0 >= @ORBIT_REQUIRED@
-Libs: -L${libdir} -ledataserver-1.2
+Requires: libxml-2.0 glib-2.0 gconf-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ ORBit-2.0 >= @ORBIT_REQUIRED@
+Libs: -L${libdir} -ledataserver-@API_VERSION@
 Cflags: -I${privincludedir}

diff --git a/libedataserver/test-source-list.c b/libedataserver/test-source-list.c
index 86aa8b1..fb6388e 100644 (file)
--- a/libedataserver/test-source-list.c
+++ b/libedataserver/test-source-list.c
@@ -25,8 +25,6 @@
 #endif
 
 #include <glib.h>
-#include <libgnome/gnome-program.h>
-#include <libgnome/gnome-init.h>
 #include "e-source-list.h"
 
 /* Globals. */
@@ -56,47 +54,27 @@ static char *set_value_arg = NULL;
 static gboolean unset_value = FALSE;
 static gboolean unset_color = FALSE;
 
-static struct poptOption options[] = {
-       { "key", '\0', POPT_ARG_STRING, &key_arg, 0,
-         "Name of the GConf key to use", "PATH" },
-       { "source", '\0', POPT_ARG_STRING, &source_arg, 0, 
-         "UID of source to apply operation to", "UID" },
-       { "group", '\0', POPT_ARG_STRING, &group_arg, 0, 
-         "UID of group to apply operation to", "UID" },
-       { "add-group", '\0', POPT_ARG_STRING, &add_group_arg, 0,
-         "Add group of specified name", "NAME" },
-       { "add-source", '\0', POPT_ARG_STRING, &add_source_arg, 0,
-         "Add source of specified name", "NAME" },
-       { "remove-group", '\0', POPT_ARG_STRING, &remove_group_arg, 0,
-         "Remove group of specified name", "NAME" },
-       { "remove-source", '\0', POPT_ARG_STRING, &remove_source_arg, 0,
-         "Remove source of specified name", "NAME" },
-       { "property", '\0', POPT_ARG_STRING, &property_arg, 0,
-         "Name of source property to apply operation to", "PROPERTY" },
-       { "set-name", '\0', POPT_ARG_STRING, &set_name_arg, 0,
-         "Set name of source or group.  When used with --group, it sets the name of a group.  "
-         "When used with both --group and --source, it sets the name of a source.", "NAME" },
-       { "set-relative-uri", '\0', POPT_ARG_STRING, &set_relative_uri_arg, 0,
-         "Set relative URI of a source.  Use with --source or --add-source.", "NAME" },
-       { "set-base-uri", '\0', POPT_ARG_STRING, &set_base_uri_arg, 0,
-         "Set base URI of a group.  Use with --group or --add-group.", "NAME" },
-       { "set-color", '\0', POPT_ARG_STRING, &set_color_arg, 0,
-         "Set the color of a source.  Use with --source or --add-source.", "COLOR (rrggbb)" },
-       { "unset-color", '\0', POPT_ARG_NONE, &unset_color, 0,
-         "Unset the color of a source.  Use with --source or --add-source.", NULL },
-       { "set-value", '\0', POPT_ARG_STRING, &set_value_arg, 0,
-         "Set a property on a source.  Use with --source and --property.", NULL },
-       { "unset-value", '\0', POPT_ARG_NONE, &unset_value, 0,
-         "Unset a property on a source.  Use with --source and --property.", NULL },
-       { "listen", '\0', POPT_ARG_NONE, &listen, 0,
-         "Wait and listen for changes.", "" },
-       { "dump", '\0', POPT_ARG_NONE, &dump, 0,
-         "List the current configured sources.", "" },
-       POPT_AUTOHELP
+static GOptionEntry entries[] = {
+       { "key", '\0', 0, G_OPTION_ARG_STRING, &key_arg, "Name of the GConf key to use", "PATH" },
+       { "source", '\0', 0, G_OPTION_ARG_STRING, &source_arg, "UID of source to apply operations too", "UID"},
+       { "group", '\0', 0, G_OPTION_ARG_STRING, &group_arg, "UID of group to apply operations too", "UID" },
+       { "add-group", '\0', 0, G_OPTION_ARG_STRING, &add_group_arg, "Add group of specified name", "GROUP" },
+       { "add-source", '\0', 0, G_OPTION_ARG_STRING, &add_source_arg, "Add source of specified name", "SOURCE" },
+       { "remove-group", '\0', 0, G_OPTION_ARG_STRING, &remove_group_arg, "Remove group of specified name", "GROUP" },
+       { "remove-source", '\0', 0, G_OPTION_ARG_STRING, &remove_source_arg, "Remove source of specified name", "SOURCE" },
+       { "property", '\0', 0, G_OPTION_ARG_STRING, &property_arg, "Name of source property to apply operation to", "PROPERTY" },
+       { "set-name", '\0', 0, G_OPTION_ARG_STRING, &set_name_arg, "Set name of source or group.  When used with --group, it sets the name of a group. When used with both --group and --source, it sets the name of a source.", "NAME" },
+       { "set-relative-uri", '\0', 0, G_OPTION_ARG_STRING, &set_relative_uri_arg, "Set relative URI of a source.  Use with --source or --add-source.", "NAME" },
+       { "set-base-uri", '\0', 0, G_OPTION_ARG_STRING, &set_base_uri_arg, "Set base URI of a group.  Use with --group or --add-group.", "NAME" },
+       { "set-color", '\0', 0, G_OPTION_ARG_STRING, &set_color_arg, "Set the color of a source.  Use with --source or --add-source.", "COLOR (rrggbb)" },
+       { "unset-color", '\0', 0, G_OPTION_ARG_NONE, &unset_color, "Unset the color of a source.  Use with --source or --add-source.", NULL },
+       { "set-value", '\0', 0, G_OPTION_ARG_STRING, &set_value_arg, "Set a property on a source.  Use with --source and --property.", NULL },
+       { "unset-value", '\0', 0, G_OPTION_ARG_NONE, &unset_value, "Unset a property on a source.  Use with --source and --property.", NULL },
+       { "listen", '\0', 0, G_OPTION_ARG_NONE, &listen, "Wait and listen for changes.", NULL },
+       { "dump", '\0', 0, G_OPTION_ARG_NONE, &dump, "List the current configured sources.", NULL },
        { NULL }
 };
 
-
 /* Forward decls.  */
 static void group_added_callback (ESourceList *list, ESourceGroup *group);
 static void group_removed_callback (ESourceList *list, ESourceGroup *group);
@@ -562,15 +540,14 @@ on_idle_do_stuff (void *unused_data)
 
 
 int
-main (int argc,
-      char **argv)
+main (int argc, char **argv)
 {
-       GnomeProgram *program;
+       GOptionContext *context;
+       GError *error = NULL;
 
-       program = gnome_program_init ("test-source-list", "0.0",
-                                     LIBGNOME_MODULE, argc, argv,
-                                     GNOME_PARAM_POPT_TABLE, options,
-                                     NULL);
+       context = g_option_context_new ("- test source lists");
+       g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+       g_option_context_parse (context, &argc, &argv, &error);
 
        g_idle_add (on_idle_do_stuff, NULL);
 

diff --git a/libedataserverui/ChangeLog b/libedataserverui/ChangeLog
index 197c86d..d167a85 100644 (file)
--- a/libedataserverui/ChangeLog
+++ b/libedataserverui/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-14  Ross Burton  <ross@openedhand.com>
+
+       * test-contact-store.c:
+       * test-name-selector.c:
+       Don't use Bonobo and GnomeProgram, GTK+ suffices.
+
 2005-09-30  Devashish Sharma  <sdevashish@novell.com>
 
        * e-name-selector-entry.c (user_delete_text): In name selector entry

diff --git a/libedataserverui/libedataserverui.pc.in b/libedataserverui/libedataserverui.pc.in
index ca4054a..5eaabac 100644 (file)
--- a/libedataserverui/libedataserverui.pc.in
+++ b/libedataserverui/libedataserverui.pc.in
@@ -3,14 +3,11 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-idldir=@idldir@
-IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
-
 privincludedir=@privincludedir@
 
 Name: libedataserverui
-Description: GUI utility library for evolution data server
+Description: GUI utility library for Evolution Data Server
 Version: @VERSION@
-Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libxml-2.0 ORBit-2.0 >= @ORBIT_REQUIRED@ libedataserver-1.2
+Requires: gtk+-2.0 libglade-2.0 libgnome-2.0 libedataserver-@API_VERSION@ libebook-@API_VERSION@
 Libs: -L${libdir} -ledataserverui-1.2
 Cflags: -I${privincludedir}

diff --git a/libedataserverui/test-contact-store.c b/libedataserverui/test-contact-store.c
index 1679c99..03feb82 100644 (file)
--- a/libedataserverui/test-contact-store.c
+++ b/libedataserverui/test-contact-store.c
@@ -27,7 +27,6 @@
 
 #include "e-contact-store.h"
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-ui-init.h>
 
 static void
 entry_changed (GtkWidget *entry, EContactStore *contact_store)
@@ -66,7 +65,6 @@ start_test (const char *gconf_path)
        GtkTreeModel *model_sort;
        GtkWidget *scrolled_window;
        GtkWidget *window;
-       GtkWidget *select_names_entry;
        GtkWidget *tree_view;
        GtkWidget *box;
        GtkWidget *entry;
@@ -120,15 +118,9 @@ start_test (const char *gconf_path)
 int
 main (int argc, char **argv)
 {
-       GnomeProgram *program;
        const char *gconf_path;
 
-       program = gnome_program_init ("test-source-selector", "0.0",
-                                     LIBGNOMEUI_MODULE, argc, argv,
-                                     NULL);
-
-       if (bonobo_init (&argc, argv) == FALSE)
-               g_error ("Could not initialize Bonobo.");
+       gtk_init (&argc, &argv);
 
        if (argc < 2)
                gconf_path = "/apps/evolution/addressbook/sources";
@@ -137,7 +129,7 @@ main (int argc, char **argv)
 
        g_idle_add ((GSourceFunc) start_test, (void *) gconf_path);
 
-       bonobo_main ();
+       gtk_main ();
 
        return 0;
 }

diff --git a/libedataserverui/test-name-selector.c b/libedataserverui/test-name-selector.c
index a9ae89d..059983e 100644 (file)
--- a/libedataserverui/test-name-selector.c
+++ b/libedataserverui/test-name-selector.c
@@ -29,8 +29,6 @@
 #include "e-name-selector-dialog.h"
 #include "e-name-selector-entry.h"
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <bonobo/bonobo-main.h>
 #include <camel/camel.h>
 
 static void
@@ -39,7 +37,7 @@ close_dialog (GtkWidget *widget, int response, gpointer data)
        GtkWidget *dialog = data;
        
        gtk_widget_destroy (dialog);
-       bonobo_main_quit ();
+       gtk_main_quit ();
 }
 
 static gboolean
@@ -80,20 +78,14 @@ start_test (void)
 int
 main (int argc, char **argv)
 {
-       GnomeProgram *program;
-
-       program = gnome_program_init ("test-name-selector", "0.0",
-                                     LIBGNOMEUI_MODULE, argc, argv,
-                                     NULL);
-
-       if (bonobo_init (&argc, argv) == FALSE)
-               g_error ("Could not initialize Bonobo.");
+       gtk_init (&argc, &argv);
+       g_thread_init (NULL);
 
        camel_init (NULL, 0);
 
        g_idle_add ((GSourceFunc) start_test, NULL);
 
-       bonobo_main ();
+       gtk_main ();
 
        return 0;
 }

diff --git a/src/Makefile.am b/src/Makefile.am
index d7b146d..57d8eee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES =                                            \
        -I$(top_builddir)/calendar/libical/src/libical  \
        -DEVOLUTION_LOCALEDIR=\""$(localedir)"\"        \
        $(SOUP_CFLAGS)                                  \
-       $(E_DATA_SERVER_CFLAGS)
+       $(E_FACTORY_CFLAGS)
 
 
 IDLS = \
@@ -54,7 +54,7 @@ evolution_data_server_SOURCES = \
 evolution_data_server_LDADD =                                                  \
        $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la          \
        $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la               \
-       $(E_DATA_SERVER_LIBS)
+       $(E_FACTORY_LIBS)
 
 install-evolution-data-servers:
        $(mkinstalldirs) $(DESTDIR)$(libexecdir)