Use GdkModifierType instedd of guint, to avoid a gcc warning.

2008-06-19  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtkactiongroup.c: Use GdkModifierType instedd of guint,
    to avoid a gcc warning.

svn path=/trunk/; revision=20459

diff --git a/ChangeLog b/ChangeLog
index e71de94423cd531c76b253a7529c347db98abe84..2473f6ffafa4a8d9173c9d3d7dbeb8ef6cf43348 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-19  Johan Dahlin  <jdahlin@async.com.br>
+
+       * gtk/gtkactiongroup.c: Use GdkModifierType instedd of guint,
+       to avoid a gcc warning.
+
 2008-06-18  Olle Bergkvist <olle.bergkvist@yahoo.se>
 
        http://bugzilla.gnome.org/show_bug.cgi?id=538784 - Don't change

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index f5eae0050285f6c004a87e0b7d49274a50ee1a0c..98db9a15f373b985c82a759a591c0aed8b0e5c48 100644 (file)
--- 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 =