[gtk+] Fix a shadowed variable and a few other compiler warnings
- From: Matthias Clasen <matthiasc src gnome org>
- To: svn-commits-list gnome org
- Subject: [gtk+] Fix a shadowed variable and a few other compiler warnings
- Date: Sun, 3 May 2009 12:26:02 -0400 (EDT)
commit 6e51533ec30e3745825656db028490fa18cb6105
Author: Matthias Clasen <mclasen redhat com>
Date: Sat May 2 20:20:04 2009 -0400
Fix a shadowed variable and a few other compiler warnings
---
gtk/gtkwidget.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index c15da47..16fdc2b 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -8181,7 +8181,7 @@ _gtk_widget_is_pointer_widget (GtkWidget *widget)
win = _gtk_widget_get_pointer_window (widget);
if (win)
{
- gdk_window_get_user_data (win, &wid);
+ gdk_window_get_user_data (win, (gpointer *)&wid);
if (wid == widget)
return TRUE;
}
@@ -9627,9 +9627,9 @@ accessibility_start_element (GMarkupParseContext *context,
}
else if (strcmp (element_name, "action") == 0)
{
- gchar *action_name = NULL;
- gchar *description = NULL;
- gchar *context = NULL;
+ const gchar *action_name = NULL;
+ const gchar *description = NULL;
+ const gchar *msg_context = NULL;
gboolean translatable = FALSE;
AtkActionData *action;
@@ -9649,7 +9649,7 @@ accessibility_start_element (GMarkupParseContext *context,
/* do nothing, comments are for translators */
}
else if (strcmp (names[i], "context") == 0)
- context = values[i];
+ msg_context = values[i];
else
{
g_markup_parse_context_get_position (context,
@@ -9683,7 +9683,7 @@ accessibility_start_element (GMarkupParseContext *context,
action = g_slice_new (AtkActionData);
action->action_name = g_strdup (action_name);
action->description = g_string_new (description);
- action->context = g_strdup (context);
+ action->context = g_strdup (msg_context);
action->translatable = translatable;
data->actions = g_slist_prepend (data->actions, action);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]