1 files changed, 12 insertions, 11 deletions
diff --git a/libmenu/menu-layout.c b/libmenu/menu-layout.c
index 93ee6db..f51ef24 100644
--- a/libmenu/menu-layout.c
+++ b/libmenu/menu-layout.c
@@ -2,6 +2,7 @@
 
 /*
 * Copyright (C) 2002 - 2004 Red Hat, Inc.
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -120,7 +121,6 @@ typedef struct
 gpointer user_data;
 } MenuLayoutNodeEntriesMonitor;
 
-
 static inline MenuLayoutNode *
 node_next (MenuLayoutNode *node)
 {
@@ -998,12 +998,12 @@ menu_layout_values_set (MenuLayoutValues *values,
 if (inline_limit != NULL)
 {
 char *end;
- int limit;
+ unsigned long limit;
 
- limit = strtol (inline_limit, &end, 10);
+ limit = strtoul (inline_limit, &end, 10);
 if (*end == '\0')
 {
- values->inline_limit = limit;
+ values->inline_limit = (guint) limit;
 values->mask |= MENU_LAYOUT_VALUES_INLINE_LIMIT;
 }
 }
@@ -1129,7 +1129,6 @@ menu_layout_node_root_remove_entries_monitor (MenuLayoutNode *
 }
 }
 
-
 /*
 * Menu file parsing
 */
@@ -1142,7 +1141,7 @@ typedef struct
 
 static void set_error (GError **err,
 GMarkupParseContext *context,
- int error_domain,
+ GQuark error_domain,
 int error_code,
 const char *format,
 ...) G_GNUC_PRINTF (5, 6);
@@ -1171,7 +1170,6 @@ static void passthrough_handler (GMarkupParseContext *context,
 gpointer user_data,
 GError **error);
 
-
 static GMarkupParser menu_funcs = {
 start_element_handler,
 end_element_handler,
@@ -1183,7 +1181,7 @@ static GMarkupParser menu_funcs = {
 static void
 set_error (GError **err,
 GMarkupParseContext *context,
- int error_domain,
+ GQuark error_domain,
 int error_code,
 const char *format,
 ...)
@@ -1582,7 +1580,6 @@ start_matching_rule_element (MenuParser *parser,
 error))
 return;
 
-
 if (ELEMENT_IS ("Filename"))
 {
 push_node (parser, MENU_LAYOUT_NODE_FILENAME);
@@ -2166,6 +2163,8 @@ end_element_handler (GMarkupParseContext *context,
 if (!fixup_move_node (context, parser, parser->stack_top, error))
 goto out;
 break;
+ default:
+ g_assert_not_reached();
 }
 
 out:
@@ -2174,7 +2173,7 @@ end_element_handler (GMarkupParseContext *context,
 
 static gboolean
 all_whitespace (const char *text,
- int text_len)
+ gsize text_len)
 {
 const char *p;
 const char *end;
@@ -2251,6 +2250,8 @@ text_handler (GMarkupParseContext *context,
 g_markup_parse_context_get_element (context));
 }
 break;
+ default:
+ g_assert_not_reached();
 }
 
 add_context_to_error (error, context);
@@ -2354,7 +2355,7 @@ menu_layout_load (const char *filename,
 error = NULL;
 if (!g_markup_parse_context_parse (context,
 text,
- length,
+ (gssize) length,
 &error))
 goto out;