Mercurial > pidgin.yaz
diff pidgin/gtkprefs.c @ 29786:f549ad844d54
propagate from branch 'im.pidgin.pidgin.next.minor' (head 42544ec892337510146c931806a95dbf69c2fe30)
to branch 'im.pidgin.pidgin' (head 32a27a2c6eebcccdecd7d7cd420b3789c69cbb09)
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 18 Feb 2010 09:22:01 +0000 |
| parents | 28714ff543cd b473cfd0285f |
| children | 5434f768917b |
line wrap: on
line diff
--- a/pidgin/gtkprefs.c Thu Feb 18 09:20:29 2010 +0000 +++ b/pidgin/gtkprefs.c Thu Feb 18 09:22:01 2010 +0000 @@ -1411,10 +1411,8 @@ _("Bottom"), GTK_POS_BOTTOM, _("Left"), GTK_POS_LEFT, _("Right"), GTK_POS_RIGHT, -#if GTK_CHECK_VERSION(2,6,0) _("Left Vertical"), GTK_POS_LEFT|8, _("Right Vertical"), GTK_POS_RIGHT|8, -#endif NULL); gtk_size_group_add_widget(sg, label); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); @@ -1509,7 +1507,7 @@ PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines", 1, 8, NULL); -#if GTK_CHECK_VERSION(2,4,0) && defined _WIN32 +#ifdef _WIN32 { GtkWidget *fontpref, *font_button, *hbox; const char *font_name; @@ -2721,12 +2719,7 @@ static int prefs_notebook_add_page(const char *text, GtkWidget *page, int ind) { -#if GTK_CHECK_VERSION(2,4,0) return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); -#else - gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); - return gtk_notebook_page_num(GTK_NOTEBOOK(prefsnotebook), page); -#endif } static void