CVS: sylpheed-claws/src/gtk quicksearch.c,1.1.2.41,1.1.2.42

Update of /cvsroot/sylpheed-claws/sylpheed-claws/src/gtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25871/src/gtk

Modified Files:
      Tag: gtk2
	quicksearch.c 
Log Message:
2006-04-21 [colin]	2.1.1cvs22

	* src/gtk/quicksearch.c
		On gtk+-2.8, use stock buttons in quicksearch
		Based on a patch by Fabien and a design by Paul

Index: quicksearch.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/gtk/quicksearch.c,v
retrieving revision 1.1.2.41
retrieving revision 1.1.2.42
diff -u -r1.1.2.41 -r1.1.2.42
--- quicksearch.c	20 Apr 2006 11:57:57 -0000	1.1.2.41
+++ quicksearch.c	21 Apr 2006 18:18:30 -0000	1.1.2.42
@@ -452,14 +452,22 @@
 
 	search_hbox = gtk_hbox_new(FALSE, 5);
 
+#if GTK_CHECK_VERSION(2, 8, 0)
+	clear_search = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
+#else
 	clear_search = gtk_button_new_with_label(_(" Clear "));
+#endif
 	gtk_box_pack_start(GTK_BOX(search_hbox), clear_search,
 			   FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(clear_search), "clicked",
 			 G_CALLBACK(clear_search_cb), quicksearch);
 	gtk_widget_show(clear_search);
 
+#if GTK_CHECK_VERSION(2, 8, 0)
+	search_condition_expression = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+#else
 	search_condition_expression = gtk_button_new_with_label(" ... ");
+#endif
 	gtk_box_pack_start(GTK_BOX(search_hbox), search_condition_expression,
 			   FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT (search_condition_expression), "clicked",
@@ -471,7 +479,11 @@
 			     _("Edit search criteria"), NULL);
 	gtk_widget_show(search_condition_expression);
 
+#if GTK_CHECK_VERSION(2, 8, 0)
+	search_description = gtk_button_new_from_stock(GTK_STOCK_INFO);
+#else
 	search_description = gtk_button_new_with_label(_(" Extended Symbols... "));
+#endif
 	gtk_box_pack_start(GTK_BOX(search_hbox), search_description,
 			   FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(search_description), "clicked",



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642