changeset 29089:4e968ede8838

Kill off unneeded GTK_CHECK_VERSION uses in gtkprefs.c. There are a couple I left in because they're commented out and it wasn't immediately obvious to me why they were commented out. Hopefully someone remembers why? Refs #10024.
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sun, 23 Aug 2009 15:26:13 +0000
parents 886a0dfaa625
children 21277e69e06c
files pidgin/gtkprefs.c
diffstat 1 files changed, 0 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkprefs.c	Sun Aug 23 14:59:42 2009 +0000
+++ b/pidgin/gtkprefs.c	Sun Aug 23 15:26:13 2009 +0000
@@ -1496,10 +1496,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);
@@ -1520,14 +1518,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)
@@ -1541,11 +1537,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);
@@ -1584,7 +1578,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);
@@ -1604,7 +1597,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);
@@ -2782,12 +2774,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