summaryrefslogtreecommitdiff
path: root/gtk/gtkaccelmap.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-08-05 19:28:56 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-08-05 19:28:56 +0000
commite8468d5e6d5d76d0068d4800f951a52cf6390a27 (patch)
treeccb021144786818ed8d4abac07f5b19210afb91e /gtk/gtkaccelmap.c
parent1f8ad87b9f9d908869227f56df60af8d96c4c865 (diff)
downloadgtk+-e8468d5e6d5d76d0068d4800f951a52cf6390a27.tar.gz
Fix problem with wrong depth being used. (#89941, Jacob Berkman.) Remove
Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com> * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): Fix problem with wrong depth being used. (#89941, Jacob Berkman.) Remove an unneeded 'screen' variable. Mon Aug 5 15:04:59 2002 Owen Taylor <otaylor@redhat.com> More fixes for warnings reported by David L. Cooper II * gtk/gtkaccelmap.c (accel_map_parse_accel_path): Use GdkModifierType for accel_mods. (#85856) * gdk/gdkdisplay.h (struct _GdkDisplay): Make button_number signed, since we use -1 as an 'unset' value. (#85854) * gdk/x11/xsettings-client.c (parse_settings): Suppress a warning (#85853) * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Fix accidental trailing ';'. (#85846)
Diffstat (limited to 'gtk/gtkaccelmap.c')
-rw-r--r--gtk/gtkaccelmap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index 3c1058047b..5dd21c04ed 100644
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -407,7 +407,8 @@ gtk_accel_map_change_entry (const gchar *accel_path,
static guint
accel_map_parse_accel_path (GScanner *scanner)
{
- guint accel_key = 0, accel_mods = 0;
+ guint accel_key = 0;
+ GdkModifierType accel_mods = 0;
gchar *path, *accel;
/* parse accel path */