pidgin: 863d08c6: Get rid of a few version checks that we ...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 863d08c66b1460f2569fb30822600a2008a24e45
Ancestor: 7cbf7672c6c00ff1a1fd63ef37e7b18b5d72f1c7
Author: markdoliner at pidgin.im
Date: 2010-02-19T08:54:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/863d08c66b1460f2569fb30822600a2008a24e45

Deleted entries:
        pidgin/gtkdocklet-x11.c
Modified files:
        libpurple/plugins/log_reader.c pidgin/Makefile.am
        pidgin/gtkdocklet-gtk.c pidgin/gtkprefs.c

ChangeLog: 

Get rid of a few version checks that we no longer need now that we depend
on newer stuff.  Can also get rid of gtkdocklet-x11.c, apparently.

-------------- next part --------------
============================================================
--- libpurple/plugins/log_reader.c	7459a663a94c0648ae058e3d88933eebd0c06414
+++ libpurple/plugins/log_reader.c	37097eb3741d39edb717a06b0c0e6632d442fd54
@@ -2644,7 +2644,7 @@ static void log_reader_init_prefs(void) 
 			g_free(contents);
 		}
 		g_free(path);
-#endif /* !GTK_CHECK_VERSION(2,6,0) */
+#endif /* !GLIB_CHECK_VERSION(2,6,0) */
 	} /* path */
 
 	if (!found) {
============================================================
--- pidgin/Makefile.am	2f1d296263c9d100c74cf0fd6e0ad615e28d645c
+++ pidgin/Makefile.am	cd11e417bfa4be7fdc8509554dae705a9cac14bc
@@ -89,7 +89,6 @@ pidgin_SOURCES = \
 	gtkdnd-hints.c \
 	gtkdocklet.c \
 	gtkdocklet-gtk.c \
-	gtkdocklet-x11.c \
 	gtkeventloop.c \
 	gtkft.c \
 	gtkicon-theme.c \
============================================================
--- pidgin/gtkdocklet-gtk.c	9061fa48200a315e7bbe24ac2339e1082832bf27
+++ pidgin/gtkdocklet-gtk.c	621886961dfcbcd728e875983d4e131264731683
@@ -26,8 +26,6 @@
 #include "pidginstock.h"
 #include "gtkdocklet.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 /* globals */
 GtkStatusIcon *docklet = NULL;
 
@@ -155,6 +153,3 @@ docklet_ui_init(void)
 	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
 		DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "pidgin" G_DIR_SEPARATOR_S "tray");
 }
-
-#endif  /* GTK_CHECK_VERSION(2,10,0) */
-
============================================================
--- pidgin/gtkprefs.c	ed4c07c6b51c80dac8dcb979e42914082255693a
+++ pidgin/gtkprefs.c	d31b019c0b79192d34ff912e618a6c62271533a0
@@ -902,9 +902,7 @@ prefs_build_theme_combo_box(GtkListStore
 	cell_rend = gtk_cell_renderer_text_new();
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo_box), cell_rend, TRUE);
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), cell_rend, "markup", 1, NULL);
-#if GTK_CHECK_VERSION(2,6,0)
 	g_object_set(cell_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif
 
 	gtk_drag_dest_set(combo_box, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, te,
 					sizeof(te) / sizeof(GtkTargetEntry) , GDK_ACTION_COPY | GDK_ACTION_MOVE);