From: Alberto Garcia <agarcia@igalia.com>
Date: Fri, 15 Oct 2010 18:46:22 +0000 (-0400)
Subject: Make gtk_accelerator_get_default_mod_mask() return a GdkModifierType
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=8d05e742120cb0d74f0b3bc9f7bc4a641169df26;p=~andy%2Fgtk

Make gtk_accelerator_get_default_mod_mask() return a GdkModifierType

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=313350
---

diff --git a/docs/reference/gtk/migrating-checklist.sgml b/docs/reference/gtk/migrating-checklist.sgml
index 8b5a58a6c..6acf903be 100644
--- a/docs/reference/gtk/migrating-checklist.sgml
+++ b/docs/reference/gtk/migrating-checklist.sgml
@@ -265,7 +265,7 @@ my_widget_expose_event_handler (GtkWidget *widget, GdkEventExpose *event)
 static gboolean
 my_widget_key_press_event_handler (GtkWidget *widget, GdkEventKey *event)
 {
-  guint modifiers;
+  GdkModifierType modifiers;
 
   modifiers = gtk_accelerator_get_default_mod_mask (<!-- -->);
 
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index e9bbffee1..39c63989e 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -1461,7 +1461,7 @@ gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask)
  *
  * Gets the value set by gtk_accelerator_set_default_mod_mask().
  */
-guint
+GdkModifierType
 gtk_accelerator_get_default_mod_mask (void)
 {
   return default_accel_mod_mask;
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index b00b03920..5efe4fa87 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -168,7 +168,8 @@ gchar*	 gtk_accelerator_name		      (guint	        accelerator_key,
 gchar*   gtk_accelerator_get_label            (guint           accelerator_key,
                                                GdkModifierType accelerator_mods);
 void	 gtk_accelerator_set_default_mod_mask (GdkModifierType  default_mod_mask);
-guint	 gtk_accelerator_get_default_mod_mask (void);
+GdkModifierType
+	 gtk_accelerator_get_default_mod_mask (void);
 
 
 /* --- internal --- */