From 94e207777d9872177cdd31218c71defbca7985a8 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Thu, 19 Jun 2008 12:15:07 +0000 Subject: [PATCH] Use GdkModifierType instedd of guint, to avoid a gcc warning. 2008-06-19 Johan Dahlin * gtk/gtkactiongroup.c: Use GdkModifierType instedd of guint, to avoid a gcc warning. svn path=/trunk/; revision=20459 --- ChangeLog | 5 +++++ gtk/gtkactiongroup.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e71de94423..2473f6ffaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-06-19 Johan Dahlin + + * gtk/gtkactiongroup.c: Use GdkModifierType instedd of guint, + to avoid a gcc warning. + 2008-06-18 Olle Bergkvist http://bugzilla.gnome.org/show_bug.cgi?id=538784 - Don't change diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index f5eae00502..98db9a15f3 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -341,9 +341,9 @@ gtk_action_group_buildable_get_name (GtkBuildable *buildable) } typedef struct { - GObject *child; - guint key; - guint modifiers; + GObject *child; + guint key; + GdkModifierType modifiers; } AcceleratorParserData; static void @@ -356,7 +356,7 @@ accelerator_start_element (GMarkupParseContext *context, { gint i; guint key = 0; - gint modifiers = 0; + GdkModifierType modifiers = 0; AcceleratorParserData *parser_data = (AcceleratorParserData*)user_data; if (strcmp (element_name, "accelerator") != 0) @@ -382,7 +382,7 @@ accelerator_start_element (GMarkupParseContext *context, return; } parser_data->key = key; - parser_data->modifiers = (guint)modifiers; + parser_data->modifiers = modifiers; } static const GMarkupParser accelerator_parser =