diff options
29 files changed, 186 insertions, 68 deletions
@@ -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 72cc329a19..f6d264bca4 100644 --- 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 72cc329a19..f6d264bca4 100644 --- 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 72cc329a19..f6d264bca4 100644 --- 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 22b8e158fd..a6b6a90ef4 100755 --- 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 *
msw_rc_style_create_style (GtkRcStyle *rc_style)
{
- return GTK_STYLE (g_object_new (MSW_TYPE_STYLE, NULL));
+ return g_object_new (MSW_TYPE_STYLE, NULL);
}
diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c index 7a35635d0c..76e7089c5d 100755 --- 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 f3c5515f4a..858f506ae0 100755 --- 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 *
theme_create_rc_style (void)
{
- return GTK_RC_STYLE (g_object_new (MSW_TYPE_RC_STYLE, NULL));
+ return g_object_new (MSW_TYPE_RC_STYLE, NULL);
}
/* The following function will be called by GTK+ when the module
diff --git a/modules/engines/pixbuf/pixbuf-main.c b/modules/engines/pixbuf/pixbuf-main.c index 95d4525869..0b024598e8 100644 --- 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 e90cee19ed..ef93363cee 100644 --- 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 ad560925cd..da10077d83 100644 --- 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 5b0bca3102..030440270b 100644 --- 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 1d4e8cf717..cabf03a638 100644 --- 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 fa01526935..061bdedd73 100644 --- 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 12a0bc2289..b9c6c562bb 100644 --- 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 e9926ad526..b5ee5456da 100644 --- 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 2c98c65626..c4a64023ee 100644 --- 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 9980bc32c8..56c870f7e1 100644 --- 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 dbc45b88c3..8c4b7c1043 100644 --- 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 ec8408abc5..fdcb763cc7 100644 --- 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 8e03a0e63e..6d269ea1c7 100644 --- 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 0ac740663d..4e26c6ee81 100644 --- 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 2ffd1e9e3f..18dbb32df5 100644 --- 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 7910c61a8f..01089b24c7 100644 --- 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 006a2ba4ee..b52af08283 100644 --- 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 a28c55ca5e..6ac8d59f3d 100644 --- 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 8ca7ca7cee..d06be9767a 100644 --- 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 c280e400f5..73e88cc428 100644 --- 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 1018f4ccfb..fd0b999542 100644 --- 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 cedf768c76..df0ff2c145 100644 --- 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; } |