diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-04-22 00:06:38 +0800 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-04-22 00:06:38 +0800 |
| commit | a84b1a325147e6321b90f491a1dc686e588869dc (patch) | |
| tree | 409a66488e99ed288c9ff2b4eb90f1993ae537ab /calendar/gui/alarm-notify | |
| parent | e9c4388490925de25b029fa0d6437a34a6386c05 (diff) | |
| parent | ece7dcdcea82d0e1fbc104cf48b2928a449b8748 (diff) | |
| download | gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar.gz gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar.bz2 gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar.lz gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar.xz gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar.zst gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.zip | |
Merge commit 'origin/gnome-2-30' into express2
Diffstat (limited to 'calendar/gui/alarm-notify')
| -rw-r--r-- | calendar/gui/alarm-notify/Makefile.am | 15 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/evolution-alarm-notify-icon.rc | 1 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/evolution-alarm-notify.ico | bin | 0 -> 17542 bytes |
3 files changed, 14 insertions, 2 deletions
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index 44e0187180..79b9122a3c 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -1,5 +1,9 @@ bin_PROGRAMS = evolution-alarm-notify +if HAVE_WINDRES +EVOLUTIONALARMNOTIFYICON = evolution-alarm-notify-icon.o +endif + evolution_alarm_notify_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"evolution-alarm-notify\" \ @@ -39,12 +43,19 @@ evolution_alarm_notify_LDADD = \ $(CAMEL_LIBS) \ $(EVOLUTION_CALENDAR_LIBS) \ $(CANBERRA_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(EVOLUTIONALARMNOTIFYICON) if OS_WIN32 evolution_alarm_notify_LDFLAGS = -mwindows endif -EXTRA_DIST = $(ui_DATA) +EXTRA_DIST = $(ui_DATA) \ + evolution-alarm-notify-icon.rc \ + evolution-alarm-notify.ico + + +evolution-alarm-notify-icon.o: evolution-alarm-notify.ico evolution-alarm-notify-icon.rc + $(WINDRES) evolution-alarm-notify-icon.rc evolution-alarm-notify-icon.o -include $(top_srcdir)/git.mk diff --git a/calendar/gui/alarm-notify/evolution-alarm-notify-icon.rc b/calendar/gui/alarm-notify/evolution-alarm-notify-icon.rc new file mode 100644 index 0000000000..1f9ef65874 --- /dev/null +++ b/calendar/gui/alarm-notify/evolution-alarm-notify-icon.rc @@ -0,0 +1 @@ +1 ICON "evolution-alarm-notify.ico" diff --git a/calendar/gui/alarm-notify/evolution-alarm-notify.ico b/calendar/gui/alarm-notify/evolution-alarm-notify.ico Binary files differnew file mode 100644 index 0000000000..6585452256 --- /dev/null +++ b/calendar/gui/alarm-notify/evolution-alarm-notify.ico |