Commit cd8a50ef authored by Matthias Clasen's avatar Matthias Clasen

xembed: Fix compiler warnings

Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
parent b9919153
...@@ -172,7 +172,7 @@ _gtk_xembed_send_message (GdkWindow *recipient, ...@@ -172,7 +172,7 @@ _gtk_xembed_send_message (GdkWindow *recipient,
* _gtk_xembed_send_focus_message: * _gtk_xembed_send_focus_message:
* @recipient: (allow-none): window to which to send the window, or %NULL * @recipient: (allow-none): window to which to send the window, or %NULL
* in which case nothing will be sent * in which case nothing will be sent
* @message: type of message * @message_type: type of message
* @detail: detail field of message * @detail: detail field of message
* *
* Sends a XEMBED message for moving the focus along the focus * Sends a XEMBED message for moving the focus along the focus
...@@ -181,19 +181,19 @@ _gtk_xembed_send_message (GdkWindow *recipient, ...@@ -181,19 +181,19 @@ _gtk_xembed_send_message (GdkWindow *recipient,
**/ **/
void void
_gtk_xembed_send_focus_message (GdkWindow *recipient, _gtk_xembed_send_focus_message (GdkWindow *recipient,
XEmbedMessageType message, XEmbedMessageType message_type,
glong detail) glong detail)
{ {
gulong flags = 0; gulong flags = 0;
if (!recipient) if (!recipient)
return; return;
g_return_if_fail (GDK_IS_WINDOW (recipient)); g_return_if_fail (GDK_IS_WINDOW (recipient));
g_return_if_fail (message == XEMBED_FOCUS_IN || g_return_if_fail (message_type == XEMBED_FOCUS_IN ||
message == XEMBED_FOCUS_NEXT || message_type == XEMBED_FOCUS_NEXT ||
message == XEMBED_FOCUS_PREV); message_type == XEMBED_FOCUS_PREV);
if (current_messages) if (current_messages)
{ {
GtkXEmbedMessage *message = current_messages->data; GtkXEmbedMessage *message = current_messages->data;
...@@ -209,7 +209,7 @@ _gtk_xembed_send_focus_message (GdkWindow *recipient, ...@@ -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 * const char *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment