From 3e3322608c44650d6f85a466977a171e760e6319 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 28 Nov 2001 23:54:30 +0000 Subject: [PATCH] Rename 'id' parameter to avoid problems with Objective C. Wed Nov 28 18:37:04 2001 Owen Taylor * gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter to avoid problems with Objective C. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtksocket.c | 6 +++--- gtk/gtksocket.h | 2 +- 9 files changed, 39 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12fabcc80c..b3269cab8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 28 18:37:04 2001 Owen Taylor + + * gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter + to avoid problems with Objective C. + 2001-11-28 Matthias Clasen * gtk/gtkaccelmap.c: Typo fixes. (#65607) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 12fabcc80c..b3269cab8e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Wed Nov 28 18:37:04 2001 Owen Taylor + + * gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter + to avoid problems with Objective C. + 2001-11-28 Matthias Clasen * gtk/gtkaccelmap.c: Typo fixes. (#65607) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 12fabcc80c..b3269cab8e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Nov 28 18:37:04 2001 Owen Taylor + + * gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter + to avoid problems with Objective C. + 2001-11-28 Matthias Clasen * gtk/gtkaccelmap.c: Typo fixes. (#65607) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 12fabcc80c..b3269cab8e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Nov 28 18:37:04 2001 Owen Taylor + + * gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter + to avoid problems with Objective C. + 2001-11-28 Matthias Clasen * gtk/gtkaccelmap.c: Typo fixes. (#65607) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 12fabcc80c..b3269cab8e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Nov 28 18:37:04 2001 Owen Taylor + + * gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter + to avoid problems with Objective C. + 2001-11-28 Matthias Clasen * gtk/gtkaccelmap.c: Typo fixes. (#65607) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 12fabcc80c..b3269cab8e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Nov 28 18:37:04 2001 Owen Taylor + + * gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter + to avoid problems with Objective C. + 2001-11-28 Matthias Clasen * gtk/gtkaccelmap.c: Typo fixes. (#65607) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 12fabcc80c..b3269cab8e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Nov 28 18:37:04 2001 Owen Taylor + + * gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter + to avoid problems with Objective C. + 2001-11-28 Matthias Clasen * gtk/gtkaccelmap.c: Typo fixes. (#65607) 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); } /** diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h index 842acb605d..246a70fbba 100644 --- a/gtk/gtksocket.h +++ b/gtk/gtksocket.h @@ -80,7 +80,7 @@ GtkWidget* gtk_socket_new (void); GtkType gtk_socket_get_type (void) G_GNUC_CONST; void gtk_socket_add_id (GtkSocket *socket, - GdkNativeWindow id); + GdkNativeWindow window_id); GdkNativeWindow gtk_socket_get_id (GtkSocket *socket); #ifndef GTK_DISABLE_DEPRECATED