comparison pidgin/gtklog.c @ 29522:739886e6dac2

propagate from branch 'im.pidgin.pidgin' (head 667654b3309008b53bf4d9df02bd401d1ede8db5) to branch 'im.pidgin.pidgin.next.minor' (head e37d7dfead3e1864f8de0c0397a8f6471af07e29)
author John Bailey <rekkanoryo@rekkanoryo.org>
date Mon, 12 Oct 2009 22:40:37 +0000
parents 48ea900ee72a
children dcd52d2b1b97
comparison
equal deleted inserted replaced
28747:f55bd60e2738 29522:739886e6dac2
250 GtkTreeStore *treestore = data[0]; 250 GtkTreeStore *treestore = data[0];
251 GtkTreeIter *iter = (GtkTreeIter *)data[1]; 251 GtkTreeIter *iter = (GtkTreeIter *)data[1];
252 GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), iter); 252 GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), iter);
253 gboolean first = !gtk_tree_path_prev(path); 253 gboolean first = !gtk_tree_path_prev(path);
254 254
255 #if GTK_CHECK_VERSION(2,2,0)
256 if (!gtk_tree_store_remove(treestore, iter) && first) 255 if (!gtk_tree_store_remove(treestore, iter) && first)
257 { 256 {
258 /* iter was the last child at its level */ 257 /* iter was the last child at its level */
259 258
260 if (gtk_tree_path_up(path)) 259 if (gtk_tree_path_up(path))
261 { 260 {
262 gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), iter, path); 261 gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), iter, path);
263 gtk_tree_store_remove(treestore, iter); 262 gtk_tree_store_remove(treestore, iter);
264 } 263 }
265 } 264 }
266 #else 265
267 gtk_tree_store_remove(treestore, iter);
268 #endif
269 gtk_tree_path_free(path); 266 gtk_tree_path_free(path);
270 } 267 }
271 268
272 delete_log_cleanup_cb(data); 269 delete_log_cleanup_cb(data);
273 } 270 }