Mercurial > pidgin

comparison src/prefs.c @ 3377:783e982a56da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 3396] This button ordering is better. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Mon, 05 Aug 2002 08:04:39 +0000
parents 3cd2fbddf95a
children b48b73ef172b
comparison
equal deleted inserted replaced
3376:8d0fa912ecaf 3377:783e982a56da
1816 /* The buttons to press! */ 1816 /* The buttons to press! */
1817 hbox = gtk_hbox_new (FALSE, 6); 1817 hbox = gtk_hbox_new (FALSE, 6);
1818 gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); 1818 gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
1819 gtk_container_add (GTK_CONTAINER(vbox), hbox); 1819 gtk_container_add (GTK_CONTAINER(vbox), hbox);
1820 gtk_widget_show (hbox); 1820 gtk_widget_show (hbox);
1821
1821 #if GTK_CHECK_VERSION(1,3,0) 1822 #if GTK_CHECK_VERSION(1,3,0)
1822 button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); 1823 button = gtk_button_new_from_stock (GTK_STOCK_OK);
1823 #else 1824 #else
1824 button = picture_button(prefs, _("Close"), cancel_xpm); 1825 button = picture_button(prefs, _("OK"), join_xpm);
1825 #endif 1826 #endif
1826 gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), prefs); 1827 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ok_cb), prefs);
1827 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 1828 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1828 if (misc_options & OPT_MISC_COOL_LOOK) 1829 if (misc_options & OPT_MISC_COOL_LOOK)
1829 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 1830 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1830 gtk_widget_show(button); 1831 gtk_widget_show(button);
1832
1831 #if GTK_CHECK_VERSION(1,3,0) 1833 #if GTK_CHECK_VERSION(1,3,0)
1832 button = gtk_button_new_from_stock (GTK_STOCK_APPLY); 1834 button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
1833 #else 1835 #else
1834 button = picture_button(prefs, _("Apply"), ok_xpm); 1836 button = picture_button(prefs, _("Apply"), ok_xpm);
1835 #endif 1837 #endif
1837 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 1839 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1838 if (misc_options & OPT_MISC_COOL_LOOK) 1840 if (misc_options & OPT_MISC_COOL_LOOK)
1839 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 1841 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1840 gtk_widget_show(button); 1842 gtk_widget_show(button);
1841 1843
1844
1842 #if GTK_CHECK_VERSION(1,3,0) 1845 #if GTK_CHECK_VERSION(1,3,0)
1843 button = gtk_button_new_from_stock (GTK_STOCK_OK); 1846 button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
1844 #else 1847 #else
1845 button = picture_button(prefs, _("OK"), join_xpm); 1848 button = picture_button(prefs, _("Close"), cancel_xpm);
1846 #endif 1849 #endif
1847 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ok_cb), prefs); 1850 gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), prefs);
1848 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 1851 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1849 if (misc_options & OPT_MISC_COOL_LOOK) 1852 if (misc_options & OPT_MISC_COOL_LOOK)
1850 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 1853 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1851 gtk_widget_show(button); 1854 gtk_widget_show(button);
1852 1855