[Commits] gtkhtml2_prefs.c 1.1.2.17 1.1.2.18

[colin at claws-mail.org]

Update of /home/claws-mail/plugins/gtkhtml2_viewer/src
In directory srv:/tmp/cvs-serv17017/src

Modified Files:
      Tag: gtk2
	gtkhtml2_prefs.c 
Log Message:
2012-04-01 [colin]	0.32.0cvs3

	* src/gtkhtml2_prefs.c
		Disable unsupported stuff with new AB

Index: gtkhtml2_prefs.c
===================================================================
RCS file: /home/claws-mail/plugins/gtkhtml2_viewer/src/Attic/gtkhtml2_prefs.c,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -d -r1.1.2.17 -r1.1.2.18
--- gtkhtml2_prefs.c	6 Jan 2012 14:23:24 -0000	1.1.2.17
+++ gtkhtml2_prefs.c	1 Apr 2012 18:48:22 -0000	1.1.2.18
@@ -74,6 +74,7 @@
 
 static GtkHtmlBrowserPage gtkhtml_prefs_page;
 
+#ifndef USE_NEW_ADDRBOOK
 static void gtkhtml_whitelist_ab_select_cb(GtkWidget *widget, gpointer data)
 {
 	GtkHtmlBrowserPage *page = (GtkHtmlBrowserPage *) data;
@@ -87,6 +88,7 @@
 		g_free(new_path);
 	}
 }
+#endif
 
 static void create_gtkhtml_prefs_page	(PrefsPage *page,
 					 GtkWindow *window,
@@ -131,9 +133,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	
 	active &= gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page->cache_images));
 }
 
@@ -146,7 +149,9 @@
 	active &= gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page->local));
 
 	gtk_widget_set_sensitive(prefs_page->whitelist_ab_folder_combo, active);
+#ifndef USE_NEW_ADDRBOOK
 	gtk_widget_set_sensitive(prefs_page->whitelist_ab_select_btn, active);
+#endif
 }
 
 static void cache_images_checkbox_toggled(GtkToggleButton *button,
@@ -263,17 +268,21 @@
 
 	gtk_widget_set_sensitive(whitelist_ab_checkbtn, !gtkhtml_prefs.local);
 	gtk_widget_set_sensitive(whitelist_ab_folder_combo, !gtkhtml_prefs.local && gtkhtml_prefs.whitelist_ab);
+#ifndef USE_NEW_ADDRBOOK
 	gtk_widget_set_sensitive(whitelist_ab_select_btn, !gtkhtml_prefs.local && gtkhtml_prefs.whitelist_ab);
-
+#else
+	gtk_widget_set_sensitive(whitelist_ab_select_btn, FALSE);
+#endif
 	g_signal_connect(G_OBJECT(cache_images_checkbox), "toggled",
 			 G_CALLBACK(cache_images_checkbox_toggled),
 			 prefs_page);
 	g_signal_connect(G_OBJECT(empty_cache_btn), "clicked",
 			 G_CALLBACK(empty_cache_btn_clicked),
 			 prefs_page);
+#ifndef USE_NEW_ADDRBOOK
 	g_signal_connect(G_OBJECT (whitelist_ab_select_btn), "clicked",
 			 G_CALLBACK(gtkhtml_whitelist_ab_select_cb), page);
-
+#endif
         prefs_page->local = local_checkbox;
         prefs_page->cache_images = cache_images_checkbox;
         prefs_page->clear_cache = clear_cache_checkbox;