[Commits] dillo_prefs.c 1.5.2.27 1.5.2.28

[colin at claws-mail.org]

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

Modified Files:
      Tag: gtk2
	dillo_prefs.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: dillo_prefs.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/dillo_viewer/dillo_prefs.c,v
retrieving revision 1.5.2.27
retrieving revision 1.5.2.28
diff -u -d -r1.5.2.27 -r1.5.2.28
--- dillo_prefs.c	22 Oct 2011 17:09:05 -0000	1.5.2.27
+++ dillo_prefs.c	1 Apr 2012 18:45:27 -0000	1.5.2.28
@@ -77,6 +77,7 @@
 static void destroy_dillo_prefs_page	(PrefsPage *page);
 static void save_dillo_prefs		(PrefsPage *page);
 
+#ifndef USE_NEW_ADDRBOOK
 static void dillo_whitelist_ab_select_cb(GtkWidget *widget, gpointer data)
 {
 	DilloBrowserPage *page = (DilloBrowserPage *) data;
@@ -90,6 +91,7 @@
 		g_free(new_path);
 	} 
 }
+#endif
 
 static void local_checkbox_toggled(GtkToggleButton *button,
 					  gpointer user_data)
@@ -100,8 +102,10 @@
 	gtk_widget_set_sensitive(prefs_page->whitelist_ab, active);
 	gtk_widget_set_sensitive(prefs_page->whitelist_ab_folder_combo, active && 
 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page->whitelist_ab)));
+#ifndef USE_NEW_ADDRBOOK
 	gtk_widget_set_sensitive(prefs_page->whitelist_ab_select_btn, active && 
 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page->whitelist_ab)));
+#endif
 }
 
 static void whitelist_checkbox_toggled(GtkToggleButton *button,
@@ -233,9 +237,12 @@
 			 G_CALLBACK(whitelist_checkbox_toggled),
 			 prefs_page);
 
+#ifndef USE_NEW_ADDRBOOK
 	g_signal_connect(G_OBJECT (whitelist_ab_select_btn), "clicked",
 			 G_CALLBACK(dillo_whitelist_ab_select_cb), prefs_page);
-
+#else
+	gtk_widget_set_sensitive(GTK_WIDGET(whitelist_ab_select_btn), FALSE);
+#endif
 	gtk_widget_set_sensitive(whitelist_ab_checkbtn, !dillo_prefs.local);
 	gtk_widget_set_sensitive(whitelist_ab_folder_combo, !dillo_prefs.local && dillo_prefs.whitelist_ab);
 	gtk_widget_set_sensitive(whitelist_ab_select_btn, !dillo_prefs.local && dillo_prefs.whitelist_ab);