Add optional clutter support.

This commit is contained in:
Srinivasa Ragavan
2010-07-15 22:39:23 +05:30
committed by Matthew Barnes
parent b9564c4d01
commit d46c4b4e5b
2 changed files with 20 additions and 0 deletions

View File

@ -59,6 +59,7 @@ libeshell_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-shell\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(CLUTTER_CFLAGS) \
$(TZDIALOG_CFLAGS) \
$(SHELL_CFLAGS)
@ -95,6 +96,7 @@ libeshell_la_LIBADD = \
$(top_builddir)/widgets/menus/libmenus.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(CLUTTER_LIBS) \
$(SHELL_LIBS)
# Evolution executable
@ -122,11 +124,13 @@ evolution_CPPFLAGS = \
-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
-DPREFIX=\""$(prefix)"\" \
-DEVOLUTION_MX_THEMEDIR=\"$(privdatadir)/theme\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(datadir)"\" \
$(GNOME_PLATFORM_CFLAGS) \
$(TZDIALOG_CFLAGS) \
$(CLUTTER_CFLAGS) \
$(SHELL_CFLAGS)
evolution_SOURCES = \
@ -142,6 +146,7 @@ evolution_LDADD = \
$(TZDIALOG_LIBS) \
$(SHELL_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(CLUTTER_LIBS) \
$(EVOLUTIONICON)
if OS_WIN32

View File

@ -26,6 +26,11 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#if HAVE_CLUTTER
#include <clutter-gtk/clutter-gtk.h>
#include <mx/mx.h>
#endif
#ifdef G_OS_WIN32
#define WIN32_LEAN_AND_MEAN
#ifdef DATADIR
@ -464,10 +469,20 @@ main (gint argc, gchar **argv)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
#if HAVE_CLUTTER
gtk_clutter_init_with_args (
&argc, &argv,
_("- The Evolution PIM and Email Client"),
entries, (gchar *) GETTEXT_PACKAGE, &error);
mx_style_load_from_file (mx_style_get_default (),
EVOLUTION_MX_THEMEDIR "/default.css", NULL);
#else
gtk_init_with_args (
&argc, &argv,
_("- The Evolution PIM and Email Client"),
entries, (gchar *) GETTEXT_PACKAGE, &error);
#endif
if (error != NULL) {
g_printerr ("%s\n", error->message);
g_error_free (error);