diff options
author | Owen Taylor <otaylor@redhat.com> | 2001-11-28 23:54:30 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2001-11-28 23:54:30 +0000 |
commit | 3e3322608c44650d6f85a466977a171e760e6319 (patch) | |
tree | 8298e306e4b780b078bc4f61c867456a74472db1 /gtk/gtksocket.c | |
parent | a381648faac7e9930d6fbb0535e955beb1458cf5 (diff) | |
download | gtk+-3e3322608c44650d6f85a466977a171e760e6319.tar.gz |
Rename 'id' parameter to avoid problems with Objective C.
Wed Nov 28 18:37:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter
to avoid problems with Objective C.
Diffstat (limited to 'gtk/gtksocket.c')
-rw-r--r-- | gtk/gtksocket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index c7c8f81350..5753dc9a28 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -232,7 +232,7 @@ gtk_socket_steal (GtkSocket *socket, GdkNativeWindow wid) /** * gtk_socket_add_id: * @socket: a #GtkSocket - * @id: the XID of a client participating in the XEMBED protocol. + * @window_id: the XID of a client participating in the XEMBED protocol. * * Adds an XEMBED client, such as a #GtkPlug, to the #GtkSocket. The * client may be in the same process or in a different process. @@ -248,7 +248,7 @@ gtk_socket_steal (GtkSocket *socket, GdkNativeWindow wid) * before you can make this call. **/ void -gtk_socket_add_id (GtkSocket *socket, GdkNativeWindow id) +gtk_socket_add_id (GtkSocket *socket, GdkNativeWindow window_id) { g_return_if_fail (GTK_IS_SOCKET (socket)); g_return_if_fail (GTK_WIDGET_ANCHORED (socket)); @@ -256,7 +256,7 @@ gtk_socket_add_id (GtkSocket *socket, GdkNativeWindow id) if (!GTK_WIDGET_REALIZED (socket)) gtk_widget_realize (GTK_WIDGET (socket)); - gtk_socket_add_window (socket, id, TRUE); + gtk_socket_add_window (socket, window_id, TRUE); } /** |