Hi, all
fix_comment_search.patch:
Current CVS segfaults if you search for comments in a directory where at least
one photo doesn't have a comment. This patch fixes that behavior (by having the
comment_read function return FALSE when a comment doesn't exist)
update_deprecated_treeview_fxn:
Make the following renames, so that geeqie compiles against Debian's GTK
2.12.11-4. Note that these are guesses. It compiles, though :o)
gtk_tree_view_widget_to_tree_coords
gtk_tree_view_convert_widget_to_tree_coords
gtk_tree_view_tree_to_widget_coords
gtk_tree_view_convert_tree_to_widget_coords
Cheers,
-xsdg
--- src.orig/bar_info.c 2008-10-27 03:45:22.000000000 +0000
+++ src/bar_info.c 2008-10-27 08:24:58.000000000 +0000
@@ -462,6 +462,10 @@
}
if (res1 && (!comment || *comment != comment1)) g_free(comment1);
if (res2 && (!comment || *comment != comment2)) g_free(comment2);
+
+ // return FALSE on failure
+ if (comment && !*comment)
+ return FALSE;
return TRUE;
}
--- src.orig/ui_tree_edit.c 2008-10-27 03:45:22.000000000 +0000
+++ src/ui_tree_edit.c 2008-10-27 08:37:27.000000000 +0000
@@ -266,10 +266,8 @@
* use x_offset instead for X scroll (sigh)
*/
gtk_tree_view_get_cell_area(widget, tpath, tv_column, &rect);
-// #if GTK_CHECK_VERSION(2,12,0)
-#if 0
- //FIXME: these functions are not equivalent
- gtk_tree_view_convert_bin_window_to_widget_coords(widget, 0, 0, &x_offset, &y_offset);
+#if GTK_CHECK_VERSION(2,12,0)
+ gtk_tree_view_convert_tree_to_widget_coords(widget, 0, 0, &x_offset, &y_offset);
#else
gtk_tree_view_tree_to_widget_coords(widget, 0, 0, &x_offset, &y_offset);
#endif
@@ -365,10 +363,8 @@
gtk_tree_path_free(tpath);
-// #if GTK_CHECK_VERSION(2,12,0)
-#if 0
- //FIXME: these functions are not equivalent
- gtk_tree_view_convert_bin_window_to_widget_coords(widget, crect.x, crect.y, &cx, &cy);
+#if GTK_CHECK_VERSION(2,12,0)
+ gtk_tree_view_convert_widget_to_tree_coords(widget, crect.x, crect.y, &cx, &cy);
#else
gtk_tree_view_widget_to_tree_coords(widget, crect.x, crect.y, &cx, &cy);
#endif
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel
