[Commits] Makefile.am 1.1.2.4 1.1.2.5 notification_plugin.c 1.1.2.2 1.1.2.3

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/plugins/notification
In directory srv:/tmp/cvs-serv11307/src/plugins/notification

Modified Files:
      Tag: gtk2
	Makefile.am notification_plugin.c 
Log Message:
2013-02-20 [colin]	3.9.0cvs85

	* configure.ac
		Rework plugin enabling logic. More clean!
	* src/plugins/fancy/fancy_viewer.c
	* src/plugins/fancy/fancy_viewer.h
	* src/plugins/spam_report/spam_report.c
		Make curl dependancy mandatory
	* src/plugins/notification/notification_plugin.c
		Fix build with every possible thing disabled
	* src/plugins/notification/Makefile.am
	* src/plugins/notification/gtkhotkey/.cvsignore
	* src/plugins/notification/gtkhotkey/Makefile.am
	* src/plugins/notification/gtkhotkey/gtk-hotkey-error.c
	* src/plugins/notification/gtkhotkey/gtk-hotkey-error.h
	* src/plugins/notification/gtkhotkey/gtk-hotkey-info.c
	* src/plugins/notification/gtkhotkey/gtk-hotkey-info.h
	* src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
	* src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.h
	* src/plugins/notification/gtkhotkey/gtk-hotkey-listener.c
	* src/plugins/notification/gtkhotkey/gtk-hotkey-listener.h
	* src/plugins/notification/gtkhotkey/gtk-hotkey-marshal.c
	* src/plugins/notification/gtkhotkey/gtk-hotkey-marshal.h
	* src/plugins/notification/gtkhotkey/gtk-hotkey-registry.c
	* src/plugins/notification/gtkhotkey/gtk-hotkey-registry.h
	* src/plugins/notification/gtkhotkey/gtk-hotkey-utils.c
	* src/plugins/notification/gtkhotkey/gtk-hotkey-utils.h
	* src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
	* src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.h
	* src/plugins/notification/gtkhotkey/gtkhotkey.h
	* src/plugins/notification/gtkhotkey/x11/eggaccelerators.c
	* src/plugins/notification/gtkhotkey/x11/eggaccelerators.h
	* src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c
	* src/plugins/notification/gtkhotkey/x11/tomboykeybinder.h
		Re-add hotkey support
	* src/plugins/spam_report/Makefile.am
	* src/plugins/tnef_parse/Makefile.am
		Remove gettext.h

Index: notification_plugin.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_plugin.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- notification_plugin.c	17 Feb 2013 21:56:48 -0000	1.1.2.2
+++ notification_plugin.c	20 Feb 2013 11:25:36 -0000	1.1.2.3
@@ -158,7 +158,7 @@
 #if defined(NOTIFICATION_LCDPROC) || defined(NOTIFICATION_TRAYICON) || defined(NOTIFICATION_INDICATOR)
     notification_update_msg_counts(NULL);
 #else
-    if(notify_config.urgency_hint)
+    if(notify_config.urgency_hint_new || notify_config.urgency_hint_unread)
     	notification_update_msg_counts(NULL);
 #endif
 

Index: Makefile.am
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/Makefile.am,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- Makefile.am	20 Feb 2013 08:16:15 -0000	1.1.2.4
+++ Makefile.am	20 Feb 2013 11:25:35 -0000	1.1.2.5
@@ -1,12 +1,12 @@
-#if BUILD_HOTKEYS
-#hotkey_lib = libcmnpgtkhotkey.la
-#hotkey_lib_path = $(top_builddir)/src/plugins/notification/gtkhotkey/libcmnpgtkhotkey.la
-#else
+if BUILD_HOTKEYS
+hotkey_lib = libcmnpgtkhotkey.la
+hotkey_lib_path = $(top_builddir)/src/plugins/notification/gtkhotkey/libcmnpgtkhotkey.la
+else
 hotkey_lib =
 hotkey_lib_path =
-#endif
-
+endif
 
+SUBDIRS=gtkhotkey
 EXTRA_DIST = claws.def plugin.def version.rc
 CFLAGS += "-Wall"