# HG changeset patch # User Sean Egan # Date 1028534679 0 # Node ID 783e982a56daaba10c49d349d253ea90daf0ab07 # Parent 8d0fa912ecaf4967f14bc596d0fc6b4d4f5fc93e [gaim-migrate @ 3396] This button ordering is better. committer: Tailor Script diff -r 8d0fa912ecaf -r 783e982a56da src/prefs.c --- a/src/prefs.c Mon Aug 05 07:56:37 2002 +0000 +++ b/src/prefs.c Mon Aug 05 08:04:39 2002 +0000 @@ -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);