[annum] Work around evo master changes
- From: Gustavo Noronha Silva <gns src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [annum] Work around evo master changes
- Date: Wed, 24 Feb 2010 19:23:31 +0000 (UTC)
commit a86bc695d42c208ad96a873e8bf8fd4e053b4564
Author: Gustavo Noronha Silva <gustavo noronha collabora co uk>
Date: Wed Feb 24 16:23:04 2010 -0300
Work around evo master changes
configure.ac | 2 +-
src/Makefile.am | 2 +-
src/annum-shell-view.c | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7eeed6a..f89f9f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_PROG_INSTALL
# enable pkg-config
PKG_PROG_PKG_CONFIG
-PKG_CHECK_MODULES(ANNUM, glib-2.0 gobject-2.0 gtk+-2.0 libecal-1.2 libedataserver-1.2 libedataserverui-1.2 evolution-shell evolution-calendar)
+PKG_CHECK_MODULES(ANNUM, glib-2.0 gthread-2.0 gobject-2.0 gtk+-2.0 libecal-1.2 libedataserver-1.2 libedataserverui-1.2 evolution-shell evolution-calendar)
AC_SUBST(ANNUM_CFLAGS)
AC_SUBST(ANNUM_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index d04df82..d93c7a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@ annum_SOURCES = \
AM_CFLAGS = @ANNUM_CFLAGS@ -Wall -Werror -g -O2 -DPKGDATADIR="\"$(pkgdatadir)\"" \
-DANNUM_MODULES_DIRECTORY="\"$(libdir)/annum/modules\""
-AM_LDFLAGS = @ANNUM_LIBS@
+AM_LDFLAGS = @ANNUM_LIBS@ -lemiscwidgets -leutil -lmenus
CLEANFILES = *~
diff --git a/src/annum-shell-view.c b/src/annum-shell-view.c
index 1d3c12c..379057f 100644
--- a/src/annum-shell-view.c
+++ b/src/annum-shell-view.c
@@ -228,8 +228,9 @@ annum_shell_view_selector_primary_changed_cb (AnnumShellView * self,
calendar = annum_shell_content_get_calendar (prox_shell_content);
source = e_source_selector_peek_primary_selection (selector);
- if (source != NULL)
- gnome_calendar_set_default_source (calendar, source);
+ /* FIXME: removed in 7c02582ae70e45d58bf0966d60e23b50f854a06a */
+ /* if (source != NULL) */
+ /* gnome_calendar_set_default_source (calendar, source); */
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]