summaryrefslogtreecommitdiff
path: root/src/lib/efreet/efreet_menu.c
diff options
context:
space:
mode:
authorSebastian Dransfeld <sd@tango.flipp.net>2014-09-29 09:39:17 +0200
committerSebastian Dransfeld <sd@tango.flipp.net>2014-09-29 09:39:38 +0200
commitb624345bbd577cfee7746abef0cb0595dbd9b72b (patch)
tree77aa2bfecdc50d4572aee722d407efcf7bccf6f1 /src/lib/efreet/efreet_menu.c
parentd8aead7ab825eaca1bb3dda20946968f4b8680f3 (diff)
efreet: improve messages
Diffstat (limited to 'src/lib/efreet/efreet_menu.c')
-rw-r--r--src/lib/efreet/efreet_menu.c42
1 files changed, 26 insertions, 16 deletions
diff --git a/src/lib/efreet/efreet_menu.c b/src/lib/efreet/efreet_menu.c
index 0bd69eb4ca..ada789b7e0 100644
--- a/src/lib/efreet/efreet_menu.c
+++ b/src/lib/efreet/efreet_menu.c
@@ -625,7 +625,7 @@ efreet_menu_parse(const char *path)
625 /* make sure we've got a <Menu> to start with */ 625 /* make sure we've got a <Menu> to start with */
626 if (xml->tag != efreet_tag_menu) 626 if (xml->tag != efreet_tag_menu)
627 { 627 {
628 WRN("Efreet_menu: Menu file didn't start with <Menu> tag."); 628 WRN("Menu file didn't start with <Menu> tag: '%s'", path);
629 efreet_xml_del(xml); 629 efreet_xml_del(xml);
630 return NULL; 630 return NULL;
631 } 631 }
@@ -875,7 +875,7 @@ efreet_menu_handle_menu(Efreet_Menu_Internal *internal, Efreet_Xml *xml)
875 } 875 }
876 else 876 else
877 { 877 {
878 WRN("Unknown XML tag: %s", child->tag); 878 WRN("Unknown XML tag '%s' in file '%s/%s'", child->tag, internal->file.path, internal->file.name);
879 return 0; 879 return 0;
880 } 880 }
881 } 881 }
@@ -1068,7 +1068,7 @@ efreet_menu_handle_name(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
1068 /* not allowed to have two Name settings in a menu */ 1068 /* not allowed to have two Name settings in a menu */
1069 if (parent->name.internal) 1069 if (parent->name.internal)
1070 { 1070 {
1071 INF("efreet_menu_handle_name() setting second name into menu"); 1071 INF("efreet_menu_handle_name() setting second name into menu: '%s/%s'", parent->file.path, parent->file.name);
1072 return 0; 1072 return 0;
1073 } 1073 }
1074 /* ignore the name if it is empty */ 1074 /* ignore the name if it is empty */
@@ -1351,7 +1351,7 @@ efreet_menu_handle_merge_file(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
1351 1351
1352 if (!parent->file.path) 1352 if (!parent->file.path)
1353 { 1353 {
1354 INF("efreet_menu_handle_merge_file() missing menu path ..."); 1354 INF("efreet_menu_handle_merge_file() missing menu path ... '%s'", parent->file.name);
1355 return 0; 1355 return 0;
1356 } 1356 }
1357 1357
@@ -1443,7 +1443,7 @@ efreet_menu_merge(Efreet_Menu_Internal *parent, Efreet_Xml *xml, const char *pat
1443 if (!merge_xml) 1443 if (!merge_xml)
1444 { 1444 {
1445 INF("efreet_menu_merge() failed to read in the " 1445 INF("efreet_menu_merge() failed to read in the "
1446 "merge file (%s)", path); 1446 "merge file '%s'", path);
1447 return 0; 1447 return 0;
1448 } 1448 }
1449 1449
@@ -1855,7 +1855,8 @@ efreet_menu_handle_move(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
1855 else 1855 else
1856 { 1856 {
1857 INF("efreet_menu_handle_move() unknown tag found " 1857 INF("efreet_menu_handle_move() unknown tag found "
1858 "in Move (%s)", child->tag); 1858 "in Move '%s' in file '%s/%s'", child->tag,
1859 parent->file.path, parent->file.name);
1859 return 0; 1860 return 0;
1860 } 1861 }
1861 } 1862 }
@@ -1882,7 +1883,8 @@ efreet_menu_handle_old(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
1882 if (parent->current_move) 1883 if (parent->current_move)
1883 { 1884 {
1884 INF("efreet_menu_handle_old() saw second <Old> " 1885 INF("efreet_menu_handle_old() saw second <Old> "
1885 "before seeing <New>"); 1886 "before seeing <New> in file '%s/%s'",
1887 parent->file.path, parent->file.name);
1886 return 0; 1888 return 0;
1887 } 1889 }
1888 1890
@@ -1922,7 +1924,8 @@ efreet_menu_handle_new(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
1922 1924
1923 if (!parent->current_move) 1925 if (!parent->current_move)
1924 { 1926 {
1925 INF("efreet_menu_handle_new() saw New before seeing Old"); 1927 INF("efreet_menu_handle_new() saw New before seeing Old in '%s/%s'",
1928 parent->file.path, parent->file.name);
1926 return 0; 1929 return 0;
1927 } 1930 }
1928 1931
@@ -1965,7 +1968,8 @@ efreet_menu_handle_layout(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
1965 else 1968 else
1966 { 1969 {
1967 INF("efreet_menu_handle_move() unknown tag found " 1970 INF("efreet_menu_handle_move() unknown tag found "
1968 "in Layout (%s)", child->tag); 1971 "in Layout '%s' in file '%s/%s'", child->tag,
1972 parent->file.path, parent->file.name);
1969 return 0; 1973 return 0;
1970 } 1974 }
1971 } 1975 }
@@ -2022,7 +2026,8 @@ efreet_menu_handle_default_layout(Efreet_Menu_Internal *parent, Efreet_Xml *xml)
2022 else 2026 else
2023 { 2027 {
2024 INF("efreet_menu_handle_move() unknown tag found in " 2028 INF("efreet_menu_handle_move() unknown tag found in "
2025 "DefaultLayout (%s)", child->tag); 2029 "DefaultLayout '%s' in file '%s/%s'", child->tag,
2030 parent->file.path, parent->file.name);
2026 return 0; 2031 return 0;
2027 } 2032 }
2028 } 2033 }
@@ -2041,7 +2046,8 @@ efreet_menu_handle_layout_menuname(Efreet_Menu_Internal *parent, Efreet_Xml *xml
2041 if (!xml->text) 2046 if (!xml->text)
2042 { 2047 {
2043 INF("efreet_menu_handle_layout_menuname() The Menuname tag in " 2048 INF("efreet_menu_handle_layout_menuname() The Menuname tag in "
2044 "layout needs a filename."); 2049 "layout needs a filename in file '%s/%s'",
2050 parent->file.path, parent->file.name);
2045 return 0; 2051 return 0;
2046 } 2052 }
2047 2053
@@ -2080,7 +2086,8 @@ efreet_menu_handle_layout_filename(Efreet_Menu_Internal *parent, Efreet_Xml *xml
2080 if (!xml->text) 2086 if (!xml->text)
2081 { 2087 {
2082 INF("efreet_menu_handle_layout_filename() The Filename tag in " 2088 INF("efreet_menu_handle_layout_filename() The Filename tag in "
2083 "layout needs a filename."); 2089 "layout needs a filename in file '%s/%s'",
2090 parent->file.path, parent->file.name);
2084 return 0; 2091 return 0;
2085 } 2092 }
2086 2093
@@ -2122,14 +2129,16 @@ efreet_menu_handle_layout_merge(Efreet_Menu_Internal *parent, Efreet_Xml *xml, i
2122 if (!attr) 2129 if (!attr)
2123 { 2130 {
2124 INF("efreet_menu_handle_layout_merge() The Merge tag in layout " 2131 INF("efreet_menu_handle_layout_merge() The Merge tag in layout "
2125 "needs a type attribute."); 2132 "needs a type attribute in file '%s/%s'",
2133 parent->file.path, parent->file.name);
2126 return 0; 2134 return 0;
2127 } 2135 }
2128 2136
2129 if (strcmp(attr, "files") && strcmp(attr, "menus") && strcmp(attr, "all")) 2137 if (strcmp(attr, "files") && strcmp(attr, "menus") && strcmp(attr, "all"))
2130 { 2138 {
2131 INF("efreet_menu_handle_layout_merge() The type attribute for " 2139 INF("efreet_menu_handle_layout_merge() The type attribute for "
2132 "the Merge tag contains an unknown value (%s).", attr); 2140 "the Merge tag contains an unknown value '%s' in file '%s/%s'",
2141 attr, parent->file.path, parent->file.name);
2133 return 0; 2142 return 0;
2134 } 2143 }
2135 2144
@@ -2201,7 +2210,8 @@ efreet_menu_handle_filter_op(Efreet_Menu_Filter_Op *op, Efreet_Xml *xml)
2201 } 2210 }
2202 else 2211 else
2203 { 2212 {
2204 INF("efreet_menu_handle_filter_op() unknown tag in filter (%s)", child->tag); 2213 INF("efreet_menu_handle_filter_op() unknown tag in filter '%s'",
2214 child->tag);
2205 return 0; 2215 return 0;
2206 } 2216 }
2207 } 2217 }
@@ -3152,7 +3162,7 @@ efreet_menu_path_get(Efreet_Menu_Internal *internal, const char *suffix)
3152 { 3162 {
3153 if (!internal->file.path) 3163 if (!internal->file.path)
3154 { 3164 {
3155 INF("efreet_menu_handle_app_dir() missing menu path ..."); 3165 INF("efreet_menu_handle_app_dir() missing menu path ... '%s'", internal->file.name);
3156 return NULL; 3166 return NULL;
3157 } 3167 }
3158 snprintf(path, sizeof(path), "%s/%s", internal->file.path, suffix); 3168 snprintf(path, sizeof(path), "%s/%s", internal->file.path, suffix);