Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv26262/src
Modified Files:
prefs.c
Log Message:
This button ordering is better.
Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -d -r1.230 -r1.231
--- prefs.c 5 Aug 2002 07:33:09 -0000 1.230
+++ prefs.c 5 Aug 2002 08:04:39 -0000 1.231
@@ -1818,16 +1818,18 @@
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
gtk_container_add (GTK_CONTAINER(vbox), hbox);
gtk_widget_show (hbox);
+
#if GTK_CHECK_VERSION(1,3,0)
- button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+ button = gtk_button_new_from_stock (GTK_STOCK_OK);
#else
- button = picture_button(prefs, _("Close"), cancel_xpm);
+ button = picture_button(prefs, _("OK"), join_xpm);
#endif
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), prefs);
+ gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ok_cb), prefs);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
if (misc_options & OPT_MISC_COOL_LOOK)
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
gtk_widget_show(button);
+
#if GTK_CHECK_VERSION(1,3,0)
button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
#else
@@ -1839,12 +1841,13 @@
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
gtk_widget_show(button);
+
#if GTK_CHECK_VERSION(1,3,0)
- button = gtk_button_new_from_stock (GTK_STOCK_OK);
+ button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
#else
- button = picture_button(prefs, _("OK"), join_xpm);
+ button = picture_button(prefs, _("Close"), cancel_xpm);
#endif
- gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ok_cb), prefs);
+ gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), prefs);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
if (misc_options & OPT_MISC_COOL_LOOK)
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
|
