[evolution/tabs-rewrite] Add optional clutter support.
- From: Srinivasa Ragavan <sragavan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/tabs-rewrite] Add optional clutter support.
- Date: Mon, 19 Jul 2010 03:48:03 +0000 (UTC)
commit 211ba3468e30526a2bea984fc9ed2e1b4624b947
Author: Srinivasa Ragavan <sragavan gnome org>
Date: Thu Jul 15 22:39:23 2010 +0530
Add optional clutter support.
shell/Makefile.am | 5 +++++
shell/main.c | 15 +++++++++++++++
2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 2f044e4..6ec7177 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -58,6 +58,7 @@ libeshell_la_CPPFLAGS = \
-DLIBDIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"evolution-shell\" \
$(GNOME_PLATFORM_CFLAGS) \
+ $(CLUTTER_CFLAGS) \
$(TZDIALOG_CFLAGS) \
$(SHELL_CFLAGS)
@@ -93,6 +94,7 @@ libeshell_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/widgets/menus/libmenus.la \
$(GNOME_PLATFORM_LIBS) \
+ $(CLUTTER_LIBS) \
$(SHELL_LIBS)
# Evolution executable
@@ -120,11 +122,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 = \
@@ -140,6 +144,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 3a885f5..c9a8709 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]