Mercurial > pidgin.yaz
diff pidgin/gtkprefs.c @ 29759:2debb45f1df8
propagate from branch 'im.pidgin.pidgin' (head 2a58bda0b6d8c5519ef9e41e5f017343ef2cbac0)
to branch 'im.pidgin.pidgin.next.minor' (head ef75f5b709bfa7dff26b3d1186cc436f33e78b81)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 15 Feb 2010 22:24:26 +0000 |
| parents | 2ad2e3490b23 |
| children | b473cfd0285f |
line wrap: on
line diff
--- a/pidgin/gtkprefs.c Mon Feb 15 19:16:38 2010 +0000 +++ b/pidgin/gtkprefs.c Mon Feb 15 22:24:26 2010 +0000 @@ -1419,10 +1419,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); @@ -1517,7 +1515,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; @@ -2729,12 +2727,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