[gtk+] xembed: Fix compiler warnings
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] xembed: Fix compiler warnings
- Date: Tue, 2 Jun 2015 13:12:06 +0000 (UTC)
commit cd8a50ef11a25771a88829e66c0f62fa51ce2c5b
Author: Matthias Clasen <mclasen redhat com>
Date: Sat May 30 21:30:40 2015 -0400
xembed: Fix compiler warnings
Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
gtk/gtkxembed.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkxembed.c b/gtk/gtkxembed.c
index 97d3606..8634d66 100644
--- a/gtk/gtkxembed.c
+++ b/gtk/gtkxembed.c
@@ -172,7 +172,7 @@ _gtk_xembed_send_message (GdkWindow *recipient,
* _gtk_xembed_send_focus_message:
* @recipient: (allow-none): window to which to send the window, or %NULL
* in which case nothing will be sent
- * @message: type of message
+ * @message_type: type of message
* @detail: detail field of message
*
* Sends a XEMBED message for moving the focus along the focus
@@ -181,19 +181,19 @@ _gtk_xembed_send_message (GdkWindow *recipient,
**/
void
_gtk_xembed_send_focus_message (GdkWindow *recipient,
- XEmbedMessageType message,
+ XEmbedMessageType message_type,
glong detail)
{
gulong flags = 0;
if (!recipient)
return;
-
+
g_return_if_fail (GDK_IS_WINDOW (recipient));
- g_return_if_fail (message == XEMBED_FOCUS_IN ||
- message == XEMBED_FOCUS_NEXT ||
- message == XEMBED_FOCUS_PREV);
-
+ g_return_if_fail (message_type == XEMBED_FOCUS_IN ||
+ message_type == XEMBED_FOCUS_NEXT ||
+ message_type == XEMBED_FOCUS_PREV);
+
if (current_messages)
{
GtkXEmbedMessage *message = current_messages->data;
@@ -209,7 +209,7 @@ _gtk_xembed_send_focus_message (GdkWindow *recipient,
}
}
- _gtk_xembed_send_message (recipient, message, detail, flags, 0);
+ _gtk_xembed_send_message (recipient, message_type, detail, flags, 0);
}
const char *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]