summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog26
-rw-r--r--ChangeLog.pre-2-1026
-rw-r--r--ChangeLog.pre-2-426
-rw-r--r--ChangeLog.pre-2-626
-rw-r--r--ChangeLog.pre-2-826
-rw-r--r--demos/gtk-demo/main.c2
-rw-r--r--demos/gtk-demo/tree_store.c12
-rw-r--r--gdk/x11/gdkscreen-x11.c5
-rw-r--r--gtk/gtkcellrenderertoggle.c2
-rw-r--r--gtk/gtkcolorsel.c2
-rw-r--r--gtk/gtkdnd.c4
-rw-r--r--gtk/gtkeditable.c4
-rw-r--r--gtk/gtkentry.c6
-rw-r--r--gtk/gtkmenu.c8
-rw-r--r--gtk/gtkmenubar.c4
-rw-r--r--gtk/gtkmenuitem.c2
-rw-r--r--gtk/gtkmenushell.c2
-rw-r--r--gtk/gtkrc.c2
-rw-r--r--gtk/gtksettings.c2
-rw-r--r--gtk/gtkstyle.c4
-rw-r--r--gtk/gtktextbuffer.c2
-rw-r--r--gtk/gtktextview.c6
-rw-r--r--gtk/gtktreeviewcolumn.c6
-rw-r--r--tests/testgtk.c6
-rw-r--r--tests/testtext.c34
-rw-r--r--tests/testtreeedit.c2
-rw-r--r--tests/testtreefocus.c10
-rw-r--r--tests/testtreeview.c2
28 files changed, 194 insertions, 65 deletions
diff --git a/ChangeLog b/ChangeLog
index 51f609991..ca9bb8550 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+Thu Feb 27 17:44:24 2003 Manish Singh <yosh@gimp.org>
+
+ * demos/gtk-demo/main.c
+ * demos/gtk-demo/tree_store.c
+ * gdk/x11/gdkscreen-x11.c
+ * gtk/gtkcellrenderertoggle.c
+ * gtk/gtkcolorsel.c
+ * gtk/gtkdnd.c
+ * gtk/gtkeditable.c
+ * gtk/gtkentry.c
+ * gtk/gtkmenu.c
+ * gtk/gtkmenubar.c
+ * gtk/gtkmenuitem.c
+ * gtk/gtkmenushell.c
+ * gtk/gtkrc.c
+ * gtk/gtksettings.c
+ * gtk/gtkstyle.c
+ * gtk/gtktextbuffer.c
+ * gtk/gtktextview.c
+ * gtk/gtktreeviewcolumn.c
+ * tests/testgtk.c
+ * tests/testtext.c
+ * tests/testtreeedit.c
+ * tests/testtreefocus.c
+ * tests/testtreeview.c: remove unnecessary G_OBJECT() casts.
+
Tue Feb 25 21:55:17 2003 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_position): account for RTL
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 51f609991..ca9bb8550 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,29 @@
+Thu Feb 27 17:44:24 2003 Manish Singh <yosh@gimp.org>
+
+ * demos/gtk-demo/main.c
+ * demos/gtk-demo/tree_store.c
+ * gdk/x11/gdkscreen-x11.c
+ * gtk/gtkcellrenderertoggle.c
+ * gtk/gtkcolorsel.c
+ * gtk/gtkdnd.c
+ * gtk/gtkeditable.c
+ * gtk/gtkentry.c
+ * gtk/gtkmenu.c
+ * gtk/gtkmenubar.c
+ * gtk/gtkmenuitem.c
+ * gtk/gtkmenushell.c
+ * gtk/gtkrc.c
+ * gtk/gtksettings.c
+ * gtk/gtkstyle.c
+ * gtk/gtktextbuffer.c
+ * gtk/gtktextview.c
+ * gtk/gtktreeviewcolumn.c
+ * tests/testgtk.c
+ * tests/testtext.c
+ * tests/testtreeedit.c
+ * tests/testtreefocus.c
+ * tests/testtreeview.c: remove unnecessary G_OBJECT() casts.
+
Tue Feb 25 21:55:17 2003 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_position): account for RTL
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 51f609991..ca9bb8550 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,29 @@
+Thu Feb 27 17:44:24 2003 Manish Singh <yosh@gimp.org>
+
+ * demos/gtk-demo/main.c
+ * demos/gtk-demo/tree_store.c
+ * gdk/x11/gdkscreen-x11.c
+ * gtk/gtkcellrenderertoggle.c
+ * gtk/gtkcolorsel.c
+ * gtk/gtkdnd.c
+ * gtk/gtkeditable.c
+ * gtk/gtkentry.c
+ * gtk/gtkmenu.c
+ * gtk/gtkmenubar.c
+ * gtk/gtkmenuitem.c
+ * gtk/gtkmenushell.c
+ * gtk/gtkrc.c
+ * gtk/gtksettings.c
+ * gtk/gtkstyle.c
+ * gtk/gtktextbuffer.c
+ * gtk/gtktextview.c
+ * gtk/gtktreeviewcolumn.c
+ * tests/testgtk.c
+ * tests/testtext.c
+ * tests/testtreeedit.c
+ * tests/testtreefocus.c
+ * tests/testtreeview.c: remove unnecessary G_OBJECT() casts.
+
Tue Feb 25 21:55:17 2003 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_position): account for RTL
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 51f609991..ca9bb8550 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,29 @@
+Thu Feb 27 17:44:24 2003 Manish Singh <yosh@gimp.org>
+
+ * demos/gtk-demo/main.c
+ * demos/gtk-demo/tree_store.c
+ * gdk/x11/gdkscreen-x11.c
+ * gtk/gtkcellrenderertoggle.c
+ * gtk/gtkcolorsel.c
+ * gtk/gtkdnd.c
+ * gtk/gtkeditable.c
+ * gtk/gtkentry.c
+ * gtk/gtkmenu.c
+ * gtk/gtkmenubar.c
+ * gtk/gtkmenuitem.c
+ * gtk/gtkmenushell.c
+ * gtk/gtkrc.c
+ * gtk/gtksettings.c
+ * gtk/gtkstyle.c
+ * gtk/gtktextbuffer.c
+ * gtk/gtktextview.c
+ * gtk/gtktreeviewcolumn.c
+ * tests/testgtk.c
+ * tests/testtext.c
+ * tests/testtreeedit.c
+ * tests/testtreefocus.c
+ * tests/testtreeview.c: remove unnecessary G_OBJECT() casts.
+
Tue Feb 25 21:55:17 2003 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_position): account for RTL
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 51f609991..ca9bb8550 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,29 @@
+Thu Feb 27 17:44:24 2003 Manish Singh <yosh@gimp.org>
+
+ * demos/gtk-demo/main.c
+ * demos/gtk-demo/tree_store.c
+ * gdk/x11/gdkscreen-x11.c
+ * gtk/gtkcellrenderertoggle.c
+ * gtk/gtkcolorsel.c
+ * gtk/gtkdnd.c
+ * gtk/gtkeditable.c
+ * gtk/gtkentry.c
+ * gtk/gtkmenu.c
+ * gtk/gtkmenubar.c
+ * gtk/gtkmenuitem.c
+ * gtk/gtkmenushell.c
+ * gtk/gtkrc.c
+ * gtk/gtksettings.c
+ * gtk/gtkstyle.c
+ * gtk/gtktextbuffer.c
+ * gtk/gtktextview.c
+ * gtk/gtktreeviewcolumn.c
+ * tests/testgtk.c
+ * tests/testtext.c
+ * tests/testtreeedit.c
+ * tests/testtreefocus.c
+ * tests/testtreeview.c: remove unnecessary G_OBJECT() casts.
+
Tue Feb 25 21:55:17 2003 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_position): account for RTL
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index d9bf2c17c..433fc1025 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -722,7 +722,7 @@ create_tree (void)
cell = gtk_cell_renderer_text_new ();
- g_object_set (G_OBJECT (cell),
+ g_object_set (cell,
"style", PANGO_STYLE_ITALIC,
NULL);
diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c
index 8bf43e1fe..bf80a9546 100644
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -261,7 +261,7 @@ add_columns (GtkTreeView *treeview)
/* column for holiday names */
renderer = gtk_cell_renderer_text_new ();
- g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+ g_object_set (renderer, "xalign", 0.0, NULL);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-1, "Holiday",
@@ -273,7 +273,7 @@ add_columns (GtkTreeView *treeview)
/* alex column */
renderer = gtk_cell_renderer_toggle_new ();
- g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+ g_object_set (renderer, "xalign", 0.0, NULL);
g_object_set_data (G_OBJECT (renderer), "column", (gint *)ALEX_COLUMN);
g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
@@ -296,7 +296,7 @@ add_columns (GtkTreeView *treeview)
/* havoc column */
renderer = gtk_cell_renderer_toggle_new ();
- g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+ g_object_set (renderer, "xalign", 0.0, NULL);
g_object_set_data (G_OBJECT (renderer), "column", (gint *)HAVOC_COLUMN);
g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
@@ -318,7 +318,7 @@ add_columns (GtkTreeView *treeview)
/* tim column */
renderer = gtk_cell_renderer_toggle_new ();
- g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+ g_object_set (renderer, "xalign", 0.0, NULL);
g_object_set_data (G_OBJECT (renderer), "column", (gint *)TIM_COLUMN);
g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
@@ -341,7 +341,7 @@ add_columns (GtkTreeView *treeview)
/* owen column */
renderer = gtk_cell_renderer_toggle_new ();
- g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+ g_object_set (renderer, "xalign", 0.0, NULL);
g_object_set_data (G_OBJECT (renderer), "column", (gint *)OWEN_COLUMN);
g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
@@ -363,7 +363,7 @@ add_columns (GtkTreeView *treeview)
/* dave column */
renderer = gtk_cell_renderer_toggle_new ();
- g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+ g_object_set (renderer, "xalign", 0.0, NULL);
g_object_set_data (G_OBJECT (renderer), "column", (gint *)DAVE_COLUMN);
g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 8036f1fb3..b955a3207 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -579,14 +579,13 @@ _gdk_x11_screen_size_changed (GdkScreen *screen,
#endif
init_xinerama_support (screen);
- g_signal_emit_by_name (G_OBJECT (screen), "size_changed");
+ g_signal_emit_by_name (screen, "size_changed");
}
void
_gdk_x11_screen_window_manager_changed (GdkScreen *screen)
{
- g_signal_emit (G_OBJECT (screen),
- signals[WINDOW_MANAGER_CHANGED], 0);
+ g_signal_emit (screen, signals[WINDOW_MANAGER_CHANGED], 0);
}
/**
diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
index 283bbd6d7..ee7422b23 100644
--- a/gtk/gtkcellrenderertoggle.c
+++ b/gtk/gtkcellrenderertoggle.c
@@ -463,5 +463,5 @@ gtk_cell_renderer_toggle_set_active (GtkCellRendererToggle *toggle,
{
g_return_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (toggle));
- g_object_set (G_OBJECT (toggle), "active", setting?TRUE:FALSE, NULL);
+ g_object_set (toggle, "active", setting ? TRUE : FALSE, NULL);
}
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index f37b09cea..32b106894 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -708,7 +708,7 @@ get_current_colors (GtkColorSelection *colorsel)
gchar *palette;
settings = gtk_widget_get_settings (GTK_WIDGET (colorsel));
- g_object_get (G_OBJECT (settings),
+ g_object_get (settings,
"gtk-color-palette", &palette,
NULL);
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index c08bb9581..e9f690f6c 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -2309,10 +2309,10 @@ icon_window_realize (GtkWidget *window,
if (mask)
gtk_widget_shape_combine_mask (window, mask, 0, 0);
- g_object_unref (G_OBJECT (pixmap));
+ g_object_unref (pixmap);
if (mask)
- g_object_unref (G_OBJECT (mask));
+ g_object_unref (mask);
}
static void
diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index 771a63549..d15052187 100644
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -215,7 +215,7 @@ gtk_editable_set_editable (GtkEditable *editable,
{
g_return_if_fail (GTK_IS_EDITABLE (editable));
- g_object_set (G_OBJECT (editable),
+ g_object_set (editable,
"editable", is_editable != FALSE,
NULL);
}
@@ -236,7 +236,7 @@ gtk_editable_get_editable (GtkEditable *editable)
g_return_val_if_fail (GTK_IS_EDITABLE (editable), FALSE);
- g_object_get (G_OBJECT (editable), "editable", &value, NULL);
+ g_object_get (editable, "editable", &value, NULL);
return value;
}
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 7943d8c05..75c8e0018 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1635,7 +1635,7 @@ gtk_entry_grab_focus (GtkWidget *widget)
GTK_WIDGET_CLASS (parent_class)->grab_focus (widget);
- g_object_get (G_OBJECT (gtk_widget_get_settings (widget)),
+ g_object_get (gtk_widget_get_settings (widget),
"gtk-entry-select-on-focus",
&select_on_focus,
NULL);
@@ -4264,7 +4264,7 @@ cursor_blinks (GtkEntry *entry)
if (GTK_WIDGET_HAS_FOCUS (entry) &&
entry->selection_bound == entry->current_pos)
{
- g_object_get (G_OBJECT (settings), "gtk-cursor-blink", &blink, NULL);
+ g_object_get (settings, "gtk-cursor-blink", &blink, NULL);
return blink;
}
else
@@ -4277,7 +4277,7 @@ get_cursor_time (GtkEntry *entry)
GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (entry));
gint time;
- g_object_get (G_OBJECT (settings), "gtk-cursor-blink-time", &time, NULL);
+ g_object_get (settings, "gtk-cursor-blink-time", &time, NULL);
return time;
}
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index b77a1c966..16346263d 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1998,7 +1998,7 @@ gtk_menu_key_press (GtkWidget *widget,
display = gtk_widget_get_display (widget);
- g_object_get (G_OBJECT (gtk_widget_get_settings (widget)),
+ g_object_get (gtk_widget_get_settings (widget),
"gtk-menu-bar-accel", &accel,
"gtk-can-change-accels", &can_change_accels,
NULL);
@@ -2493,7 +2493,7 @@ draw_stay_up_triangle (GdkWindow *window,
clipbox.x, clipbox.y,
clipbox.width, clipbox.height);
- g_object_unref (G_OBJECT (ugly_gc));
+ g_object_unref (ugly_gc);
}
#endif
@@ -2614,7 +2614,7 @@ gtk_menu_set_submenu_navigation_region (GtkMenu *menu,
menu->navigation_region = new_region;
}
- g_object_get (G_OBJECT (gtk_widget_get_settings (GTK_WIDGET (menu))),
+ g_object_get (gtk_widget_get_settings (GTK_WIDGET (menu)),
"gtk-menu-popdown-delay", &popdown_delay,
NULL);
@@ -3096,7 +3096,7 @@ gtk_menu_get_popup_delay (GtkMenuShell *menu_shell)
{
gint popup_delay;
- g_object_get (G_OBJECT (gtk_widget_get_settings (GTK_WIDGET (menu_shell))),
+ g_object_get (gtk_widget_get_settings (GTK_WIDGET (menu_shell)),
"gtk-menu-popup-delay", &popup_delay,
NULL);
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 3f8681e47..d35d03b30 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -438,7 +438,7 @@ window_key_press_handler (GtkWidget *widget,
gchar *accel = NULL;
gboolean retval = FALSE;
- g_object_get (G_OBJECT (gtk_widget_get_settings (widget)),
+ g_object_get (gtk_widget_get_settings (widget),
"gtk-menu-bar-accel",
&accel,
NULL);
@@ -605,7 +605,7 @@ gtk_menu_bar_get_popup_delay (GtkMenuShell *menu_shell)
{
gint popup_delay;
- g_object_get (G_OBJECT (gtk_widget_get_settings (GTK_WIDGET (menu_shell))),
+ g_object_get (gtk_widget_get_settings (GTK_WIDGET (menu_shell)),
"gtk-menu-bar-popup-delay", &popup_delay,
NULL);
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 25557ffd9..c18550bfe 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -722,7 +722,7 @@ get_popup_delay (GtkMenuItem *menu_item)
{
gint popup_delay;
- g_object_get (G_OBJECT (gtk_widget_get_settings (GTK_WIDGET (menu_item))),
+ g_object_get (gtk_widget_get_settings (GTK_WIDGET (menu_item)),
"gtk-menu-popup-delay", &popup_delay,
NULL);
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 4b3fba1a4..9fa1a3b28 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -1189,7 +1189,7 @@ _gtk_menu_shell_get_popup_delay (GtkMenuShell *menu_shell)
gint popup_delay;
GtkWidget *widget = GTK_WIDGET (menu_shell);
- g_object_get (G_OBJECT (gtk_widget_get_settings (widget)),
+ g_object_get (gtk_widget_get_settings (widget),
"gtk-menu-popup-delay", &popup_delay,
NULL);
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 82700ebf4..b28145e67 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -1357,7 +1357,7 @@ _gtk_rc_reset_styles (GtkSettings *settings)
if (context->default_style)
{
- g_object_unref (G_OBJECT (context->default_style));
+ g_object_unref (context->default_style);
context->default_style = NULL;
reset = TRUE;
}
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index b2a38fd94..e7de9912f 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -1082,7 +1082,7 @@ settings_update_double_click_time (GtkSettings *settings)
GdkDisplay *display = gdk_screen_get_display (settings->screen);
gint double_click_time;
- g_object_get (G_OBJECT (settings), "gtk-double-click-time",
+ g_object_get (settings, "gtk-double-click-time",
&double_click_time, NULL);
gdk_display_set_double_click_time (display, double_click_time);
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 1793c6bbf..bff024161 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -3605,7 +3605,7 @@ gtk_default_draw_check (GtkStyle *style,
}
if (free_me)
- g_object_unref (G_OBJECT (free_me));
+ g_object_unref (free_me);
}
}
@@ -3706,7 +3706,7 @@ gtk_default_draw_option (GtkStyle *style,
}
if (free_me)
- g_object_unref (G_OBJECT (free_me));
+ g_object_unref (free_me);
}
}
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 1f49807f7..ec50c419c 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -336,7 +336,7 @@ set_table (GtkTextBuffer *buffer, GtkTextTagTable *table)
if (table)
{
buffer->tag_table = table;
- g_object_ref (G_OBJECT (buffer->tag_table));
+ g_object_ref (buffer->tag_table);
_gtk_text_tag_table_add_buffer (table, buffer);
}
}
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index eb1bf44b8..e151a3e62 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4301,7 +4301,7 @@ cursor_blinks (GtkTextView *text_view)
if (gtk_debug_flags & GTK_DEBUG_UPDATES)
return FALSE;
- g_object_get (G_OBJECT (settings), "gtk-cursor-blink", &blink, NULL);
+ g_object_get (settings, "gtk-cursor-blink", &blink, NULL);
return blink;
}
@@ -4311,7 +4311,7 @@ get_cursor_time (GtkTextView *text_view)
GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (text_view));
gint time;
- g_object_get (G_OBJECT (settings), "gtk-cursor-blink-time", &time, NULL);
+ g_object_get (settings, "gtk-cursor-blink-time", &time, NULL);
return time;
}
@@ -5355,7 +5355,7 @@ gtk_text_view_check_keymap_direction (GtkTextView *text_view)
GtkTextDirection new_dir;
GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (text_view));
- g_object_get (G_OBJECT (settings),
+ g_object_get (settings,
"gtk-split-cursor", &split_cursor,
NULL);
if (split_cursor)
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 278b6b8a9..6e76e056e 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -357,7 +357,7 @@ gtk_tree_view_column_finalize (GObject *object)
g_list_free (tree_column->cell_list);
if (tree_column->child)
- g_object_unref (G_OBJECT (tree_column->child));
+ g_object_unref (tree_column->child);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -2567,7 +2567,7 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
{
gboolean visible, mode;
- g_object_get (G_OBJECT (info->cell),
+ g_object_get (info->cell,
"visible", &visible,
"mode", &mode,
NULL);
@@ -2708,7 +2708,7 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
{
gboolean visible, mode;
- g_object_get (G_OBJECT (info->cell),
+ g_object_get (info->cell,
"visible", &visible,
"mode", &mode,
NULL);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 35f7dc1bf..11ad77267 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -8421,7 +8421,7 @@ static void
notebook_homogeneous (GtkToggleButton *button,
GtkNotebook *notebook)
{
- g_object_set (G_OBJECT (notebook), "homogeneous", button->active, NULL);
+ g_object_set (notebook, "homogeneous", button->active, NULL);
}
static void
@@ -9834,7 +9834,7 @@ static void
allow_shrink_callback (GtkWidget *widget,
gpointer data)
{
- g_object_set (G_OBJECT (g_object_get_data (data, "target")),
+ g_object_set (g_object_get_data (data, "target"),
"allow_shrink",
GTK_TOGGLE_BUTTON (widget)->active,
NULL);
@@ -9844,7 +9844,7 @@ static void
allow_grow_callback (GtkWidget *widget,
gpointer data)
{
- g_object_set (G_OBJECT (g_object_get_data (data, "target")),
+ g_object_set (g_object_get_data (data, "target"),
"allow_grow",
GTK_TOGGLE_BUTTON (widget)->active,
NULL);
diff --git a/tests/testtext.c b/tests/testtext.c
index fa59d3d01..c188100c9 100644
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -320,7 +320,7 @@ blink_timeout (gpointer data)
tag = GTK_TEXT_TAG (data);
- g_object_set (G_OBJECT (tag),
+ g_object_set (tag,
"foreground", flip ? "blue" : "purple",
NULL);
@@ -455,7 +455,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
color2.red = 0xfff;
color2.blue = 0x0;
color2.green = 0;
- g_object_set (G_OBJECT (tag),
+ g_object_set (tag,
"foreground_gdk", &color,
"background_gdk", &color2,
"size_points", 24.0,
@@ -467,7 +467,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
color.blue = color.green = 0;
color.red = 0xffff;
- g_object_set (G_OBJECT (tag),
+ g_object_set (tag,
"rise", -4 * PANGO_SCALE,
"foreground_gdk", &color,
NULL);
@@ -478,7 +478,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
color.blue = color.red = 0;
color.green = 0xffff;
- g_object_set (G_OBJECT (tag),
+ g_object_set (tag,
"background_gdk", &color,
"size_points", 10.0,
NULL);
@@ -487,7 +487,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
setup_tag (tag);
- g_object_set (G_OBJECT (tag),
+ g_object_set (tag,
"strikethrough", TRUE,
NULL);
@@ -496,25 +496,25 @@ fill_example_buffer (GtkTextBuffer *buffer)
setup_tag (tag);
- g_object_set (G_OBJECT (tag),
+ g_object_set (tag,
"underline", PANGO_UNDERLINE_SINGLE,
NULL);
setup_tag (tag);
- g_object_set (G_OBJECT (tag),
+ g_object_set (tag,
"underline", PANGO_UNDERLINE_SINGLE,
NULL);
tag = gtk_text_buffer_create_tag (buffer, "centered", NULL);
- g_object_set (G_OBJECT (tag),
+ g_object_set (tag,
"justification", GTK_JUSTIFY_CENTER,
NULL);
tag = gtk_text_buffer_create_tag (buffer, "rtl_quote", NULL);
- g_object_set (G_OBJECT (tag),
+ g_object_set (tag,
"wrap_mode", GTK_WRAP_WORD,
"direction", GTK_TEXT_DIR_RTL,
"indent", 30,
@@ -525,7 +525,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
tag = gtk_text_buffer_create_tag (buffer, "negative_indent", NULL);
- g_object_set (G_OBJECT (tag),
+ g_object_set (tag,
"indent", -25,
NULL);
@@ -2023,14 +2023,14 @@ buffer_set_colors (Buffer *buffer,
hue_to_color (hue, &color);
- g_object_set (G_OBJECT (tmp->data),
- "foreground_gdk", &color,
- NULL);
+ g_object_set (tmp->data,
+ "foreground_gdk", &color,
+ NULL);
}
else
- g_object_set (G_OBJECT (tmp->data),
- "foreground_set", FALSE,
- NULL);
+ g_object_set (tmp->data,
+ "foreground_set", FALSE,
+ NULL);
hue += 1.0 / N_COLORS;
@@ -2051,7 +2051,7 @@ buffer_cycle_colors (Buffer *buffer)
hue_to_color (hue, &color);
- g_object_set (G_OBJECT (tmp->data),
+ g_object_set (tmp->data,
"foreground_gdk", &color,
NULL);
diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c
index f10d3883e..5cf209023 100644
--- a/tests/testtreeedit.c
+++ b/tests/testtreeedit.c
@@ -165,7 +165,7 @@ main (gint argc, gchar **argv)
g_signal_connect (renderer, "toggled",
G_CALLBACK (toggled), tree_model);
- g_object_set (G_OBJECT (renderer),
+ g_object_set (renderer,
"xalign", 0.0,
NULL);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index e56aaac2e..5e2993b7f 100644
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -342,7 +342,7 @@ main (int argc, char *argv[])
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect (renderer, "toggled", G_CALLBACK (alex_toggled), model);
- g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+ g_object_set (renderer, "xalign", 0.0, NULL);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, "Alex",
renderer,
@@ -359,7 +359,7 @@ main (int argc, char *argv[])
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect (renderer, "toggled", G_CALLBACK (havoc_toggled), model);
- g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+ g_object_set (renderer, "xalign", 0.0, NULL);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, "Havoc",
renderer,
@@ -375,7 +375,7 @@ main (int argc, char *argv[])
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect (renderer, "toggled", G_CALLBACK (tim_toggled), model);
- g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+ g_object_set (renderer, "xalign", 0.0, NULL);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, "Tim",
renderer,
@@ -391,7 +391,7 @@ main (int argc, char *argv[])
/* Owen Column */
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect (renderer, "toggled", G_CALLBACK (owen_toggled), model);
- g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+ g_object_set (renderer, "xalign", 0.0, NULL);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, "Owen",
renderer,
@@ -406,7 +406,7 @@ main (int argc, char *argv[])
/* Owen Column */
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect (renderer, "toggled", G_CALLBACK (dave_toggled), model);
- g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+ g_object_set (renderer, "xalign", 0.0, NULL);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, "Dave",
renderer,
diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index 2ccc90e76..8be4aa419 100644
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -324,7 +324,7 @@ set_columns_type (GtkTreeView *tree_view, ColumnsType type)
/* you could also set this per-row by tying it to a column
* in the model of course.
*/
- g_object_set (G_OBJECT (rend), "radio", TRUE, NULL);
+ g_object_set (rend, "radio", TRUE, NULL);
g_signal_connect (rend, "toggled",
G_CALLBACK (toggled_callback), tree_view);
View Lorry Controller Status