diff options
Diffstat (limited to 'plugins/mail-notification')
| -rw-r--r-- | plugins/mail-notification/ChangeLog | 13 | ||||
| -rw-r--r-- | plugins/mail-notification/Makefile.am | 21 | ||||
| -rw-r--r-- | plugins/mail-notification/mail-notification.c | 3 |
3 files changed, 31 insertions, 6 deletions
diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog index 278f8bb93a..81039caa5c 100644 --- a/plugins/mail-notification/ChangeLog +++ b/plugins/mail-notification/ChangeLog @@ -1,3 +1,16 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + +2008-08-11 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #546892 + + * mail-notification.c: + Prefer gtk_status_icon_set_from_icon_name() over + gtk_status_icon_set_from_pixbuf(). + 2008-08-01 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #514006 diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 86fc91cc11..80b4fbcc98 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -29,12 +29,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif BUILT_SOURCES = $(plugin_DATA) diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index afa633c999..9826f5a06d 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -38,7 +38,6 @@ #include <time.h> #include "e-util/e-config.h" -#include "e-util/e-icon-factory.h" #include "mail/em-utils.h" #include "mail/em-event.h" #include "mail/em-folder-tree-model.h" @@ -449,7 +448,7 @@ new_notify_status (EMEventTargetFolder *t) if (new_icon) { status_icon = gtk_status_icon_new (); - gtk_status_icon_set_from_pixbuf (status_icon, e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_LARGE_TOOLBAR)); + gtk_status_icon_set_from_icon_name (status_icon, "mail-unread"); } if (!status_count) { |