[evolution-data-server] Conditionally enable bug-buddy/gtk+ also for evolution-source-registry
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Conditionally enable bug-buddy/gtk+ also for evolution-source-registry
- Date: Thu, 2 Aug 2012 09:23:51 +0000 (UTC)
commit 7277e32bc29aa1c2c1b7e50bbdf27712cdd6f5a4
Author: Milan Crha <mcrha redhat com>
Date: Thu Aug 2 11:22:48 2012 +0200
Conditionally enable bug-buddy/gtk+ also for evolution-source-registry
services/evolution-source-registry/Makefile.am | 2 ++
.../evolution-source-registry.c | 12 ++++++++++++
2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/services/evolution-source-registry/Makefile.am b/services/evolution-source-registry/Makefile.am
index 4e65ea2..72b8a47 100644
--- a/services/evolution-source-registry/Makefile.am
+++ b/services/evolution-source-registry/Makefile.am
@@ -18,6 +18,7 @@ evolution_source_registry_CPPFLAGS = \
-DLOCALEDIR=\"$(localedir)\" \
$(E_DATA_SERVER_CFLAGS) \
$(GNOME_KEYRING_CFLAGS) \
+ $(FACTORY_GTK_CFLAGS) \
$(CAMEL_CFLAGS) \
$(SOUP_CFLAGS) \
$(NULL)
@@ -34,6 +35,7 @@ evolution_source_registry_LDADD = \
$(top_builddir)/camel/libcamel-1.2.la \
$(E_DATA_SERVER_LIBS) \
$(GNOME_KEYRING_LIBS) \
+ $(FACTORY_GTK_LIBS) \
$(CAMEL_LIBS) \
$(SOUP_LIBS) \
$(NULL)
diff --git a/services/evolution-source-registry/evolution-source-registry.c b/services/evolution-source-registry/evolution-source-registry.c
index 2c1a0bc..bc96819 100644
--- a/services/evolution-source-registry/evolution-source-registry.c
+++ b/services/evolution-source-registry/evolution-source-registry.c
@@ -21,6 +21,10 @@
#include <stdlib.h>
#include <glib/gi18n.h>
+#ifdef ENABLE_MAINTAINER_MODE
+#include <gtk/gtk.h>
+#endif
+
#include <libebackend/libebackend.h>
/* Forward Declarations */
@@ -39,7 +43,15 @@ main (gint argc,
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#ifdef ENABLE_MAINTAINER_MODE
+ /* This is only to load gtk-modules, like
+ * bug-buddy's gnomesegvhandler, if possible */
+ gtk_init_check (&argc, &argv);
+#else
g_type_init ();
+#endif
+
+ e_gdbus_templates_init_main_thread ();
reload:
/* Migrate user data from ~/.evolution to XDG base directories. */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]