since GtkIMContext derives directly from GObject now, we have to use the

Fri Oct 19 18:35:22 2001  Manish Singh  <yosh@gimp.org>

        * gtk/{gtkentry.c,gtktextview.c}: since GtkIMContext derives directly
        from GObject now, we have to use the g_object_* functions, not
        gtk_object_*.

diff --git a/ChangeLog b/ChangeLog
index e325efd768207ad2740cab005cd5d93789803057..d421fd7f41072e7fff1b635f7c61ca5963de3e2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 19 18:35:22 2001  Manish Singh  <yosh@gimp.org>
+
+       * gtk/{gtkentry.c,gtktextview.c}: since GtkIMContext derives directly
+       from GObject now, we have to use the g_object_* functions, not
+       gtk_object_*.
+
 Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodelsort.[ch]: we probably have rows_reordered

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e325efd768207ad2740cab005cd5d93789803057..d421fd7f41072e7fff1b635f7c61ca5963de3e2d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Oct 19 18:35:22 2001  Manish Singh  <yosh@gimp.org>
+
+       * gtk/{gtkentry.c,gtktextview.c}: since GtkIMContext derives directly
+       from GObject now, we have to use the g_object_* functions, not
+       gtk_object_*.
+
 Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodelsort.[ch]: we probably have rows_reordered

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e325efd768207ad2740cab005cd5d93789803057..d421fd7f41072e7fff1b635f7c61ca5963de3e2d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Oct 19 18:35:22 2001  Manish Singh  <yosh@gimp.org>
+
+       * gtk/{gtkentry.c,gtktextview.c}: since GtkIMContext derives directly
+       from GObject now, we have to use the g_object_* functions, not
+       gtk_object_*.
+
 Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodelsort.[ch]: we probably have rows_reordered

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e325efd768207ad2740cab005cd5d93789803057..d421fd7f41072e7fff1b635f7c61ca5963de3e2d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Oct 19 18:35:22 2001  Manish Singh  <yosh@gimp.org>
+
+       * gtk/{gtkentry.c,gtktextview.c}: since GtkIMContext derives directly
+       from GObject now, we have to use the g_object_* functions, not
+       gtk_object_*.
+
 Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodelsort.[ch]: we probably have rows_reordered

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e325efd768207ad2740cab005cd5d93789803057..d421fd7f41072e7fff1b635f7c61ca5963de3e2d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Oct 19 18:35:22 2001  Manish Singh  <yosh@gimp.org>
+
+       * gtk/{gtkentry.c,gtktextview.c}: since GtkIMContext derives directly
+       from GObject now, we have to use the g_object_* functions, not
+       gtk_object_*.
+
 Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodelsort.[ch]: we probably have rows_reordered

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e325efd768207ad2740cab005cd5d93789803057..d421fd7f41072e7fff1b635f7c61ca5963de3e2d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Oct 19 18:35:22 2001  Manish Singh  <yosh@gimp.org>
+
+       * gtk/{gtkentry.c,gtktextview.c}: since GtkIMContext derives directly
+       from GObject now, we have to use the g_object_* functions, not
+       gtk_object_*.
+
 Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodelsort.[ch]: we probably have rows_reordered

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e325efd768207ad2740cab005cd5d93789803057..d421fd7f41072e7fff1b635f7c61ca5963de3e2d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Oct 19 18:35:22 2001  Manish Singh  <yosh@gimp.org>
+
+       * gtk/{gtkentry.c,gtktextview.c}: since GtkIMContext derives directly
+       from GObject now, we have to use the g_object_* functions, not
+       gtk_object_*.
+
 Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
 
        * gtk/gtktreemodelsort.[ch]: we probably have rows_reordered

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index bebc072516af25430cfab2734ed09f82108cbc5d..dfbcb4ac9b4e94e8ff575afcea24fc6ddd58324f 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -903,10 +903,10 @@ gtk_entry_init (GtkEntry *entry)
    */
   entry->im_context = gtk_im_multicontext_new ();
   
-  gtk_signal_connect (GTK_OBJECT (entry->im_context), "commit",
-                     GTK_SIGNAL_FUNC (gtk_entry_commit_cb), entry);
-  gtk_signal_connect (GTK_OBJECT (entry->im_context), "preedit_changed",
-                     GTK_SIGNAL_FUNC (gtk_entry_preedit_changed_cb), entry);
+  g_signal_connect (G_OBJECT (entry->im_context), "commit",
+                   G_CALLBACK (gtk_entry_commit_cb), entry);
+  g_signal_connect (G_OBJECT (entry->im_context), "preedit_changed",
+                   G_CALLBACK (gtk_entry_preedit_changed_cb), entry);
 }
 
 static void
@@ -921,7 +921,7 @@ gtk_entry_finalize (GObject *object)
   if (entry->cached_layout)
     g_object_unref (G_OBJECT (entry->cached_layout));
 
-  gtk_object_unref (GTK_OBJECT (entry->im_context));
+  g_object_unref (G_OBJECT (entry->im_context));
 
   if (entry->blink_timeout)
     g_source_remove (entry->blink_timeout);

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 43613bd44894dd5525b1ffbb2a1d5b5baa5dc111..635368757a2095490c72632023b48792d341c41c 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -967,11 +967,11 @@ gtk_text_view_init (GtkTextView *text_view)
    */
   text_view->im_context = gtk_im_multicontext_new ();
 
-  gtk_signal_connect (GTK_OBJECT (text_view->im_context), "commit",
-                      GTK_SIGNAL_FUNC (gtk_text_view_commit_handler), text_view);
+  g_signal_connect (G_OBJECT (text_view->im_context), "commit",
+                    G_CALLBACK (gtk_text_view_commit_handler), text_view);
 
-  gtk_signal_connect (GTK_OBJECT (text_view->im_context), "preedit_changed",
-                     GTK_SIGNAL_FUNC (gtk_text_view_preedit_changed_handler), text_view);
+  g_signal_connect (G_OBJECT (text_view->im_context), "preedit_changed",
+                   G_CALLBACK (gtk_text_view_preedit_changed_handler), text_view);
 
   text_view->cursor_visible = TRUE;