Revision: 1690
http://geeqie.svn.sourceforge.net/geeqie/?rev=1690&view=rev
Author: nadvornik
Date: 2009-05-07 19:52:38 +0000 (Thu, 07 May 2009)
Log Message:
-----------
fixed keyword tree initialization
Modified Paths:
--------------
trunk/src/bar_keywords.c
trunk/src/metadata.c
Modified: trunk/src/bar_keywords.c
===================================================================
--- trunk/src/bar_keywords.c 2009-05-07 19:38:07 UTC (rev 1689)
+++ trunk/src/bar_keywords.c 2009-05-07 19:52:38 UTC (rev 1690)
@@ -1224,6 +1224,7 @@
GtkTreeModel *store;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
+ GtkTreeIter iter;
pkd = g_new0(PaneKeywordsData, 1);
@@ -1273,7 +1274,11 @@
gtk_widget_show(scrolled);
- if (!keyword_tree) keyword_tree_new_default();
+ if (!keyword_tree ||
!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(keyword_tree), &iter))
+ {
+ /* keyword tree does not exist or is empty - fill with defaults
*/
+ keyword_tree_new_default();
+ }
store = gtk_tree_model_filter_new(GTK_TREE_MODEL(keyword_tree), NULL);
Modified: trunk/src/metadata.c
===================================================================
--- trunk/src/metadata.c 2009-05-07 19:38:07 UTC (rev 1689)
+++ trunk/src/metadata.c 2009-05-07 19:52:38 UTC (rev 1690)
@@ -1333,12 +1333,10 @@
void keyword_tree_new_default(void)
{
- if (keyword_tree) return;
-
- keyword_tree_new();
-
GtkTreeIter i1, i2, i3;
+ if (!keyword_tree) keyword_tree_new();
+
i1 = keyword_tree_default_append(keyword_tree, NULL, _("People"),
TRUE);
i2 = keyword_tree_default_append(keyword_tree, &i1,
_("Family"), TRUE);
i2 = keyword_tree_default_append(keyword_tree, &i1, _("Free
time"), TRUE);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
