[Commits] trayicon.c 1.14.2.79 1.14.2.80

[colin at claws-mail.org]

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

Modified Files:
      Tag: gtk2
	trayicon.c 
Log Message:
2012-04-01 [colin]	3.8.0cvs36

	* configure.ac
	* src/.cvsignore
	* src/Makefile.am
	* src/addr_compl.c
	* src/addressadd.c
	* src/addressadd.h
	* src/addressbook-dbus.c
	* src/addressbook-dbus.h
	* src/addrgather.c
	* src/addrgather.h
	* src/addrharvest.c
	* src/addrharvest.h
	* src/claws-contacts.xml
	* src/compose.c
	* src/compose.h
	* src/filtering.c
	* src/headerview.c
	* src/main.c
	* src/mainwindow.c
	* src/messageview.c
	* src/prefs_common.c
	* src/prefs_filtering_action.c
	* src/prefs_matcher.c
	* src/summaryview.c
	* src/textview.c
	* src/toolbar.c
	* src/plugins/bogofilter/bogofilter_gtk.c
	* src/plugins/dillo_viewer/dillo_prefs.c
	* src/plugins/spamassassin/spamassassin_gtk.c
	* src/plugins/trayicon/trayicon.c
		Import new addressbook code from the new-contacts branch

Index: trayicon.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/trayicon/trayicon.c,v
retrieving revision 1.14.2.79
retrieving revision 1.14.2.80
diff -u -d -r1.14.2.79 -r1.14.2.80
--- trayicon.c	22 Oct 2011 17:09:05 -0000	1.14.2.79
+++ trayicon.c	1 Apr 2012 18:45:27 -0000	1.14.2.80
@@ -42,6 +42,9 @@
 #include "alertpanel.h"
 #include "account.h"
 #include "gtk/manage_window.h"
+#ifdef USE_NEW_ADDRBOOK
+	#include "addressbook-dbus.h"
+#endif
 
 #include "trayicon_prefs.h"
 
@@ -530,7 +533,16 @@
 
 static void trayicon_addressbook_cb( GtkAction *action, gpointer data )
 {
+#ifndef USE_NEW_ADDRBOOK
 	addressbook_open(NULL);
+#else
+	GError* error = NULL;
+	addressbook_dbus_open(FALSE, &error);
+	if (error) {
+		g_warning("%s", error->message);
+		g_error_free(error);
+	}
+#endif
 }
 
 static void trayicon_toggle_offline_cb( GtkAction *action, gpointer data )