Mercurial > pidgin
changeset 16233:c4818bf183a6
merge of '3956f53331764e51ab7d79a8de4310cb6a4c0e58'
and '68c52efea68c3ebbba53da9c5b95a4c9ee9c1754'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Tue, 17 Apr 2007 14:59:35 +0000 |
| parents | 7d1847ba3484 (diff) e8173e12182a (current diff) |
| children | 5b99b9ec194f 9709b1bc5d61 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue Apr 17 14:11:56 2007 +0000 +++ b/configure.ac Tue Apr 17 14:59:35 2007 +0000 @@ -243,7 +243,7 @@ dnl We only really need Pango >= 1.4 for decent RTL support PKG_CHECK_MODULES(pango, [pango >= 1.4.0], - AC_DEFINE(HAVE_PANGO14, 1, [Define if we have Pango 1.4 or newer.]),) + AC_DEFINE(HAVE_PANGO14, 1, [Define if we have Pango 1.4 or newer.]),:) dnl ####################################################################### dnl # Check for XScreenSaver
--- a/pidgin/gtklog.c Tue Apr 17 14:11:56 2007 +0000 +++ b/pidgin/gtklog.c Tue Apr 17 14:59:35 2007 +0000 @@ -226,6 +226,7 @@ GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), iter); gboolean first = !gtk_tree_path_prev(path); +#if GTK_CHECK_VERSION(2,2,0) if (!gtk_tree_store_remove(treestore, iter) && first) { /* iter was the last child at its level */ @@ -237,6 +238,10 @@ } } gtk_tree_path_free(path); +#else + gtk_tree_store_remove(treestore, iter); + gtk_tree_path_free(path); +#endif } delete_log_cleanup_cb(data);