summaryrefslogtreecommitdiff
path: root/libmenu/menu-layout.c
diff options
context:
space:
mode:
Diffstat (limited to 'libmenu/menu-layout.c')
-rw-r--r--libmenu/menu-layout.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libmenu/menu-layout.c b/libmenu/menu-layout.c
index 93ee6db..fd5c830 100644
--- a/libmenu/menu-layout.c
+++ b/libmenu/menu-layout.c
@@ -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;
}
}
@@ -1142,7 +1142,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);
@@ -1183,7 +1183,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,
...)
@@ -2174,7 +2174,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;
@@ -2354,7 +2354,7 @@ menu_layout_load (const char *filename,
error = NULL;
if (!g_markup_parse_context_parse (context,
text,
- length,
+ (gssize) length,
&error))
goto out;