# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1266564222 0
# Node ID 2cbccbdf479a030b852f247654e52add1663461f
# Parent  9a0990fd41ed1a7658db4a80a99132c9edb5548f# Parent  47636f9ad624bfc233378f776b06e9a58a650930
merge of '42baaaa89e0547680887e64267865054a0936d37'
     and 'df5196ac4c45dfff9cad5768c27d4e1d46fbb2ab'

diff -r 9a0990fd41ed -r 2cbccbdf479a pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Fri Feb 19 07:07:09 2010 +0000
+++ b/pidgin/gtkutils.c	Fri Feb 19 07:23:42 2010 +0000
@@ -892,11 +892,7 @@
 }
 
 gboolean
-#if GTK_CHECK_VERSION(2,4,0)
-pidgin_check_if_dir(const char *path, gpointer filesel)
-#else
 pidgin_check_if_dir(const char *path, GtkFileSelection *filesel)
-#endif
 {
 	char *dirname = NULL;
 
@@ -905,9 +901,7 @@
 		if (path[strlen(path) - 1] != G_DIR_SEPARATOR) {
 			dirname = g_strconcat(path, G_DIR_SEPARATOR_S, NULL);
 		}
-#if !GTK_CHECK_VERSION(2,4,0)
 		gtk_file_selection_set_filename(filesel, (dirname != NULL) ? dirname : path);
-#endif
 		g_free(dirname);
 		return TRUE;
 	}