[Gaim-commits] CVS: gaim/src gtkblist.c,1.124,1.125

[Nathan W. <fac...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11681/src

Modified Files:
	gtkblist.c 
Log Message:
i hate gtk bugs


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -p -r1.124 -r1.125
--- gtkblist.c	4 Nov 2003 04:27:49 -0000	1.124
+++ gtkblist.c	4 Nov 2003 17:44:30 -0000	1.125
@@ -84,7 +84,10 @@ static GtkWidget *protomenu = NULL;
 GSList *gaim_gtk_blist_sort_methods = NULL;
 static struct gaim_gtk_blist_sort_method *current_sort_method = NULL;
 static GtkTreeIter sort_method_none(GaimBlistNode *node, GaimBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur);
-#if GTK_CHECK_VERSION(2,2,0)
+
+/* The functions we use for sorting aren't available in gtk 2.0.x, and
+ * segfault in 2.2.0.  2.2.4 is known to work, so I'll require that */
+#if GTK_CHECK_VERSION(2,2,4)
 static GtkTreeIter sort_method_alphabetical(GaimBlistNode *node, GaimBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur);
 static GtkTreeIter sort_method_status(GaimBlistNode *node, GaimBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur);
 static GtkTreeIter sort_method_log(GaimBlistNode *node, GaimBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur);
@@ -2102,7 +2105,7 @@ item_factory_translate_func (const char 
 void gaim_gtk_blist_setup_sort_methods()
 {
 	gaim_gtk_blist_sort_method_reg("none", _("None"), sort_method_none);
-#if GTK_CHECK_VERSION(2,2,0)
+#if GTK_CHECK_VERSION(2,2,4)
 	gaim_gtk_blist_sort_method_reg("alphabetical", _("Alphabetical"), sort_method_alphabetical);
 	gaim_gtk_blist_sort_method_reg("status", _("By status"), sort_method_status);
 	gaim_gtk_blist_sort_method_reg("log_size", _("By log size"), sort_method_log);
@@ -3681,7 +3684,7 @@ static GtkTreeIter sort_method_none(Gaim
 	return iter;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
+#if GTK_CHECK_VERSION(2,2,4)
 
 static GtkTreeIter sort_method_alphabetical(GaimBlistNode *node, GaimBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur)
 {