[evolution] Fix contact maps.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Fix contact maps.
- Date: Wed, 3 Oct 2012 20:51:24 +0000 (UTC)
commit 2634f04217b160d671e11efc6adf64244b022750
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Oct 3 16:15:36 2012 -0400
Fix contact maps.
I broke contact maps when I removed the settings capplet.
The contact maps feature uses clutter-gtk, so we still need to call
gtk_clutter_init_with_args() instead of gtk_init_with_args() if the
contact maps feature is enabled.
shell/Makefile.am | 8 ++++----
shell/main.c | 13 +++++++++++++
2 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/shell/Makefile.am b/shell/Makefile.am
index c2829a1..32f33ee 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -62,7 +62,7 @@ libeshell_la_CPPFLAGS = \
$(GNOME_PLATFORM_CFLAGS) \
$(EGG_SMCLIENT_CFLAGS) \
$(GTKHTML_CFLAGS) \
- $(CLUTTER_CFLAGS)
+ $(CLUTTER_GTK_CFLAGS)
libeshell_la_SOURCES = \
$(eshellinclude_HEADERS) \
@@ -101,7 +101,7 @@ libeshell_la_LIBADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(EGG_SMCLIENT_LIBS) \
- $(CLUTTER_LIBS)
+ $(CLUTTER_GTK_LIBS)
# Evolution executable
@@ -136,7 +136,7 @@ evolution_CPPFLAGS = \
$(GNOME_PLATFORM_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
- $(CLUTTER_CFLAGS)
+ $(CLUTTER_GTK_CFLAGS)
evolution_SOURCES = \
main.c \
@@ -154,7 +154,7 @@ evolution_LDADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(DBUS_GLIB_LIBS) \
- $(CLUTTER_LIBS) \
+ $(CLUTTER_GTK_LIBS) \
$(EVOLUTIONICON)
if OS_WIN32
diff --git a/shell/main.c b/shell/main.c
index 06edd9b..2dbb132 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -30,6 +30,10 @@
#include <glib-unix.h>
#endif
+#ifdef WITH_CONTACT_MAPS
+#include <clutter-gtk/clutter-gtk.h>
+#endif
+
#ifdef G_OS_WIN32
#define WIN32_LEAN_AND_MEAN
#ifdef DATADIR
@@ -512,10 +516,19 @@ main (gint argc,
return 0;
}
+ /* The contact maps feature uses clutter-gtk. */
+#ifdef WITH_CONTACT_MAPS
+ gtk_clutter_init_with_args (
+ &argc, &argv,
+ _("- The Evolution PIM and Email Client"),
+ entries, (gchar *) GETTEXT_PACKAGE, &error);
+#else
gtk_init_with_args (
&argc, &argv,
_("- The Evolution PIM and Email Client"),
entries, (gchar *) GETTEXT_PACKAGE, &error);
+#endif /* WITH_CONTACT_MAPS */
+
if (error != NULL) {
g_printerr ("%s\n", error->message);
g_error_free (error);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]