# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1068738087 0
# Node ID 3e85281aef0b585bec628063cbad514b3c276262
# Parent  cedf025497c24cc0bc6ea0e8be52bf036771890d
[gaim-migrate @ 8114]
Removal of two gtk2.2isms:

1) gdk_get_display_arg_name() is gtk2.2 only
2) g_str_has_suffix() is gtk2.2 only

committer: Tailor Script <tailor@pidgin.im>

diff -r cedf025497c2 -r 3e85281aef0b src/log.c
--- a/src/log.c	Thu Nov 13 15:14:14 2003 +0000
+++ b/src/log.c	Thu Nov 13 15:41:27 2003 +0000
@@ -207,7 +207,7 @@
 {
 	GDir *dir;
 	GList *list = NULL;
-	const char *filename;
+	const char *filename, *tmp;
 	char *me = g_strdup(gaim_normalize(account, gaim_account_get_username(account)));
 
 	const char *prpl = GAIM_PLUGIN_PROTOCOL_INFO
@@ -221,7 +221,8 @@
 		return NULL;
 	}
 	while ((filename = g_dir_read_name(dir))) {
-		if (g_str_has_suffix(filename, ext)) {
+		tmp = filename + (strlen(filename) - strlen(ext));
+		if (tmp > filename && !strcmp(tmp, ext)) {
 			const char *l = filename;
 			struct tm time;
 			GaimLog *log;
diff -r cedf025497c2 -r 3e85281aef0b src/main.c
--- a/src/main.c	Thu Nov 13 15:14:14 2003 +0000
+++ b/src/main.c	Thu Nov 13 15:41:27 2003 +0000
@@ -816,11 +816,13 @@
 		return 0;
 	}
 
+#if GTK_CHECK_VERSION(2,2,0)
 	if(! gui_check) {
 	    const char *display_name_arg = gdk_get_display_arg_name ();
 	    g_warning ("cannot open display: %s", display_name_arg ? display_name_arg : " ");
 	    return 1;
 	}
+#endif
 
 	gaim_gtk_stock_init();