aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-05-17 21:49:21 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-05-17 21:49:21 +0800
commitea1a5fca456b891f8bb9ab248ad65651b66b54b2 (patch)
tree9619f2f9631aac471da3f8b24dd30908335627c9 /calendar/gui
parentc20b1701e81473504f1d67f6e7387a6f1e5fb856 (diff)
parent99ebc23e0860ef5baf1f169803d751db70e2aa32 (diff)
downloadgsoc2013-evolution-ea1a5fca456b891f8bb9ab248ad65651b66b54b2.tar
gsoc2013-evolution-ea1a5fca456b891f8bb9ab248ad65651b66b54b2.tar.gz
gsoc2013-evolution-ea1a5fca456b891f8bb9ab248ad65651b66b54b2.tar.bz2
gsoc2013-evolution-ea1a5fca456b891f8bb9ab248ad65651b66b54b2.tar.lz
gsoc2013-evolution-ea1a5fca456b891f8bb9ab248ad65651b66b54b2.tar.xz
gsoc2013-evolution-ea1a5fca456b891f8bb9ab248ad65651b66b54b2.tar.zst
gsoc2013-evolution-ea1a5fca456b891f8bb9ab248ad65651b66b54b2.zip
Merge branch 'gnome-2-30' into express2
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/alarm-notify/Makefile.am1
-rw-r--r--calendar/gui/alarm-notify/notify-main.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 79b9122a3c..9f757e3909 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -11,6 +11,7 @@ evolution_alarm_notify_CPPFLAGS = \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/calendar \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
+ -DEVOLUTION_ICONDIR=\""$(icondir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \
$(GNOME_PLATFORM_CFLAGS) \
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 966571350d..483704f1e4 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -45,6 +45,7 @@
gint
main (gint argc, gchar **argv)
{
+ GtkIconTheme *icon_theme;
AlarmNotify *alarm_notify_service;
UniqueApp *app;
@@ -71,6 +72,9 @@ main (gint argc, gchar **argv)
/* Initialize Camel's type system. */
camel_object_get_type();
+ icon_theme = gtk_icon_theme_get_default ();
+ gtk_icon_theme_append_search_path (icon_theme, EVOLUTION_ICONDIR);
+
gtk_main ();
if (alarm_notify_service != NULL)