modules/engines/ms-windows/msw_rc_style.c

Fri Nov 19 15:18:51 2004  Manish Singh  <yosh@gimp.org>

        * modules/engines/ms-windows/msw_rc_style.c
        * modules/engines/ms-windows/msw_style.c
        * modules/engines/ms-windows/msw_theme_main.c
        * modules/engines/pixbuf/pixbuf-main.c
        * modules/engines/pixbuf/pixbuf-rc-style.c
        * modules/input/gtkimcontextime.c
        * modules/input/gtkimcontextxim.c
        * modules/input/imam-et.c
        * modules/input/imcedilla.c
        * modules/input/imcyrillic-translit.c
        * modules/input/iminuktitut.c
        * modules/input/imipa.c
        * modules/input/imthai-broken.c
        * modules/input/imti-er.c
        * modules/input/imti-et.c
        * modules/input/imviqr.c
        * tests/prop-editor.c
        * tests/testentrycompletion.c
        * tests/testfilechooser.c
        * tests/testmerge.c
        * tests/testtoolbar.c
        * tests/testtreecolumns.c
        * tests/testtreeview.c: get rid of unnecessary casts.

        * tests/testgtk.c (create_labels): add GTK_LABEL() casts for
        gtk_label_set_ellipsize() calls.

        * tests/testicontheme.c (main): remove unused pixbuf variable.

diff --git a/ChangeLog b/ChangeLog
index 72cc329a19c690562fd96ffa989349444bcd1869..f6d264bca4f97174f3409155c24ba08da7ec84a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+Fri Nov 19 15:18:51 2004  Manish Singh  <yosh@gimp.org>
+
+       * modules/engines/ms-windows/msw_rc_style.c
+       * modules/engines/ms-windows/msw_style.c
+       * modules/engines/ms-windows/msw_theme_main.c
+       * modules/engines/pixbuf/pixbuf-main.c
+       * modules/engines/pixbuf/pixbuf-rc-style.c
+       * modules/input/gtkimcontextime.c
+       * modules/input/gtkimcontextxim.c
+       * modules/input/imam-et.c
+       * modules/input/imcedilla.c
+       * modules/input/imcyrillic-translit.c
+       * modules/input/iminuktitut.c
+       * modules/input/imipa.c
+       * modules/input/imthai-broken.c
+       * modules/input/imti-er.c
+       * modules/input/imti-et.c
+       * modules/input/imviqr.c
+       * tests/prop-editor.c
+       * tests/testentrycompletion.c
+       * tests/testfilechooser.c
+       * tests/testmerge.c
+       * tests/testtoolbar.c
+       * tests/testtreecolumns.c
+       * tests/testtreeview.c: get rid of unnecessary casts.
+
+       * tests/testgtk.c (create_labels): add GTK_LABEL() casts for
+       gtk_label_set_ellipsize() calls.
+
+       * tests/testicontheme.c (main): remove unused pixbuf variable.
+
 Fri Nov 19 14:54:09 2004  Manish Singh  <yosh@gimp.org>
 
        * gdk/linux-fb/gdkgc-fb.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 72cc329a19c690562fd96ffa989349444bcd1869..f6d264bca4f97174f3409155c24ba08da7ec84a1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,34 @@
+Fri Nov 19 15:18:51 2004  Manish Singh  <yosh@gimp.org>
+
+       * modules/engines/ms-windows/msw_rc_style.c
+       * modules/engines/ms-windows/msw_style.c
+       * modules/engines/ms-windows/msw_theme_main.c
+       * modules/engines/pixbuf/pixbuf-main.c
+       * modules/engines/pixbuf/pixbuf-rc-style.c
+       * modules/input/gtkimcontextime.c
+       * modules/input/gtkimcontextxim.c
+       * modules/input/imam-et.c
+       * modules/input/imcedilla.c
+       * modules/input/imcyrillic-translit.c
+       * modules/input/iminuktitut.c
+       * modules/input/imipa.c
+       * modules/input/imthai-broken.c
+       * modules/input/imti-er.c
+       * modules/input/imti-et.c
+       * modules/input/imviqr.c
+       * tests/prop-editor.c
+       * tests/testentrycompletion.c
+       * tests/testfilechooser.c
+       * tests/testmerge.c
+       * tests/testtoolbar.c
+       * tests/testtreecolumns.c
+       * tests/testtreeview.c: get rid of unnecessary casts.
+
+       * tests/testgtk.c (create_labels): add GTK_LABEL() casts for
+       gtk_label_set_ellipsize() calls.
+
+       * tests/testicontheme.c (main): remove unused pixbuf variable.
+
 Fri Nov 19 14:54:09 2004  Manish Singh  <yosh@gimp.org>
 
        * gdk/linux-fb/gdkgc-fb.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 72cc329a19c690562fd96ffa989349444bcd1869..f6d264bca4f97174f3409155c24ba08da7ec84a1 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,34 @@
+Fri Nov 19 15:18:51 2004  Manish Singh  <yosh@gimp.org>
+
+       * modules/engines/ms-windows/msw_rc_style.c
+       * modules/engines/ms-windows/msw_style.c
+       * modules/engines/ms-windows/msw_theme_main.c
+       * modules/engines/pixbuf/pixbuf-main.c
+       * modules/engines/pixbuf/pixbuf-rc-style.c
+       * modules/input/gtkimcontextime.c
+       * modules/input/gtkimcontextxim.c
+       * modules/input/imam-et.c
+       * modules/input/imcedilla.c
+       * modules/input/imcyrillic-translit.c
+       * modules/input/iminuktitut.c
+       * modules/input/imipa.c
+       * modules/input/imthai-broken.c
+       * modules/input/imti-er.c
+       * modules/input/imti-et.c
+       * modules/input/imviqr.c
+       * tests/prop-editor.c
+       * tests/testentrycompletion.c
+       * tests/testfilechooser.c
+       * tests/testmerge.c
+       * tests/testtoolbar.c
+       * tests/testtreecolumns.c
+       * tests/testtreeview.c: get rid of unnecessary casts.
+
+       * tests/testgtk.c (create_labels): add GTK_LABEL() casts for
+       gtk_label_set_ellipsize() calls.
+
+       * tests/testicontheme.c (main): remove unused pixbuf variable.
+
 Fri Nov 19 14:54:09 2004  Manish Singh  <yosh@gimp.org>
 
        * gdk/linux-fb/gdkgc-fb.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 72cc329a19c690562fd96ffa989349444bcd1869..f6d264bca4f97174f3409155c24ba08da7ec84a1 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,34 @@
+Fri Nov 19 15:18:51 2004  Manish Singh  <yosh@gimp.org>
+
+       * modules/engines/ms-windows/msw_rc_style.c
+       * modules/engines/ms-windows/msw_style.c
+       * modules/engines/ms-windows/msw_theme_main.c
+       * modules/engines/pixbuf/pixbuf-main.c
+       * modules/engines/pixbuf/pixbuf-rc-style.c
+       * modules/input/gtkimcontextime.c
+       * modules/input/gtkimcontextxim.c
+       * modules/input/imam-et.c
+       * modules/input/imcedilla.c
+       * modules/input/imcyrillic-translit.c
+       * modules/input/iminuktitut.c
+       * modules/input/imipa.c
+       * modules/input/imthai-broken.c
+       * modules/input/imti-er.c
+       * modules/input/imti-et.c
+       * modules/input/imviqr.c
+       * tests/prop-editor.c
+       * tests/testentrycompletion.c
+       * tests/testfilechooser.c
+       * tests/testmerge.c
+       * tests/testtoolbar.c
+       * tests/testtreecolumns.c
+       * tests/testtreeview.c: get rid of unnecessary casts.
+
+       * tests/testgtk.c (create_labels): add GTK_LABEL() casts for
+       gtk_label_set_ellipsize() calls.
+
+       * tests/testicontheme.c (main): remove unused pixbuf variable.
+
 Fri Nov 19 14:54:09 2004  Manish Singh  <yosh@gimp.org>
 
        * gdk/linux-fb/gdkgc-fb.c

diff --git a/modules/engines/ms-windows/msw_rc_style.c b/modules/engines/ms-windows/msw_rc_style.c
index 22b8e158fd038cf6a7d81052df11a0b18fe4c3fa..a6b6a90ef4a25adbfcfa32f9fe0cfd05bbadd20f 100755 (executable)
--- a/modules/engines/ms-windows/msw_rc_style.c
+++ b/modules/engines/ms-windows/msw_rc_style.c
@@ -73,6 +73,6 @@ msw_rc_style_class_init (MswRcStyleClass *klass)
 static GtkStyle *\r
 msw_rc_style_create_style (GtkRcStyle *rc_style)\r
 {\r
-  return GTK_STYLE (g_object_new (MSW_TYPE_STYLE, NULL));\r
+  return g_object_new (MSW_TYPE_STYLE, NULL);\r
 }\r
 \r

diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 7a35635d0c28034951b3e576c49317e9b320ac42..76e7089c5dc4815821b5761fbe1b601f95c5b840 100755 (executable)
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -458,16 +458,13 @@ setup_menu_settings (GtkSettings * settings)
     if (SystemParametersInfo (SPI_GETMENUSHOWDELAY, 0, &menu_delay, 0)) {
       if (klazz) {
        if (g_object_class_find_property (klazz, "gtk-menu-bar-popup-delay")) {
-         g_object_set (G_OBJECT (settings), "gtk-menu-bar-popup-delay",
-                       0, NULL);
+         g_object_set (settings, "gtk-menu-bar-popup-delay", 0, NULL);
        }
        if (g_object_class_find_property (klazz, "gtk-menu-popup-delay")) {
-         g_object_set (G_OBJECT (settings), "gtk-menu-popup-delay",
-                       menu_delay, NULL);
+         g_object_set (settings, "gtk-menu-popup-delay", menu_delay, NULL);
        }
        if (g_object_class_find_property (klazz, "gtk-menu-popdown-delay")) {
-         g_object_set (G_OBJECT (settings), "gtk-menu-popdown-delay",
-                       menu_delay, NULL);
+         g_object_set (settings, "gtk-menu-popdown-delay", menu_delay, NULL);
        }
       }
     }
@@ -485,19 +482,17 @@ msw_style_setup_system_settings (void)
     return;
 
   cursor_blink_time = GetCaretBlinkTime ();
-  g_object_set (G_OBJECT (settings), "gtk-cursor-blink",
-                       cursor_blink_time > 0, NULL);
+  g_object_set (settings, "gtk-cursor-blink", cursor_blink_time > 0, NULL);
 
   if (cursor_blink_time > 0)
   {
-       g_object_set (G_OBJECT (settings), "gtk-cursor-blink-time",
-                                       2*cursor_blink_time, NULL);
+       g_object_set (settings, "gtk-cursor-blink-time", 2*cursor_blink_time,
+                     NULL);
   }
 
-  g_object_set (G_OBJECT (settings), "gtk-double-click-time",
-               GetDoubleClickTime(), NULL);
-  g_object_set (G_OBJECT (settings), "gtk-dnd-drag-threshold",
-               GetSystemMetrics(SM_CXDRAG), NULL);
+  g_object_set (settings, "gtk-double-click-time", GetDoubleClickTime(), NULL);
+  g_object_set (settings, "gtk-dnd-drag-threshold", GetSystemMetrics(SM_CXDRAG),
+               NULL);
 
   setup_menu_settings (settings);
 

diff --git a/modules/engines/ms-windows/msw_theme_main.c b/modules/engines/ms-windows/msw_theme_main.c
index f3c5515f4a4866bba9db576796eab1a594221486..858f506ae0c15dd9ba0fd5c3900afbc1a8f310f0 100755 (executable)
--- a/modules/engines/ms-windows/msw_theme_main.c
+++ b/modules/engines/ms-windows/msw_theme_main.c
@@ -104,7 +104,7 @@ theme_exit (void)
 G_MODULE_EXPORT GtkRcStyle *\r
 theme_create_rc_style (void)\r
 {\r
-  return GTK_RC_STYLE (g_object_new (MSW_TYPE_RC_STYLE, NULL));\r
+  return g_object_new (MSW_TYPE_RC_STYLE, NULL);\r
 }\r
 \r
 /* The following function will be called by GTK+ when the module\r

diff --git a/modules/engines/pixbuf/pixbuf-main.c b/modules/engines/pixbuf/pixbuf-main.c
index 95d45258691ccc7e42659c0b53e57143d2e7253f..0b024598e877713c6b72fe758680ab03cbcd3d73 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-main.c
+++ b/modules/engines/pixbuf/pixbuf-main.c
@@ -40,7 +40,7 @@ theme_exit (void)
 G_MODULE_EXPORT GtkRcStyle *
 theme_create_rc_style (void)
 {
-  return GTK_RC_STYLE (g_object_new (PIXBUF_TYPE_RC_STYLE, NULL));  
+  return g_object_new (PIXBUF_TYPE_RC_STYLE, NULL);
 }
 
 /* The following function will be called by GTK+ when the module

diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c
index e90cee19ede1b769cf825b9c8ca6eed72b0c6140..ef93363cee7bd104dbc2830f8955941c02fc823a 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-rc-style.c
+++ b/modules/engines/pixbuf/pixbuf-rc-style.c
@@ -808,6 +808,6 @@ pixbuf_rc_style_merge (GtkRcStyle *dest,
 static GtkStyle *
 pixbuf_rc_style_create_style (GtkRcStyle *rc_style)
 {
-  return GTK_STYLE (g_object_new (PIXBUF_TYPE_STYLE, NULL));
+  return g_object_new (PIXBUF_TYPE_STYLE, NULL);
 }
 

diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c
index ad560925cdb6d48c58d7f1c20f5cfa5a97fb63a5..da10077d83d59d689f6c0118a750f15525952b65 100644 (file)
--- a/modules/input/gtkimcontextime.c
+++ b/modules/input/gtkimcontextime.c
@@ -327,7 +327,7 @@ gtk_im_context_ime_filter_keypress (GtkIMContext *context,
       int len = g_unichar_to_utf8 (c, utf8);
       utf8[len] = 0;
 
-      g_signal_emit_by_name (G_OBJECT (context_ime), "commit", utf8);
+      g_signal_emit_by_name (context_ime, "commit", utf8);
       retval = TRUE;
     }
 
@@ -590,7 +590,7 @@ gtk_im_context_ime_focus_in (GtkIMContext *context)
   gdk_window_get_user_data (context_ime->client_window, (gpointer) & widget);
   if (GTK_IS_WIDGET (widget))
     {
-      g_signal_connect (G_OBJECT (widget), "hierarchy-changed",
+      g_signal_connect (widget, "hierarchy-changed",
                         G_CALLBACK (cb_client_widget_hierarchy_changed),
                         context_ime);
     }
@@ -969,7 +969,7 @@ gtk_im_context_ime_message_filter (GdkXEvent *xevent,
 
             if (utf8str)
               {
-                g_signal_emit_by_name (G_OBJECT (context), "commit", utf8str);
+                g_signal_emit_by_name (context, "commit", utf8str);
                 g_free (utf8str);
               }
           }

diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 5b0bca31020569657886e40ce3f13481ef772d82..030440270bb97cdd832f02a593a6cc79b6cf0132 100644 (file)
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -633,7 +633,7 @@ gtk_im_context_xim_new (void)
   GtkIMContextXIM *result;
   const gchar *charset;
 
-  result = GTK_IM_CONTEXT_XIM (g_object_new (GTK_TYPE_IM_CONTEXT_XIM, NULL));
+  result = g_object_new (GTK_TYPE_IM_CONTEXT_XIM, NULL);
 
   result->locale = g_strdup (setlocale (LC_CTYPE, NULL));
   

diff --git a/modules/input/imam-et.c b/modules/input/imam-et.c
index 1d4e8cf7177c7291e148e4fdd32c33f32fad0f49..cabf03a638e5ec0b2d445c987db79ec3ecde94c1 100644 (file)
--- a/modules/input/imam-et.c
+++ b/modules/input/imam-et.c
@@ -484,7 +484,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "am_et") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_am_et_translit,NULL));
+    return g_object_new (type_am_et_translit, NULL);
   else
     return NULL;
 }

diff --git a/modules/input/imcedilla.c b/modules/input/imcedilla.c
index fa015269356d80585f22b653091b5fa8f227f0ca..061bdedd73c9207906b239cd7ded5356bd65338e 100644 (file)
--- a/modules/input/imcedilla.c
+++ b/modules/input/imcedilla.c
@@ -121,7 +121,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "cedilla") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_cedilla, NULL));
+    return g_object_new (type_cedilla, NULL);
   else
     return NULL;
 }

diff --git a/modules/input/imcyrillic-translit.c b/modules/input/imcyrillic-translit.c
index 12a0bc2289e63a617a04dfd67d79546a95a5929c..b9c6c562bb69495efcd1573bcbf131ba5fd693a0 100644 (file)
--- a/modules/input/imcyrillic-translit.c
+++ b/modules/input/imcyrillic-translit.c
@@ -247,7 +247,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "cyrillic_translit") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_cyrillic_translit, NULL));
+    return g_object_new (type_cyrillic_translit, NULL);
   else
     return NULL;
 }

diff --git a/modules/input/iminuktitut.c b/modules/input/iminuktitut.c
index e9926ad5266c01ecb16ffd330a7988cbdd57c9b6..b5ee5456dab04ea1ac943556329025cfc433e64c 100644 (file)
--- a/modules/input/iminuktitut.c
+++ b/modules/input/iminuktitut.c
@@ -157,7 +157,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "inuktitut") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_inuktitut_translit, NULL));
+    return g_object_new (type_inuktitut_translit, NULL);
   else
     return NULL;
 }

diff --git a/modules/input/imipa.c b/modules/input/imipa.c
index 2c98c65626b7f2914a82e5c3b43d46b9e4d636d7..c4a64023ee1f2a036116ae472322bdda0d1ae6e3 100644 (file)
--- a/modules/input/imipa.c
+++ b/modules/input/imipa.c
@@ -175,7 +175,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "ipa") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_ipa, NULL));
+    return g_object_new (type_ipa, NULL);
   else
     return NULL;
 }

diff --git a/modules/input/imthai-broken.c b/modules/input/imthai-broken.c
index 9980bc32c8d2a66e09017023ee75838be5340c1e..56c870f7e137e90dbad16acc4a62d6d5c1379db4 100644 (file)
--- a/modules/input/imthai-broken.c
+++ b/modules/input/imthai-broken.c
@@ -208,7 +208,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "thai_broken") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_thai_broken, NULL));
+    return g_object_new (type_thai_broken, NULL);
   else
     return NULL;
 }

diff --git a/modules/input/imti-er.c b/modules/input/imti-er.c
index dbc45b88c38745258eefd72c59d107746a43f3c6..8c4b7c1043748cf38247b6b3813a53fbbc90facf 100644 (file)
--- a/modules/input/imti-er.c
+++ b/modules/input/imti-er.c
@@ -483,7 +483,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "ti_er") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_ti_er_translit, NULL));
+    return g_object_new (type_ti_er_translit, NULL);
   else
     return NULL;
 }

diff --git a/modules/input/imti-et.c b/modules/input/imti-et.c
index ec8408abc58d68229e913b19d7104ccd2625b1e3..fdcb763cc7bd122406f583e726b2e098dd7c6c5c 100644 (file)
--- a/modules/input/imti-et.c
+++ b/modules/input/imti-et.c
@@ -483,7 +483,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "ti_et") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_ti_et_translit, NULL));
+    return g_object_new (type_ti_et_translit, NULL);
   else
     return NULL;
 }

diff --git a/modules/input/imviqr.c b/modules/input/imviqr.c
index 8e03a0e63e7ee8a3959101dee0944ab7a093664f..6d269ea1c7e1dc2aebd7a628ba8426d62a672e75 100644 (file)
--- a/modules/input/imviqr.c
+++ b/modules/input/imviqr.c
@@ -274,7 +274,7 @@ GtkIMContext *
 im_module_create (const gchar *context_id)
 {
   if (strcmp (context_id, "viqr") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_viqr_translit, NULL));
+    return g_object_new (type_viqr_translit, NULL);
   else
     return NULL;
 }

diff --git a/tests/prop-editor.c b/tests/prop-editor.c
index 0ac740663d318559be7744210918ccbc0a66cd46..4e26c6ee815dbc60e08414334cc3be5e7e85887a 100644 (file)
--- a/tests/prop-editor.c
+++ b/tests/prop-editor.c
@@ -812,7 +812,7 @@ create_prop_editor (GObject   *object,
   gtk_object_sink (GTK_OBJECT (tips));
 
   /* Kill the tips when the widget goes away.  */
-  g_signal_connect (G_OBJECT (win), "destroy", G_CALLBACK (kill_tips), tips);
+  g_signal_connect (win, "destroy", G_CALLBACK (kill_tips), tips);
 
   /* hold a weak ref to the object we're editing */
   g_object_set_data_full (G_OBJECT (object), "prop-editor-win", win, model_destroy);

diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index 2ffd1e9e3fcd5bb5073154ac1dc95f57d1be0889..18dbb32df572fcd175d68e9c7e3b88cddf11cae2 100644 (file)
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -337,7 +337,7 @@ main (int argc, char *argv[])
                                  "text", 1, NULL); 
   
   gtk_entry_completion_set_match_func (completion, match_func, NULL, NULL);
-  g_signal_connect (G_OBJECT (completion), "match-selected", 
+  g_signal_connect (completion, "match-selected", 
                    G_CALLBACK (match_selected_cb), NULL);
 
   gtk_entry_completion_insert_action_text (completion, 100, "action!");

diff --git a/tests/testfilechooser.c b/tests/testfilechooser.c
index 7910c61a8fdfaa4e67b6605c54b3adb75262b71d..01089b24c79827fc04213aaf300580e9ab5e48b3 100644 (file)
--- a/tests/testfilechooser.c
+++ b/tests/testfilechooser.c
@@ -216,7 +216,7 @@ my_new_from_file_at_size (const char *filename,
                        if (!gdk_pixbuf_loader_write (loader, buffer, length, error)) {
                                gdk_pixbuf_loader_close (loader, NULL);
                                fclose (f);
-                               g_object_unref (G_OBJECT (loader));
+                               g_object_unref (loader);
                                return NULL;
                        }
        }
@@ -225,14 +225,14 @@ my_new_from_file_at_size (const char *filename,
 
        g_assert (*error == NULL);
        if (!gdk_pixbuf_loader_close (loader, error)) {
-               g_object_unref (G_OBJECT (loader));
+               g_object_unref (loader);
                return NULL;
        }
 
        pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
 
        if (!pixbuf) {
-               g_object_unref (G_OBJECT (loader));
+               g_object_unref (loader);
 
                /* did the loader set an error? */
                if (*error != NULL)
@@ -248,7 +248,7 @@ my_new_from_file_at_size (const char *filename,
 
        g_object_ref (pixbuf);
 
-       g_object_unref (G_OBJECT (loader));
+       g_object_unref (loader);
 
        return pixbuf;
 }
@@ -572,7 +572,7 @@ main (int argc, char **argv)
   gtk_widget_show_all (control_window);
 
   g_object_ref (control_window);
-  g_signal_connect (G_OBJECT (dialog), "destroy",
+  g_signal_connect (dialog, "destroy",
                    G_CALLBACK (kill_dependent), control_window);
 
   /* We need to hold a ref until we have destroyed the widgets, just in case

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 006a2ba4eeb2cf929c62f3865eb52bd460208378..b52af0828371764250a4f872e4294bec3e10b774 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2576,25 +2576,25 @@ void create_labels (GtkWidget *widget)
 
       frame = gtk_frame_new ("Normal Label");
       label = gtk_label_new ("This is a Normal label");
-      gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_START);
+      gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_START);
       gtk_container_add (GTK_CONTAINER (frame), label);
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
       frame = gtk_frame_new ("Multi-line Label");
       label = gtk_label_new ("This is a Multi-line label.\nSecond line\nThird line");
-      gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
+      gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
       gtk_container_add (GTK_CONTAINER (frame), label);
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
       frame = gtk_frame_new ("Left Justified Label");
       label = gtk_label_new ("This is a Left-Justified\nMulti-line label.\nThird      line");
-      gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE);
+      gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE);
       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
       gtk_container_add (GTK_CONTAINER (frame), label);
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
       frame = gtk_frame_new ("Right Justified Label");
-      gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_START);
+      gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_START);
       label = gtk_label_new ("This is a Right-Justified\nMulti-line label.\nFourth line, (j/k)");
       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
       gtk_container_add (GTK_CONTAINER (frame), label);

diff --git a/tests/testicontheme.c b/tests/testicontheme.c
index a28c55ca5e6e95ff54e08ec0f9582918e9a62dfa..6ac8d59f3ded9b2f1ad1bc933dccfc03bea9b673 100644 (file)
--- a/tests/testicontheme.c
+++ b/tests/testicontheme.c
@@ -48,7 +48,6 @@ main (int argc, char *argv[])
     {
       GtkWidget *window, *image;
       GtkIconSize size;
-      GdkPixbuf *pixbuf;
 
       if (argc < 4)
        {

diff --git a/tests/testmerge.c b/tests/testmerge.c
index 8ca7ca7cee934083c17bfa2d28206f452e32c5f6..d06be9767a05fde7bd81addd68b7d3ee03b34b7a 100644 (file)
--- a/tests/testmerge.c
+++ b/tests/testmerge.c
@@ -51,7 +51,7 @@ dump_toplevels (GtkWidget    *button,
                                            GTK_UI_MANAGER_TOOLBAR |
                                            GTK_UI_MANAGER_POPUP);
 
-  g_slist_foreach (toplevels, (GFunc)print_toplevel, NULL);
+  g_slist_foreach (toplevels, (GFunc) print_toplevel, NULL);
   g_slist_free (toplevels);
 }
 
@@ -245,7 +245,7 @@ toggle_merge (GtkWidget    *button,
                                           "could not merge %s: %s", merge_ids[mergenum].filename,
                                           err->message);
 
-         g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (gtk_object_destroy), NULL);
+         g_signal_connect (dialog, "response", G_CALLBACK (gtk_object_destroy), NULL);
          gtk_widget_show (dialog);
 
          g_clear_error (&err);
@@ -270,8 +270,8 @@ set_name_func (GtkTreeViewColumn *tree_column,
   char *name;
   
   gtk_tree_model_get (tree_model, iter, 0, &action, -1);
-  g_object_get (G_OBJECT (action), "name", &name, NULL);
-  g_object_set (G_OBJECT (cell), "text", name, NULL);
+  g_object_get (action, "name", &name, NULL);
+  g_object_set (cell, "text", name, NULL);
   g_free (name);
   g_object_unref (action);
 }
@@ -287,8 +287,8 @@ set_sensitive_func (GtkTreeViewColumn *tree_column,
   gboolean sensitive;
   
   gtk_tree_model_get (tree_model, iter, 0, &action, -1);
-  g_object_get (G_OBJECT (action), "sensitive", &sensitive, NULL);
-  g_object_set (G_OBJECT (cell), "active", sensitive, NULL);
+  g_object_get (action, "sensitive", &sensitive, NULL);
+  g_object_set (cell, "active", sensitive, NULL);
   g_object_unref (action);
 }
 
@@ -304,8 +304,8 @@ set_visible_func (GtkTreeViewColumn *tree_column,
   gboolean visible;
   
   gtk_tree_model_get (tree_model, iter, 0, &action, -1);
-  g_object_get (G_OBJECT (action), "visible", &visible, NULL);
-  g_object_set (G_OBJECT (cell), "active", visible, NULL);
+  g_object_get (action, "visible", &visible, NULL);
+  g_object_set (cell, "active", visible, NULL);
   g_object_unref (action);
 }
 
@@ -323,8 +323,8 @@ sensitivity_toggled (GtkCellRendererToggle *cell,
   gtk_tree_model_get_iter (model, &iter, path);
 
   gtk_tree_model_get (model, &iter, 0, &action, -1);
-  g_object_get (G_OBJECT (action), "sensitive", &sensitive, NULL);
-  g_object_set (G_OBJECT (action), "sensitive", !sensitive, NULL);
+  g_object_get (action, "sensitive", &sensitive, NULL);
+  g_object_set (action, "sensitive", !sensitive, NULL);
   gtk_tree_model_row_changed (model, path, &iter);
   gtk_tree_path_free (path);
 }
@@ -343,8 +343,8 @@ visibility_toggled (GtkCellRendererToggle *cell,
   gtk_tree_model_get_iter (model, &iter, path);
 
   gtk_tree_model_get (model, &iter, 0, &action, -1);
-  g_object_get (G_OBJECT (action), "visible", &visible, NULL);
-  g_object_set (G_OBJECT (action), "visible", !visible, NULL);
+  g_object_get (action, "visible", &visible, NULL);
+  g_object_set (action, "visible", !visible, NULL);
   gtk_tree_model_row_changed (model, path, &iter);
   gtk_tree_path_free (path);
 }
@@ -508,7 +508,7 @@ set_tip (GtkWidget *widget)
   
   if (data) 
     {
-      g_object_get (G_OBJECT (data->action), "tooltip", &tooltip, NULL);
+      g_object_get (data->action, "tooltip", &tooltip, NULL);
       
       gtk_statusbar_push (GTK_STATUSBAR (data->statusbar), 0, 
                          tooltip ? tooltip : "");
@@ -580,9 +580,9 @@ main (int argc, char **argv)
                                entries, n_entries, 
                                NULL);
   action = gtk_action_group_get_action (action_group, "EmptyMenu1Action");
-  g_object_set (G_OBJECT (action), "hide_if_empty", FALSE, NULL);
+  g_object_set (action, "hide_if_empty", FALSE, NULL);
   action = gtk_action_group_get_action (action_group, "EmptyMenu2Action");
-  g_object_set (G_OBJECT (action), "hide_if_empty", TRUE, NULL);
+  g_object_set (action, "hide_if_empty", TRUE, NULL);
   gtk_action_group_add_toggle_actions (action_group, 
                                       toggle_entries, n_toggle_entries, 
                                       NULL);

diff --git a/tests/testtoolbar.c b/tests/testtoolbar.c
index c280e400f534c7ccf3eef0cfb7d3c517238ebb7a..73e88cc428081fc80573e861520483e5af131b8c 100644 (file)
--- a/tests/testtoolbar.c
+++ b/tests/testtoolbar.c
@@ -117,8 +117,8 @@ set_visible_func(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
 
   gtk_tree_model_get (model, iter, 0, &tool_item, -1);
 
-  g_object_get (G_OBJECT (tool_item), "visible", &visible, NULL);
-  g_object_set (G_OBJECT (cell), "active", visible, NULL);
+  g_object_get (tool_item, "visible", &visible, NULL);
+  g_object_set (cell, "active", visible, NULL);
   g_object_unref (tool_item);
 }
 
@@ -135,8 +135,8 @@ visibile_toggled(GtkCellRendererToggle *cell, const gchar *path_str,
   gtk_tree_model_get_iter (model, &iter, path);
 
   gtk_tree_model_get (model, &iter, 0, &tool_item, -1);
-  g_object_get (G_OBJECT (tool_item), "visible", &visible, NULL);
-  g_object_set (G_OBJECT (tool_item), "visible", !visible, NULL);
+  g_object_get (tool_item, "visible", &visible, NULL);
+  g_object_set (tool_item, "visible", !visible, NULL);
   g_object_unref (tool_item);
 
   gtk_tree_model_row_changed (model, path, &iter);
@@ -151,7 +151,7 @@ set_expand_func(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
 
   gtk_tree_model_get (model, iter, 0, &tool_item, -1);
 
-  g_object_set (G_OBJECT (cell), "active", gtk_tool_item_get_expand (tool_item), NULL);
+  g_object_set (cell, "active", gtk_tool_item_get_expand (tool_item), NULL);
   g_object_unref (tool_item);
 }
 
@@ -182,7 +182,7 @@ set_homogeneous_func(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
 
   gtk_tree_model_get (model, iter, 0, &tool_item, -1);
 
-  g_object_set (G_OBJECT (cell), "active", gtk_tool_item_get_homogeneous (tool_item), NULL);
+  g_object_set (cell, "active", gtk_tool_item_get_homogeneous (tool_item), NULL);
   g_object_unref (tool_item);
 }
 
@@ -214,7 +214,7 @@ set_important_func(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
 
   gtk_tree_model_get (model, iter, 0, &tool_item, -1);
 
-  g_object_set (G_OBJECT (cell), "active", gtk_tool_item_get_is_important (tool_item), NULL);
+  g_object_set (cell, "active", gtk_tool_item_get_is_important (tool_item), NULL);
   g_object_unref (tool_item);
 }
 
@@ -469,7 +469,7 @@ toolbar_drag_leave (GtkToolbar     *toolbar,
 {
   if (drag_item)
     {
-      g_object_unref (G_OBJECT (drag_item));
+      g_object_unref (drag_item);
       drag_item = NULL;
     }
   

diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index 1018f4ccfbced5186e4e3d07b9eca203611d283c..fd0b9995423725eccb58a84b05c904371042c2f6 100644 (file)
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -512,7 +512,7 @@ view_column_model_new (GtkTreeView *view)
 {
   GtkTreeModel *retval;
 
-  retval = GTK_TREE_MODEL (g_object_new (view_column_model_get_type (), NULL));
+  retval = g_object_new (view_column_model_get_type (), NULL);
   ((ViewColumnModel *)retval)->view = view;
   ((ViewColumnModel *)retval)->columns = gtk_tree_view_get_columns (view);
 

diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index cedf768c76bdc3081c1237a17defd5cbb6edd231..df0ff2c145bb4d4215503e679386d5c12e8864d1 100644 (file)
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -841,7 +841,7 @@ gtk_tree_model_types_new (void)
 {
   GtkTreeModelTypes *retval;
 
-  retval = GTK_TREE_MODEL_TYPES (g_object_new (GTK_TYPE_MODEL_TYPES, NULL));
+  retval = g_object_new (GTK_TYPE_MODEL_TYPES, NULL);
 
   return retval;
 }