Revision: 1560
http://geeqie.svn.sourceforge.net/geeqie/?rev=1560&view=rev
Author: nadvornik
Date: 2009-03-20 10:12:29 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
be more verbose on parse errors
Modified Paths:
--------------
trunk/src/bar.c
trunk/src/bar_comment.c
trunk/src/bar_exif.c
trunk/src/bar_histogram.c
trunk/src/bar_keywords.c
trunk/src/bar_sort.c
trunk/src/filefilter.c
trunk/src/layout.c
trunk/src/layout_util.c
trunk/src/metadata.c
trunk/src/rcfile.c
Modified: trunk/src/bar.c
===================================================================
--- trunk/src/bar.c 2009-03-20 09:46:35 UTC (rev 1559)
+++ trunk/src/bar.c 2009-03-20 10:12:29 UTC (rev 1560)
@@ -351,7 +351,7 @@
if (READ_INT_FULL("width", width)) continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
gtk_widget_set_size_request(bar, width, -1);
Modified: trunk/src/bar_comment.c
===================================================================
--- trunk/src/bar_comment.c 2009-03-20 09:46:35 UTC (rev 1559)
+++ trunk/src/bar_comment.c 2009-03-20 10:12:29 UTC (rev 1560)
@@ -275,7 +275,7 @@
if (READ_INT_FULL("height", height)) continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
return bar_pane_comment_new(title, key, expanded, height);
Modified: trunk/src/bar_exif.c
===================================================================
--- trunk/src/bar_exif.c 2009-03-20 09:46:35 UTC (rev 1559)
+++ trunk/src/bar_exif.c 2009-03-20 10:12:29 UTC (rev 1560)
@@ -782,7 +782,7 @@
if (READ_CHAR_FULL("pane.title", title)) continue;
if (READ_BOOL_FULL("pane.expanded", expanded)) continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
return bar_pane_exif_new(title, expanded, FALSE);
@@ -809,7 +809,7 @@
if (READ_BOOL_FULL("if_set", if_set)) continue;
if (READ_BOOL_FULL("editable", editable)) continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
if (key && key[0]) bar_pane_exif_add_entry(ped, key, title, if_set,
editable);
Modified: trunk/src/bar_histogram.c
===================================================================
--- trunk/src/bar_histogram.c 2009-03-20 09:46:35 UTC (rev 1559)
+++ trunk/src/bar_histogram.c 2009-03-20 10:12:29 UTC (rev 1560)
@@ -391,7 +391,7 @@
if (READ_INT_FULL("histogram_channel", histogram_channel))
continue;
if (READ_INT_FULL("histogram_mode", histogram_mode)) continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
return bar_pane_histogram_new(title, height, expanded,
histogram_channel, histogram_mode);
Modified: trunk/src/bar_keywords.c
===================================================================
--- trunk/src/bar_keywords.c 2009-03-20 09:46:35 UTC (rev 1559)
+++ trunk/src/bar_keywords.c 2009-03-20 10:12:29 UTC (rev 1560)
@@ -1359,7 +1359,7 @@
if (READ_BOOL_FULL("pane.expanded", expanded)) continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
return bar_pane_keywords_new(title, key, expanded);
Modified: trunk/src/bar_sort.c
===================================================================
--- trunk/src/bar_sort.c 2009-03-20 09:46:35 UTC (rev 1559)
+++ trunk/src/bar_sort.c 2009-03-20 10:12:29 UTC (rev 1560)
@@ -701,7 +701,7 @@
if (READ_INT_CLAMP_FULL("selection", selection, 0,
BAR_SORT_SELECTION_COUNT - 1)) continue;
if (READ_CHAR_FULL("filter_key", filter_key)) continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
bar = bar_sort_new(lw, action, mode, selection, filter_key);
Modified: trunk/src/filefilter.c
===================================================================
--- trunk/src/filefilter.c 2009-03-20 09:46:35 UTC (rev 1559)
+++ trunk/src/filefilter.c 2009-03-20 10:12:29 UTC (rev 1560)
@@ -459,7 +459,7 @@
if (READ_BOOL(fe, writable)) continue;
if (READ_BOOL(fe, allow_sidecar)) continue;
- printf("unknown attribute %s = %s\n", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
if (fe.file_class >= FILE_FORMAT_CLASSES) fe.file_class =
FORMAT_CLASS_UNKNOWN;
Modified: trunk/src/layout.c
===================================================================
--- trunk/src/layout.c 2009-03-20 09:46:35 UTC (rev 1559)
+++ trunk/src/layout.c 2009-03-20 10:12:29 UTC (rev 1560)
@@ -2434,7 +2434,7 @@
if (READ_INT(*layout, image_overlay.histogram_channel))
continue;
if (READ_INT(*layout, image_overlay.histogram_mode)) continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
}
Modified: trunk/src/layout_util.c
===================================================================
--- trunk/src/layout_util.c 2009-03-20 09:46:35 UTC (rev 1559)
+++ trunk/src/layout_util.c 2009-03-20 10:12:29 UTC (rev 1560)
@@ -1875,7 +1875,7 @@
if (READ_CHAR_FULL("action", action)) continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
layout_toolbar_add(lw, action);
Modified: trunk/src/metadata.c
===================================================================
--- trunk/src/metadata.c 2009-03-20 09:46:35 UTC (rev 1559)
+++ trunk/src/metadata.c 2009-03-20 10:12:29 UTC (rev 1560)
@@ -1287,7 +1287,7 @@
if (READ_CHAR_FULL("name", name)) continue;
if (READ_BOOL_FULL("kw", is_kw)) continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
if (name && name[0])
{
Modified: trunk/src/rcfile.c
===================================================================
--- trunk/src/rcfile.c 2009-03-20 09:46:35 UTC (rev 1559)
+++ trunk/src/rcfile.c 2009-03-20 10:12:29 UTC (rev 1560)
@@ -721,7 +721,7 @@
if (READ_BOOL(*options, metadata.confirm_on_image_change))
continue;
if (READ_BOOL(*options, metadata.confirm_on_dir_change))
continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
return TRUE;
@@ -740,7 +740,7 @@
if (READ_INT(options->color_profile, screen_type)) continue;
if (READ_CHAR(options->color_profile, screen_file)) continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
}
@@ -756,9 +756,8 @@
if (READ_CHAR_FULL("input_file",
options->color_profile.input_file[i])) continue;
if (READ_CHAR_FULL("input_name",
options->color_profile.input_name[i])) continue;
-
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
i++;
options_parse_func_set_data(parser_data, GINT_TO_POINTER(i));
@@ -781,7 +780,7 @@
void options_parse_leaf(GQParserData *parser_data, GMarkupParseContext
*context, const gchar *element_name, const gchar **attribute_names, const gchar
**attribute_values, gpointer data, GError **error)
{
- DEBUG_1("unexpected: %s", element_name);
+ log_printf("unexpected: %s\n", element_name);
options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
}
@@ -794,7 +793,7 @@
}
else
{
- DEBUG_1("unexpected profile: %s", element_name);
+ log_printf("unexpected in <profile>: <%s>\n", element_name);
options_parse_func_push(parser_data, options_parse_leaf, NULL,
NULL);
}
}
@@ -808,7 +807,7 @@
}
else
{
- DEBUG_1("unexpected filter: %s", element_name);
+ log_printf("unexpected in <filter>: <%s>\n", element_name);
options_parse_func_push(parser_data, options_parse_leaf, NULL,
NULL);
}
}
@@ -836,7 +835,7 @@
}
else
{
- DEBUG_1("unexpected in <keyword>: <%s>", element_name);
+ log_printf("unexpected in <keyword>: <%s>\n", element_name);
options_parse_func_push(parser_data, options_parse_leaf, NULL,
NULL);
}
}
@@ -852,7 +851,7 @@
}
else
{
- DEBUG_1("unexpected in <keyword_tree>: <%s>", element_name);
+ log_printf("unexpected in <keyword_tree>: <%s>\n",
element_name);
options_parse_func_push(parser_data, options_parse_leaf, NULL,
NULL);
}
}
@@ -876,7 +875,7 @@
}
else
{
- DEBUG_1("unexpected global: %s", element_name);
+ log_printf("unexpected in <global>: <%s>\n", element_name);
options_parse_func_push(parser_data, options_parse_leaf, NULL,
NULL);
}
}
@@ -897,7 +896,7 @@
}
else
{
- DEBUG_1("unexpected in <pane_exif>: <%s>", element_name);
+ log_printf("unexpected in <pane_exif>: <%s>\n", element_name);
options_parse_func_push(parser_data, options_parse_leaf, NULL,
NULL);
}
}
@@ -931,7 +930,7 @@
}
else
{
- DEBUG_1("unexpected in <bar>: <%s>", element_name);
+ log_printf("unexpected in <bar>: <%s>\n", element_name);
options_parse_func_push(parser_data, options_parse_leaf, NULL,
NULL);
}
}
@@ -946,7 +945,7 @@
}
else
{
- DEBUG_1("unexpected in <toolbar>: <%s>", element_name);
+ log_printf("unexpected in <toolbar>: <%s>\n", element_name);
options_parse_func_push(parser_data, options_parse_leaf, NULL,
NULL);
}
}
@@ -973,7 +972,7 @@
}
else
{
- DEBUG_1("unexpected in <layout>: <%s>", element_name);
+ log_printf("unexpected in <layout>: <%s>\n", element_name);
options_parse_func_push(parser_data, options_parse_leaf, NULL,
NULL);
}
}
@@ -1007,7 +1006,7 @@
}
else
{
- DEBUG_1("unexpected in <toplevel>: <%s>", element_name);
+ log_printf("unexpected in <toplevel>: <%s>\n", element_name);
options_parse_func_push(parser_data, options_parse_leaf, NULL,
NULL);
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
