gtk/gtkmain.c g_module_symbol takes a gpointer *, not just a gpointer.

2001-12-04  Manish Singh  <yosh@gimp.org>

        * gtk/gtkmain.c
        * gtk/queryimmodules.c: g_module_symbol takes a gpointer *, not just
        a gpointer.

        * gtk/gtkwidget.c (gtk_widget_push_composite_child): minor cosmetic
        correction to docs.

        * demos/gtk-demo/item_factory.c: add GTK_WINDOW() cast

11 files changed, 84 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index aeb804e0d2..d20b43a59e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-12-04  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkmain.c
+	* gtk/queryimmodules.c: g_module_symbol takes a gpointer *, not just
+        a gpointer.
+
+	* gtk/gtkwidget.c (gtk_widget_push_composite_child): minor cosmetic
+	correction to docs.
+
+	* demos/gtk-demo/item_factory.c: add GTK_WINDOW() cast
+
 2001-12-04  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): remove
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index aeb804e0d2..d20b43a59e 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+2001-12-04  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkmain.c
+	* gtk/queryimmodules.c: g_module_symbol takes a gpointer *, not just
+        a gpointer.
+
+	* gtk/gtkwidget.c (gtk_widget_push_composite_child): minor cosmetic
+	correction to docs.
+
+	* demos/gtk-demo/item_factory.c: add GTK_WINDOW() cast
+
 2001-12-04  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): remove
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index aeb804e0d2..d20b43a59e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+2001-12-04  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkmain.c
+	* gtk/queryimmodules.c: g_module_symbol takes a gpointer *, not just
+        a gpointer.
+
+	* gtk/gtkwidget.c (gtk_widget_push_composite_child): minor cosmetic
+	correction to docs.
+
+	* demos/gtk-demo/item_factory.c: add GTK_WINDOW() cast
+
 2001-12-04  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): remove
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index aeb804e0d2..d20b43a59e 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+2001-12-04  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkmain.c
+	* gtk/queryimmodules.c: g_module_symbol takes a gpointer *, not just
+        a gpointer.
+
+	* gtk/gtkwidget.c (gtk_widget_push_composite_child): minor cosmetic
+	correction to docs.
+
+	* demos/gtk-demo/item_factory.c: add GTK_WINDOW() cast
+
 2001-12-04  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): remove
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index aeb804e0d2..d20b43a59e 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+2001-12-04  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkmain.c
+	* gtk/queryimmodules.c: g_module_symbol takes a gpointer *, not just
+        a gpointer.
+
+	* gtk/gtkwidget.c (gtk_widget_push_composite_child): minor cosmetic
+	correction to docs.
+
+	* demos/gtk-demo/item_factory.c: add GTK_WINDOW() cast
+
 2001-12-04  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): remove
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index aeb804e0d2..d20b43a59e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+2001-12-04  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkmain.c
+	* gtk/queryimmodules.c: g_module_symbol takes a gpointer *, not just
+        a gpointer.
+
+	* gtk/gtkwidget.c (gtk_widget_push_composite_child): minor cosmetic
+	correction to docs.
+
+	* demos/gtk-demo/item_factory.c: add GTK_WINDOW() cast
+
 2001-12-04  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): remove
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index aeb804e0d2..d20b43a59e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+2001-12-04  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkmain.c
+	* gtk/queryimmodules.c: g_module_symbol takes a gpointer *, not just
+        a gpointer.
+
+	* gtk/gtkwidget.c (gtk_widget_push_composite_child): minor cosmetic
+	correction to docs.
+
+	* demos/gtk-demo/item_factory.c: add GTK_WINDOW() cast
+
 2001-12-04  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): remove
diff --git a/demos/gtk-demo/item_factory.c b/demos/gtk-demo/item_factory.c
index 390f4a75c3..7f4aa71604 100644
--- a/demos/gtk-demo/item_factory.c
+++ b/demos/gtk-demo/item_factory.c
@@ -68,7 +68,7 @@ do_item_factory (void)
       item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
       g_object_set_data_full (G_OBJECT (window), "<main>",
 			      item_factory, (GDestroyNotify) g_object_unref);
-      gtk_window_add_accel_group (window, accel_group);
+      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
       gtk_window_set_title (GTK_WINDOW (window), "Item Factory");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
       gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, NULL);
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 1279df02d9..897705fd17 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -368,7 +368,7 @@ load_module (GSList      *gtk_modules,
     {
       module = find_module (module_path, name);
       if (module &&
-	  g_module_symbol (module, "gtk_module_init", (gpointer*) &modinit_func) &&
+	  g_module_symbol (module, "gtk_module_init", (gpointer *) &modinit_func) &&
 	  modinit_func)
 	{
 	  if (!g_slist_find (gtk_modules, modinit_func))
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 30a391ad94..a3f24e4342 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5288,7 +5288,7 @@ gtk_widget_get_composite_name (GtkWidget *widget)
  *   scrolled_window->hscrollbar = gtk_hscrollbar_new (hadjustment);
  *   gtk_widget_set_composite_name (scrolled_window->hscrollbar, "hscrollbar");
  *   gtk_widget_pop_composite_child ();
-     gtk_widget_set_parent (scrolled_window->hscrollbar, 
+ *   gtk_widget_set_parent (scrolled_window->hscrollbar, 
  *                          GTK_WIDGET (scrolled_window));
  *   gtk_widget_ref (scrolled_window->hscrollbar);
  * </programlisting>
diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
index 0a0d3b72bd..45ca335ba6 100644
--- a/gtk/queryimmodules.c
+++ b/gtk/queryimmodules.c
@@ -76,10 +76,10 @@ query_module (const char *dir, const char *name)
     }
 	  
   if (module &&
-      g_module_symbol (module, "im_module_list", (gpointer)&list) &&
-      g_module_symbol (module, "im_module_init", (gpointer)&init) &&
-      g_module_symbol (module, "im_module_exit", (gpointer)&exit) &&
-      g_module_symbol (module, "im_module_create", (gpointer)&create))
+      g_module_symbol (module, "im_module_list", (gpointer *) &list) &&
+      g_module_symbol (module, "im_module_init", (gpointer *) &init) &&
+      g_module_symbol (module, "im_module_exit", (gpointer *) &exit) &&
+      g_module_symbol (module, "im_module_create", (gpointer *) &create))
     {
       const GtkIMContextInfo **contexts;
       guint n_contexts;