[Commits] trayicon.c 1.14.2.82 1.14.2.83

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/plugins/trayicon
In directory srv:/tmp/cvs-serv29474/src/plugins/trayicon

Modified Files:
      Tag: gtk2
	trayicon.c 
Log Message:
2012-09-08 [colin]	3.8.1cvs46

	* AUTHORS
	* src/Makefile.am
	* src/action.c
	* src/addr_compl.c
	* src/addrbook.c
	* src/compose.c
	* src/compose.h
	* src/editaddress.c
	* src/filtering.c
	* src/folder.c
	* src/folder.h
	* src/folderview.h
	* src/headerview.h
	* src/imap_gtk.c
	* src/localfolder.c
	* src/main.c
	* src/mainwindow.c
	* src/mainwindow.h
	* src/matcher.c
	* src/matcher_parser_parse.y
	* src/messageview.c
	* src/messageview.h
	* src/mh.c
	* src/mh_gtk.c
	* src/mimeview.c
	* src/mimeview.h
	* src/noticeview.h
	* src/prefs_account.c
	* src/prefs_account.h
	* src/prefs_filtering.c
	* src/prefs_filtering_action.c
	* src/prefs_gtk.h
	* src/prefs_matcher.c
	* src/prefs_template.c
	* src/prefs_toolbar.c
	* src/privacy.c
	* src/procheader.h
	* src/procmime.c
	* src/procmime.h
	* src/procmsg.c
	* src/procmsg.h
	* src/proctypes.h
	* src/remotefolder.c
	* src/summaryview.c
	* src/summaryview.h
	* src/textview.c
	* src/textview.h
	* src/toolbar.c
	* src/uri_opener.c
	* src/viewtypes.h
	* src/common/defs.h
	* src/gtk/authors.h
	* src/gtk/description_window.c
	* src/plugins/trayicon/trayicon.c
		Break circular dependencies in Claws' headers,
		Patch by Sean Buckheister <s_buckhe at cs.uni-kl.de>

Index: trayicon.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/trayicon/trayicon.c,v
retrieving revision 1.14.2.82
retrieving revision 1.14.2.83
diff -u -d -r1.14.2.82 -r1.14.2.83
--- trayicon.c	7 Jul 2012 07:09:39 -0000	1.14.2.82
+++ trayicon.c	8 Sep 2012 20:23:12 -0000	1.14.2.83
@@ -43,7 +43,9 @@
 #include "alertpanel.h"
 #include "account.h"
 #include "gtk/manage_window.h"
-#ifdef USE_NEW_ADDRBOOK
+#ifndef USE_NEW_ADDRBOOK
+	#include "addressbook.h"
+#else
 	#include "addressbook-dbus.h"
 #endif