[Commits] Makefile.am 1.1.2.1 1.1.2.2 spam_report.c 1.1.2.1 1.1.2.2

[colin at claws-mail.org]

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

Modified Files:
      Tag: gtk2
	Makefile.am spam_report.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: Makefile.am
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/spam_report/Attic/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- Makefile.am	20 Feb 2013 08:45:58 -0000	1.1.2.1
+++ Makefile.am	20 Feb 2013 11:25:36 -0000	1.1.2.2
@@ -5,8 +5,7 @@
 spamreport_la_SOURCES = \
          spam_report.c \
 	 spam_report_prefs.c \
-	 spam_report_prefs.h \
-	 gettext.h
+	 spam_report_prefs.h
 
 spamreport_la_LDFLAGS = \
 	-avoid-version -module \

Index: spam_report.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/spam_report/Attic/spam_report.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- spam_report.c	20 Feb 2013 08:45:58 -0000	1.1.2.1
+++ spam_report.c	20 Feb 2013 11:25:36 -0000	1.1.2.2
@@ -342,9 +342,8 @@
 		return -1;
 
 	spamreport_prefs_init();
-#ifdef HAVE_LIBCURL
+
 	curl_global_init(CURL_GLOBAL_DEFAULT);
-#endif
 
 	gtk_action_group_add_actions(mainwin->action_group, spamreport_main_menu,
 			1, (gpointer)mainwin);
@@ -371,9 +370,9 @@
 
 	MENUITEM_REMUI_MANAGER(mainwin->ui_manager,mainwin->action_group, "Message/ReportSpam", context_menu_id);
 	context_menu_id = 0;
-#ifdef HAVE_LIBCURL
+
 	spamreport_prefs_done();
-#endif
+
 	return TRUE;
 }