diff options
| author | Srinivasa Ragavan <sragavan@gnome.org> | 2010-07-16 01:09:23 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-07-26 09:30:00 +0800 |
| commit | d46c4b4e5bcaefd116b0ee0e49af951c31019990 (patch) | |
| tree | 25d9fa8eb322437c3b115d1b5414944e7551da45 | |
| parent | b9564c4d01c08c976e01256b308e3f2891c6e164 (diff) | |
| download | gsoc2013-evolution-d46c4b4e5bcaefd116b0ee0e49af951c31019990.tar gsoc2013-evolution-d46c4b4e5bcaefd116b0ee0e49af951c31019990.tar.gz gsoc2013-evolution-d46c4b4e5bcaefd116b0ee0e49af951c31019990.tar.bz2 gsoc2013-evolution-d46c4b4e5bcaefd116b0ee0e49af951c31019990.tar.lz gsoc2013-evolution-d46c4b4e5bcaefd116b0ee0e49af951c31019990.tar.xz gsoc2013-evolution-d46c4b4e5bcaefd116b0ee0e49af951c31019990.tar.zst gsoc2013-evolution-d46c4b4e5bcaefd116b0ee0e49af951c31019990.zip | |
Add optional clutter support.
| -rw-r--r-- | shell/Makefile.am | 5 | ||||
| -rw-r--r-- | shell/main.c | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 3cae585252..7fd03afaa3 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -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 diff --git a/shell/main.c b/shell/main.c index 3a885f59f2..c9a8709c83 100644 --- a/shell/main.c +++ b/shell/main.c @@ -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); |