Mercurial > pidgin.yaz
diff pidgin/gtkprefs.c @ 29623:3c9534e77ea1
propagate from branch 'im.pidgin.pidgin' (head 53ad409302bf312b4f1e4153f893f1350638c8c9)
to branch 'im.pidgin.pidgin.next.minor' (head e36acc862ca620a7afc746236306cb0eba4ca37a)
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Mon, 02 Nov 2009 03:18:15 +0000 |
parents | 532307346255 e3206d6da6c7 |
children | be31e811cb26 |
line wrap: on
line diff
--- a/pidgin/gtkprefs.c Mon Nov 02 03:12:45 2009 +0000 +++ b/pidgin/gtkprefs.c Mon Nov 02 03:18:15 2009 +0000 @@ -1534,10 +1534,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); @@ -1558,14 +1556,12 @@ return ret; } -#if GTK_CHECK_VERSION(2,4,0) static void pidgin_custom_font_set(GtkFontButton *font_button, gpointer nul) { purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/custom_font", gtk_font_button_get_font_name(font_button)); } -#endif static GtkWidget * conv_page(void) @@ -1579,11 +1575,9 @@ GtkWidget *imhtml; GtkWidget *frame; -#if GTK_CHECK_VERSION(2,4,0) GtkWidget *hbox; GtkWidget *font_button; const char *font_name; -#endif ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); @@ -1622,7 +1616,6 @@ PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines", 1, 8, NULL); -#if GTK_CHECK_VERSION(2,4,0) vbox = pidgin_make_frame(ret, _("Font")); if (purple_running_gnome()) fontpref = pidgin_prefs_checkbox(_("Use document font from _theme"), PIDGIN_PREFS_ROOT "/conversations/use_theme_font", vbox); @@ -1642,7 +1635,6 @@ gtk_widget_set_sensitive(hbox, FALSE); g_signal_connect(G_OBJECT(fontpref), "clicked", G_CALLBACK(pidgin_toggle_sensitive), hbox); g_signal_connect(G_OBJECT(font_button), "font-set", G_CALLBACK(pidgin_custom_font_set), NULL); -#endif vbox = pidgin_make_frame(ret, _("Default Formatting")); gtk_box_set_child_packing(GTK_BOX(vbox->parent), vbox, TRUE, TRUE, 0, GTK_PACK_START); @@ -2829,12 +2821,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