AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

gdk/linux-fb/gdkgc-fb.c gdk/win32/gdkgc-win32.c

Browse Source 
Fri Nov 19 14:54:09 2004  Manish Singh  <yosh@gimp.org>

        * gdk/linux-fb/gdkgc-fb.c
        * gdk/win32/gdkgc-win32.c
        * gdk/win32/gdkwindow-win32.c
        * gtk/gtkaboutdialog.c
        * gtk/gtkaction.c
        * gtk/gtkactiongroup.c
        * gtk/gtkcellrendererprogress.c
        * gtk/gtkcellview.c
        * gtk/gtkcolorbutton.c
        * gtk/gtkcombobox.c
        * gtk/gtkcomboboxentry.c
        * gtk/gtkentrycompletion.c
        * gtk/gtkfilechooserbutton.c
        * gtk/gtkmenutoolbutton.c
        * gtk/gtkrc.c
        * gtk/gtksettings.c
        * gtk/gtkstyle.c
        * gtk/gtktoggletoolbutton.c
        * gtk/gtktoolbutton.c
        * gtk/gtktoolitem.c
        * gtk/gtktreemodelfilter.c
        * gtk/gtktreeselection.c
        * gtk/gtktreeviewcolumn.c
        * gtk/gtkuimanager.c: get rid of unnecessary casts.

        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_set_property):
        cast away the const for g_value_set_enum. This is after the g_warning,
        so this is a hack to begin with.

        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_set_property):
        add a cast to GTK_FILE_CHOOSER for impl here.
This commit is contained in:
Manish Singh 2004-11-19 23:18:38 +00:00 committed by Manish Singh
parent 3d325e30d9
commit 60b30ff513
29 changed files with 219 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ChangeLog
View File

@ -1,3 +1,37 @@
Fri Nov 19 14:54:09 2004 Manish Singh <yosh@gimp.org>
* gdk/linux-fb/gdkgc-fb.c
* gdk/win32/gdkgc-win32.c
* gdk/win32/gdkwindow-win32.c
* gtk/gtkaboutdialog.c
* gtk/gtkaction.c
* gtk/gtkactiongroup.c
* gtk/gtkcellrendererprogress.c
* gtk/gtkcellview.c
* gtk/gtkcolorbutton.c
* gtk/gtkcombobox.c
* gtk/gtkcomboboxentry.c
* gtk/gtkentrycompletion.c
* gtk/gtkfilechooserbutton.c
* gtk/gtkmenutoolbutton.c
* gtk/gtkrc.c
* gtk/gtksettings.c
* gtk/gtkstyle.c
* gtk/gtktoggletoolbutton.c
* gtk/gtktoolbutton.c
* gtk/gtktoolitem.c
* gtk/gtktreemodelfilter.c
* gtk/gtktreeselection.c
* gtk/gtktreeviewcolumn.c
* gtk/gtkuimanager.c: get rid of unnecessary casts.
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_set_property):
cast away the const for g_value_set_enum. This is after the g_warning,
so this is a hack to begin with.
* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_set_property):
add a cast to GTK_FILE_CHOOSER for impl here.
Fri Nov 19 14:52:42 2004 Manish Singh <yosh@gimp.org> Fri Nov 19 14:52:42 2004 Manish Singh <yosh@gimp.org>
* autogen.sh: rm autom4te.cache, since it might interfere with * autogen.sh: rm autom4te.cache, since it might interfere with

34
ChangeLog.pre-2-10
View File

@ -1,3 +1,37 @@
Fri Nov 19 14:54:09 2004 Manish Singh <yosh@gimp.org>
* gdk/linux-fb/gdkgc-fb.c
* gdk/win32/gdkgc-win32.c
* gdk/win32/gdkwindow-win32.c
* gtk/gtkaboutdialog.c
* gtk/gtkaction.c
* gtk/gtkactiongroup.c
* gtk/gtkcellrendererprogress.c
* gtk/gtkcellview.c
* gtk/gtkcolorbutton.c
* gtk/gtkcombobox.c
* gtk/gtkcomboboxentry.c
* gtk/gtkentrycompletion.c
* gtk/gtkfilechooserbutton.c
* gtk/gtkmenutoolbutton.c
* gtk/gtkrc.c
* gtk/gtksettings.c
* gtk/gtkstyle.c
* gtk/gtktoggletoolbutton.c
* gtk/gtktoolbutton.c
* gtk/gtktoolitem.c
* gtk/gtktreemodelfilter.c
* gtk/gtktreeselection.c
* gtk/gtktreeviewcolumn.c
* gtk/gtkuimanager.c: get rid of unnecessary casts.
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_set_property):
cast away the const for g_value_set_enum. This is after the g_warning,
so this is a hack to begin with.
* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_set_property):
add a cast to GTK_FILE_CHOOSER for impl here.
Fri Nov 19 14:52:42 2004 Manish Singh <yosh@gimp.org> Fri Nov 19 14:52:42 2004 Manish Singh <yosh@gimp.org>
* autogen.sh: rm autom4te.cache, since it might interfere with * autogen.sh: rm autom4te.cache, since it might interfere with

34
ChangeLog.pre-2-6
View File

@ -1,3 +1,37 @@
Fri Nov 19 14:54:09 2004 Manish Singh <yosh@gimp.org>
* gdk/linux-fb/gdkgc-fb.c
* gdk/win32/gdkgc-win32.c
* gdk/win32/gdkwindow-win32.c
* gtk/gtkaboutdialog.c
* gtk/gtkaction.c
* gtk/gtkactiongroup.c
* gtk/gtkcellrendererprogress.c
* gtk/gtkcellview.c
* gtk/gtkcolorbutton.c
* gtk/gtkcombobox.c
* gtk/gtkcomboboxentry.c
* gtk/gtkentrycompletion.c
* gtk/gtkfilechooserbutton.c
* gtk/gtkmenutoolbutton.c
* gtk/gtkrc.c
* gtk/gtksettings.c
* gtk/gtkstyle.c
* gtk/gtktoggletoolbutton.c
* gtk/gtktoolbutton.c
* gtk/gtktoolitem.c
* gtk/gtktreemodelfilter.c
* gtk/gtktreeselection.c
* gtk/gtktreeviewcolumn.c
* gtk/gtkuimanager.c: get rid of unnecessary casts.
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_set_property):
cast away the const for g_value_set_enum. This is after the g_warning,
so this is a hack to begin with.
* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_set_property):
add a cast to GTK_FILE_CHOOSER for impl here.
Fri Nov 19 14:52:42 2004 Manish Singh <yosh@gimp.org> Fri Nov 19 14:52:42 2004 Manish Singh <yosh@gimp.org>
* autogen.sh: rm autom4te.cache, since it might interfere with * autogen.sh: rm autom4te.cache, since it might interfere with

34
ChangeLog.pre-2-8
View File

@ -1,3 +1,37 @@
Fri Nov 19 14:54:09 2004 Manish Singh <yosh@gimp.org>
* gdk/linux-fb/gdkgc-fb.c
* gdk/win32/gdkgc-win32.c
* gdk/win32/gdkwindow-win32.c
* gtk/gtkaboutdialog.c
* gtk/gtkaction.c
* gtk/gtkactiongroup.c
* gtk/gtkcellrendererprogress.c
* gtk/gtkcellview.c
* gtk/gtkcolorbutton.c
* gtk/gtkcombobox.c
* gtk/gtkcomboboxentry.c
* gtk/gtkentrycompletion.c
* gtk/gtkfilechooserbutton.c
* gtk/gtkmenutoolbutton.c
* gtk/gtkrc.c
* gtk/gtksettings.c
* gtk/gtkstyle.c
* gtk/gtktoggletoolbutton.c
* gtk/gtktoolbutton.c
* gtk/gtktoolitem.c
* gtk/gtktreemodelfilter.c
* gtk/gtktreeselection.c
* gtk/gtktreeviewcolumn.c
* gtk/gtkuimanager.c: get rid of unnecessary casts.
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_set_property):
cast away the const for g_value_set_enum. This is after the g_warning,
so this is a hack to begin with.
* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_set_property):
add a cast to GTK_FILE_CHOOSER for impl here.
Fri Nov 19 14:52:42 2004 Manish Singh <yosh@gimp.org> Fri Nov 19 14:52:42 2004 Manish Singh <yosh@gimp.org>
* autogen.sh: rm autom4te.cache, since it might interfere with * autogen.sh: rm autom4te.cache, since it might interfere with

2
gdk/linux-fb/gdkgc-fb.c
View File

@ -77,7 +77,7 @@ _gdk_fb_gc_new (GdkDrawable *drawable,
GdkGC *gc; GdkGC *gc;
GdkGCFBData *private; GdkGCFBData *private;
gc = GDK_GC (g_object_new (gdk_gc_fb_get_type (), NULL)); gc = g_object_new (gdk_gc_fb_get_type (), NULL);
private = (GdkGCFBData *)gc; private = (GdkGCFBData *)gc;

4
gdk/win32/gdkgc-win32.c
View File

@ -689,7 +689,7 @@ gdk_gc_copy (GdkGC *dst_gc,
GDK_NOTE (GC, g_print ("gdk_gc_copy: %p := %p\n", dst_win32_gc, src_win32_gc)); GDK_NOTE (GC, g_print ("gdk_gc_copy: %p := %p\n", dst_win32_gc, src_win32_gc));
if (dst_gc->colormap) if (dst_gc->colormap)
g_object_unref (G_OBJECT (dst_gc->colormap)); g_object_unref (dst_gc->colormap);
if (dst_win32_gc->hcliprgn != NULL) if (dst_win32_gc->hcliprgn != NULL)
DeleteObject (dst_win32_gc->hcliprgn); DeleteObject (dst_win32_gc->hcliprgn);
@ -712,7 +712,7 @@ gdk_gc_copy (GdkGC *dst_gc,
dst_gc->ts_y_origin = src_gc->ts_y_origin; dst_gc->ts_y_origin = src_gc->ts_y_origin;
dst_gc->colormap = src_gc->colormap; dst_gc->colormap = src_gc->colormap;
if (dst_gc->colormap) if (dst_gc->colormap)
g_object_ref (G_OBJECT (dst_gc->colormap)); g_object_ref (dst_gc->colormap);
dst_win32_gc->hcliprgn = src_win32_gc->hcliprgn; dst_win32_gc->hcliprgn = src_win32_gc->hcliprgn;
if (dst_win32_gc->hcliprgn) if (dst_win32_gc->hcliprgn)

4
gdk/win32/gdkwindow-win32.c
View File

@ -2432,9 +2432,9 @@ pixbuf_to_hicon_normal (GdkWindow *window,
#endif #endif
if (pixmap) if (pixmap)
g_object_unref (G_OBJECT (pixmap)); g_object_unref (pixmap);
if (mask) if (mask)
g_object_unref (G_OBJECT (mask)); g_object_unref (mask);
return hIcon; return hIcon;
} }

16
gtk/gtkaboutdialog.c
View File

@ -1547,7 +1547,7 @@ create_link_button (GtkWidget *about,
g_object_set_data_full (G_OBJECT (button), "url", g_strdup (url), g_free); g_object_set_data_full (G_OBJECT (button), "url", g_strdup (url), g_free);
set_link_button_text (about, button, text); set_link_button_text (about, button, text);
g_signal_connect (G_OBJECT (button), "clicked", callback, data); g_signal_connect (button, "clicked", callback, data);
return button; return button;
} }
@ -1766,13 +1766,13 @@ add_credits_page (GtkAboutDialog *about,
gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 8); gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 8);
gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 8); gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 8);
g_signal_connect (G_OBJECT (view), "key-press-event", g_signal_connect (view, "key-press-event",
G_CALLBACK (credits_key_press_event), about); G_CALLBACK (credits_key_press_event), about);
g_signal_connect (G_OBJECT (view), "event-after", g_signal_connect (view, "event-after",
G_CALLBACK (credits_event_after), about); G_CALLBACK (credits_event_after), about);
g_signal_connect (G_OBJECT (view), "motion-notify-event", g_signal_connect (view, "motion-notify-event",
G_CALLBACK (credits_motion_notify_event), about); G_CALLBACK (credits_motion_notify_event), about);
g_signal_connect (G_OBJECT (view), "visibility-notify-event", g_signal_connect (view, "visibility-notify-event",
G_CALLBACK (credits_visibility_notify_event), about); G_CALLBACK (credits_visibility_notify_event), about);
sw = gtk_scrolled_window_new (NULL, NULL); sw = gtk_scrolled_window_new (NULL, NULL);
@ -2010,14 +2010,14 @@ close_cb (GtkAboutDialog *about)
GtkWidget * GtkWidget *
gtk_about_dialog_new (void) gtk_about_dialog_new (void)
{ {
GtkAboutDialog *dialog = GTK_ABOUT_DIALOG (g_object_new (GTK_TYPE_ABOUT_DIALOG, NULL)); GtkAboutDialog *dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG, NULL);
/* force defaults */ /* force defaults */
gtk_about_dialog_set_name (dialog, NULL); gtk_about_dialog_set_name (dialog, NULL);
gtk_about_dialog_set_logo (dialog, NULL); gtk_about_dialog_set_logo (dialog, NULL);
/* Close dialog on user response */ /* Close dialog on user response */
g_signal_connect (G_OBJECT (dialog), g_signal_connect (dialog,
"response", "response",
G_CALLBACK (close_cb), G_CALLBACK (close_cb),
NULL); NULL);
@ -2119,7 +2119,7 @@ gtk_show_about_dialog (GtkWindow *parent,
{ {
dialog = gtk_about_dialog_new (); dialog = gtk_about_dialog_new ();
g_object_ref (G_OBJECT (dialog)); g_object_ref (dialog);
gtk_object_sink (GTK_OBJECT (dialog)); gtk_object_sink (GTK_OBJECT (dialog));
g_signal_connect (dialog, "delete_event", G_CALLBACK (gtk_widget_hide_on_delete), NULL); g_signal_connect (dialog, "delete_event", G_CALLBACK (gtk_widget_hide_on_delete), NULL);

8
gtk/gtkaction.c
View File

@ -836,7 +836,7 @@ connect_proxy (GtkAction *action,
NULL); NULL);
if (GTK_IS_ACCEL_LABEL (label) && action->private_data->accel_quark) if (GTK_IS_ACCEL_LABEL (label) && action->private_data->accel_quark)
g_object_set (G_OBJECT (label), g_object_set (label,
"accel_closure", action->private_data->accel_closure, "accel_closure", action->private_data->accel_closure,
NULL); NULL);
@ -879,7 +879,7 @@ connect_proxy (GtkAction *action,
{ {
/* toolbar item specific synchronisers ... */ /* toolbar item specific synchronisers ... */
g_object_set (G_OBJECT (proxy), g_object_set (proxy,
"visible_horizontal", action->private_data->visible_horizontal, "visible_horizontal", action->private_data->visible_horizontal,
"visible_vertical", action->private_data->visible_vertical, "visible_vertical", action->private_data->visible_vertical,
"is_important", action->private_data->is_important, "is_important", action->private_data->is_important,
@ -909,7 +909,7 @@ connect_proxy (GtkAction *action,
/* toolbar button specific synchronisers ... */ /* toolbar button specific synchronisers ... */
if (GTK_IS_TOOL_BUTTON (proxy)) if (GTK_IS_TOOL_BUTTON (proxy))
{ {
g_object_set (G_OBJECT (proxy), g_object_set (proxy,
"label", action->private_data->short_label, "label", action->private_data->short_label,
"use_underline", TRUE, "use_underline", TRUE,
"stock_id", action->private_data->stock_id, "stock_id", action->private_data->stock_id,
@ -933,7 +933,7 @@ connect_proxy (GtkAction *action,
/* button specific synchronisers ... */ /* button specific synchronisers ... */
/* synchronise the label */ /* synchronise the label */
g_object_set (G_OBJECT (proxy), g_object_set (proxy,
"label", action->private_data->short_label, "label", action->private_data->short_label,
"use_underline", TRUE, "use_underline", TRUE,
NULL); NULL);

2
gtk/gtkactiongroup.c
View File

@ -546,7 +546,7 @@ gtk_action_group_add_action (GtkActionGroup *action_group,
g_hash_table_insert (action_group->private_data->actions, g_hash_table_insert (action_group->private_data->actions,
g_strdup (gtk_action_get_name (action)), g_strdup (gtk_action_get_name (action)),
g_object_ref (action)); g_object_ref (action));
g_object_set (G_OBJECT (action), "action_group", action_group, NULL); g_object_set (action, "action_group", action_group, NULL);
} }
/** /**

8
gtk/gtkcellrendererprogress.c
View File

@ -163,7 +163,7 @@ gtk_cell_renderer_progress_init (GtkCellRendererProgress *cellprogress)
GtkCellRenderer* GtkCellRenderer*
gtk_cell_renderer_progress_new (void) gtk_cell_renderer_progress_new (void)
{ {
return GTK_CELL_RENDERER (g_object_new (GTK_TYPE_CELL_RENDERER_PROGRESS, NULL)); return g_object_new (GTK_TYPE_CELL_RENDERER_PROGRESS, NULL);
} }
static void static void
@ -272,7 +272,7 @@ compute_dimensions (GtkCellRenderer *cell,
if (height) if (height)
*height = logical_rect.height + cell->ypad * 2 + widget->style->ythickness * 2; *height = logical_rect.height + cell->ypad * 2 + widget->style->ythickness * 2;
g_object_unref (G_OBJECT (layout)); g_object_unref (layout);
} }
static void static void
@ -372,7 +372,7 @@ gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
x + pos, y + (h - logical_rect.height)/2, x + pos, y + (h - logical_rect.height)/2,
layout); layout);
g_object_unref (G_OBJECT (layout)); g_object_unref (layout);
g_object_unref (G_OBJECT (gc)); g_object_unref (gc);
} }

14
gtk/gtkcellview.c
View File

@ -442,7 +442,7 @@ gtk_cell_view_expose (GtkWidget *widget,
widget->allocation.width, widget->allocation.width,
widget->allocation.height); widget->allocation.height);
g_object_unref (G_OBJECT (gc)); g_object_unref (gc);
} }
/* set cell data (if available) */ /* set cell data (if available) */
@ -594,7 +594,7 @@ gtk_cell_view_cell_layout_pack_start (GtkCellLayout *layout,
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer)); g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
g_return_if_fail (!gtk_cell_view_get_cell_info (cellview, renderer)); g_return_if_fail (!gtk_cell_view_get_cell_info (cellview, renderer));
g_object_ref (G_OBJECT (renderer)); g_object_ref (renderer);
gtk_object_sink (GTK_OBJECT (renderer)); gtk_object_sink (GTK_OBJECT (renderer));
info = g_new0 (GtkCellViewCellInfo, 1); info = g_new0 (GtkCellViewCellInfo, 1);
@ -617,7 +617,7 @@ gtk_cell_view_cell_layout_pack_end (GtkCellLayout *layout,
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer)); g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
g_return_if_fail (!gtk_cell_view_get_cell_info (cellview, renderer)); g_return_if_fail (!gtk_cell_view_get_cell_info (cellview, renderer));
g_object_ref (G_OBJECT (renderer)); g_object_ref (renderer);
gtk_object_sink (GTK_OBJECT (renderer)); gtk_object_sink (GTK_OBJECT (renderer));
info = g_new0 (GtkCellViewCellInfo, 1); info = g_new0 (GtkCellViewCellInfo, 1);
@ -659,7 +659,7 @@ gtk_cell_view_cell_layout_clear (GtkCellLayout *layout)
GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)cellview->priv->cell_list->data; GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)cellview->priv->cell_list->data;
gtk_cell_view_cell_layout_clear_attributes (layout, info->cell); gtk_cell_view_cell_layout_clear_attributes (layout, info->cell);
g_object_unref (G_OBJECT (info->cell)); g_object_unref (info->cell);
g_free (info); g_free (info);
cellview->priv->cell_list = g_list_delete_link (cellview->priv->cell_list, cellview->priv->cell_list = g_list_delete_link (cellview->priv->cell_list,
cellview->priv->cell_list); cellview->priv->cell_list);
@ -763,7 +763,7 @@ gtk_cell_view_new (void)
{ {
GtkCellView *cellview; GtkCellView *cellview;
cellview = GTK_CELL_VIEW (g_object_new (gtk_cell_view_get_type (), NULL)); cellview = g_object_new (gtk_cell_view_get_type (), NULL);
return GTK_WIDGET (cellview); return GTK_WIDGET (cellview);
} }
@ -964,14 +964,14 @@ gtk_cell_view_set_model (GtkCellView *cell_view,
gtk_tree_row_reference_free (cell_view->priv->displayed_row); gtk_tree_row_reference_free (cell_view->priv->displayed_row);
cell_view->priv->displayed_row = NULL; cell_view->priv->displayed_row = NULL;
g_object_unref (G_OBJECT (cell_view->priv->model)); g_object_unref (cell_view->priv->model);
cell_view->priv->model = NULL; cell_view->priv->model = NULL;
} }
cell_view->priv->model = model; cell_view->priv->model = model;
if (cell_view->priv->model) if (cell_view->priv->model)
g_object_ref (G_OBJECT (cell_view->priv->model)); g_object_ref (cell_view->priv->model);
} }
/** /**

2
gtk/gtkcolorbutton.c
View File

@ -613,7 +613,7 @@ gtk_color_button_finalize (GObject *object)
GtkColorButton *color_button = GTK_COLOR_BUTTON (object); GtkColorButton *color_button = GTK_COLOR_BUTTON (object);
if (color_button->priv->gc != NULL) if (color_button->priv->gc != NULL)
g_object_unref (G_OBJECT (color_button->priv->gc)); g_object_unref (color_button->priv->gc);
color_button->priv->gc = NULL; color_button->priv->gc = NULL;
if (color_button->priv->cs_dialog != NULL) if (color_button->priv->cs_dialog != NULL)

34
gtk/gtkcombobox.c
View File

@ -1076,7 +1076,7 @@ gtk_combo_box_set_popup_widget (GtkComboBox *combo_box,
{ {
gtk_container_remove (GTK_CONTAINER (combo_box->priv->popup_frame), gtk_container_remove (GTK_CONTAINER (combo_box->priv->popup_frame),
combo_box->priv->popup_widget); combo_box->priv->popup_widget);
g_object_unref (G_OBJECT (combo_box->priv->popup_widget)); g_object_unref (combo_box->priv->popup_widget);
combo_box->priv->popup_widget = NULL; combo_box->priv->popup_widget = NULL;
} }
@ -1140,7 +1140,7 @@ gtk_combo_box_set_popup_widget (GtkComboBox *combo_box,
popup); popup);
gtk_widget_show (popup); gtk_widget_show (popup);
g_object_ref (G_OBJECT (popup)); g_object_ref (popup);
combo_box->priv->popup_widget = popup; combo_box->priv->popup_widget = popup;
} }
} }
@ -1396,7 +1396,7 @@ cell_view_is_sensitive (GtkCellView *cell_view)
list = cells; list = cells;
while (list) while (list)
{ {
g_object_get (G_OBJECT (list->data), "sensitive", &sensitive, NULL); g_object_get (list->data, "sensitive", &sensitive, NULL);
if (sensitive) if (sensitive)
break; break;
@ -1435,7 +1435,7 @@ tree_column_row_is_sensitive (GtkComboBox *combo_box,
list = cells; list = cells;
while (list) while (list)
{ {
g_object_get (G_OBJECT (list->data), "sensitive", &sensitive, NULL); g_object_get (list->data, "sensitive", &sensitive, NULL);
if (sensitive) if (sensitive)
break; break;
@ -1482,8 +1482,8 @@ update_menu_sensitivity (GtkComboBox *combo_box,
if (menu != combo_box->priv->popup_widget && child == children) if (menu != combo_box->priv->popup_widget && child == children)
{ {
separator = GTK_WIDGET (child->next->data); separator = GTK_WIDGET (child->next->data);
g_object_set (G_OBJECT (item), "visible", sensitive, NULL); g_object_set (item, "visible", sensitive, NULL);
g_object_set (G_OBJECT (separator), "visible", sensitive, NULL); g_object_set (separator, "visible", sensitive, NULL);
} }
else else
gtk_widget_set_sensitive (item, sensitive); gtk_widget_set_sensitive (item, sensitive);
@ -1984,7 +1984,7 @@ gtk_combo_box_unset_model (GtkComboBox *combo_box)
if (combo_box->priv->model) if (combo_box->priv->model)
{ {
g_object_unref (G_OBJECT (combo_box->priv->model)); g_object_unref (combo_box->priv->model);
combo_box->priv->model = NULL; combo_box->priv->model = NULL;
} }
@ -3225,7 +3225,7 @@ gtk_combo_box_list_destroy (GtkComboBox *combo_box)
if (combo_box->priv->cell_view) if (combo_box->priv->cell_view)
{ {
g_object_set (G_OBJECT (combo_box->priv->cell_view), g_object_set (combo_box->priv->cell_view,
"background_set", FALSE, "background_set", FALSE,
NULL); NULL);
} }
@ -3634,7 +3634,7 @@ gtk_combo_box_cell_layout_pack_start (GtkCellLayout *layout,
combo_box = GTK_COMBO_BOX (layout); combo_box = GTK_COMBO_BOX (layout);
g_object_ref (G_OBJECT (cell)); g_object_ref (cell);
gtk_object_sink (GTK_OBJECT (cell)); gtk_object_sink (GTK_OBJECT (cell));
info = g_new0 (ComboCellInfo, 1); info = g_new0 (ComboCellInfo, 1);
@ -3691,7 +3691,7 @@ gtk_combo_box_cell_layout_pack_end (GtkCellLayout *layout,
combo_box = GTK_COMBO_BOX (layout); combo_box = GTK_COMBO_BOX (layout);
g_object_ref (G_OBJECT (cell)); g_object_ref (cell);
gtk_object_sink (GTK_OBJECT (cell)); gtk_object_sink (GTK_OBJECT (cell));
info = g_new0 (ComboCellInfo, 1); info = g_new0 (ComboCellInfo, 1);
@ -3753,7 +3753,7 @@ gtk_combo_box_cell_layout_clear (GtkCellLayout *layout)
ComboCellInfo *info = (ComboCellInfo *)i->data; ComboCellInfo *info = (ComboCellInfo *)i->data;
gtk_combo_box_cell_layout_clear_attributes (layout, info->cell); gtk_combo_box_cell_layout_clear_attributes (layout, info->cell);
g_object_unref (G_OBJECT (info->cell)); g_object_unref (info->cell);
g_free (info); g_free (info);
i->data = NULL; i->data = NULL;
} }
@ -3842,7 +3842,7 @@ combo_cell_data_func (GtkCellLayout *cell_layout,
if (GTK_IS_MENU_ITEM (parent) && if (GTK_IS_MENU_ITEM (parent) &&
gtk_menu_item_get_submenu (GTK_MENU_ITEM (parent))) gtk_menu_item_get_submenu (GTK_MENU_ITEM (parent)))
g_object_set (G_OBJECT (cell), "sensitive", TRUE, NULL); g_object_set (cell, "sensitive", TRUE, NULL);
} }
@ -4057,7 +4057,7 @@ gtk_combo_box_cell_layout_reorder (GtkCellLayout *layout,
GtkWidget * GtkWidget *
gtk_combo_box_new (void) gtk_combo_box_new (void)
{ {
return GTK_WIDGET (g_object_new (GTK_TYPE_COMBO_BOX, NULL)); return g_object_new (GTK_TYPE_COMBO_BOX, NULL);
} }
/** /**
@ -4077,9 +4077,7 @@ gtk_combo_box_new_with_model (GtkTreeModel *model)
g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL); g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
combo_box = GTK_COMBO_BOX (g_object_new (GTK_TYPE_COMBO_BOX, combo_box = g_object_new (GTK_TYPE_COMBO_BOX, "model", model, NULL);
"model", model,
NULL));
return GTK_WIDGET (combo_box); return GTK_WIDGET (combo_box);
} }
@ -4454,7 +4452,7 @@ gtk_combo_box_set_model (GtkComboBox *combo_box,
gtk_combo_box_unset_model (combo_box); gtk_combo_box_unset_model (combo_box);
combo_box->priv->model = model; combo_box->priv->model = model;
g_object_ref (G_OBJECT (combo_box->priv->model)); g_object_ref (combo_box->priv->model);
combo_box->priv->inserted_id = combo_box->priv->inserted_id =
g_signal_connect (combo_box->priv->model, "row_inserted", g_signal_connect (combo_box->priv->model, "row_inserted",
@ -4766,7 +4764,7 @@ gtk_combo_box_finalize (GObject *object)
} }
g_slist_free (info->attributes); g_slist_free (info->attributes);
g_object_unref (G_OBJECT (info->cell)); g_object_unref (info->cell);
g_free (info); g_free (info);
} }
g_slist_free (combo_box->priv->cells); g_slist_free (combo_box->priv->cells);

2
gtk/gtkcomboboxentry.c
View File

@ -262,7 +262,7 @@ gtk_combo_box_entry_contents_changed (GtkEntry *entry,
GtkWidget * GtkWidget *
gtk_combo_box_entry_new (void) gtk_combo_box_entry_new (void)
{ {
return GTK_WIDGET (g_object_new (gtk_combo_box_entry_get_type (), NULL)); return g_object_new (gtk_combo_box_entry_get_type (), NULL);
} }
/** /**

6
gtk/gtkentrycompletion.c
View File

@ -837,12 +837,12 @@ gtk_entry_completion_action_data_func (GtkTreeViewColumn *tree_column,
return; return;
if (markup) if (markup)
g_object_set (G_OBJECT (cell), g_object_set (cell,
"text", NULL, "text", NULL,
"markup", string, "markup", string,
NULL); NULL);
else else
g_object_set (G_OBJECT (cell), g_object_set (cell,
"markup", NULL, "markup", NULL,
"text", string, "text", string,
NULL); NULL);
@ -952,7 +952,7 @@ gtk_entry_completion_set_model (GtkEntryCompletion *completion,
gtk_tree_view_set_model (GTK_TREE_VIEW (completion->priv->tree_view), gtk_tree_view_set_model (GTK_TREE_VIEW (completion->priv->tree_view),
GTK_TREE_MODEL (completion->priv->filter_model)); GTK_TREE_MODEL (completion->priv->filter_model));
g_object_unref (G_OBJECT (completion->priv->filter_model)); g_object_unref (completion->priv->filter_model);
if (GTK_WIDGET_VISIBLE (completion->priv->popup_window)) if (GTK_WIDGET_VISIBLE (completion->priv->popup_window))
_gtk_entry_completion_resize_popup (completion); _gtk_entry_completion_resize_popup (completion);

4
gtk/gtkfilechooserbutton.c
View File

@ -512,14 +512,14 @@ gtk_file_chooser_button_set_property (GObject *object,
g_warning ("%s: Choosers of type `%s` do not support `%s'.", g_warning ("%s: Choosers of type `%s` do not support `%s'.",
G_STRFUNC, G_OBJECT_TYPE_NAME (object), eval->value_name); G_STRFUNC, G_OBJECT_TYPE_NAME (object), eval->value_name);
g_value_set_enum (value, GTK_FILE_CHOOSER_ACTION_OPEN); g_value_set_enum ((GValue *) value, GTK_FILE_CHOOSER_ACTION_OPEN);
} }
break; break;
} }
g_object_set_property (G_OBJECT (priv->dialog), pspec->name, value); g_object_set_property (G_OBJECT (priv->dialog), pspec->name, value);
_gtk_file_chooser_entry_set_action (GTK_FILE_CHOOSER_ENTRY (priv->entry), _gtk_file_chooser_entry_set_action (GTK_FILE_CHOOSER_ENTRY (priv->entry),
(GtkFileChooserAction) g_value_get_enum (value)); g_value_get_enum (value));
update_icons (GTK_FILE_CHOOSER_BUTTON (object)); update_icons (GTK_FILE_CHOOSER_BUTTON (object));
switch (g_value_get_enum (value)) switch (g_value_get_enum (value))

2
gtk/gtkfilechooserdefault.c
View File

@ -3708,7 +3708,7 @@ gtk_file_chooser_default_set_property (GObject *object,
if (action != impl->action) if (action != impl->action)
{ {
gtk_file_chooser_default_unselect_all (impl); gtk_file_chooser_default_unselect_all (GTK_FILE_CHOOSER (impl));
if (action == GTK_FILE_CHOOSER_ACTION_SAVE && impl->select_multiple) if (action == GTK_FILE_CHOOSER_ACTION_SAVE && impl->select_multiple)
{ {

4
gtk/gtkmenutoolbutton.c
View File

@ -265,7 +265,7 @@ button_state_changed_cb (GtkWidget *widget,
other = (widget == priv->arrow_button) ? priv->button : priv->arrow_button; other = (widget == priv->arrow_button) ? priv->button : priv->arrow_button;
g_signal_handlers_block_by_func (G_OBJECT (other), g_signal_handlers_block_by_func (other,
G_CALLBACK (button_state_changed_cb), G_CALLBACK (button_state_changed_cb),
button); button);
@ -282,7 +282,7 @@ button_state_changed_cb (GtkWidget *widget,
gtk_widget_set_state (other, GTK_STATE_NORMAL); gtk_widget_set_state (other, GTK_STATE_NORMAL);
} }
g_signal_handlers_unblock_by_func (G_OBJECT (other), g_signal_handlers_unblock_by_func (other,
G_CALLBACK (button_state_changed_cb), G_CALLBACK (button_state_changed_cb),
button); button);
} }

2
gtk/gtkrc.c
View File

@ -1117,7 +1117,7 @@ gtk_rc_style_unref (GtkRcStyle *rc_style)
static GtkRcStyle * static GtkRcStyle *
gtk_rc_style_real_create_rc_style (GtkRcStyle *style) gtk_rc_style_real_create_rc_style (GtkRcStyle *style)
{ {
return GTK_RC_STYLE (g_object_new (G_OBJECT_TYPE (style), NULL)); return g_object_new (G_OBJECT_TYPE (style), NULL);
} }
static gint static gint

2
gtk/gtksettings.c
View File

@ -146,7 +146,7 @@ gtk_default_substitute (FcPattern *pattern,
gint dpi; gint dpi;
FcValue v; FcValue v;
g_object_get (G_OBJECT (settings), g_object_get (settings,
"gtk-xft-antialias", &antialias, "gtk-xft-antialias", &antialias,
"gtk-xft-hinting", &hinting, "gtk-xft-hinting", &hinting,
"gtk-xft-hintstyle", &hintstyle, "gtk-xft-hintstyle", &hintstyle,

4
gtk/gtkstyle.c
View File

@ -1668,7 +1668,7 @@ gtk_style_set_background (GtkStyle *style,
static GtkStyle * static GtkStyle *
gtk_style_real_clone (GtkStyle *style) gtk_style_real_clone (GtkStyle *style)
{ {
return GTK_STYLE (g_object_new (G_OBJECT_TYPE (style), NULL)); return g_object_new (G_OBJECT_TYPE (style), NULL);
} }
static void static void
@ -4950,7 +4950,7 @@ gtk_default_draw_handle (GtkStyle *style,
out: out:
if (free_me) if (free_me)
g_object_unref (G_OBJECT (free_me)); g_object_unref (free_me);
} }
static void static void

4
gtk/gtktoggletoolbutton.c
View File

@ -218,7 +218,7 @@ menu_item_activated (GtkWidget *menu_item,
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_tool_button_get_button (tool_button)), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_tool_button_get_button (tool_button)),
toggle_tool_button->priv->active); toggle_tool_button->priv->active);
g_signal_emit (G_OBJECT (toggle_tool_button), toggle_signals[TOGGLED], 0); g_signal_emit (toggle_tool_button, toggle_signals[TOGGLED], 0);
} }
} }
@ -241,7 +241,7 @@ button_toggled (GtkWidget *widget,
toggle_tool_button->priv->active); toggle_tool_button->priv->active);
} }
g_signal_emit (G_OBJECT (toggle_tool_button), toggle_signals[TOGGLED], 0); g_signal_emit (toggle_tool_button, toggle_signals[TOGGLED], 0);
} }
} }

8
gtk/gtktoolbutton.c
View File

@ -347,7 +347,7 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
if (GTK_IS_IMAGE (icon)) if (GTK_IS_IMAGE (icon))
{ {
g_object_set (G_OBJECT (button->priv->icon_widget), g_object_set (button->priv->icon_widget,
"icon-size", icon_size, "icon-size", icon_size,
NULL); NULL);
} }
@ -482,10 +482,10 @@ gtk_tool_button_finalize (GObject *object)
g_free (button->priv->label_text); g_free (button->priv->label_text);
if (button->priv->label_widget) if (button->priv->label_widget)
g_object_unref (G_OBJECT (button->priv->label_widget)); g_object_unref (button->priv->label_widget);
if (button->priv->icon_widget) if (button->priv->icon_widget)
g_object_unref (G_OBJECT (button->priv->icon_widget)); g_object_unref (button->priv->icon_widget);
parent_class->finalize (object); parent_class->finalize (object);
} }
@ -839,7 +839,7 @@ gtk_tool_button_set_icon_widget (GtkToolButton *button,
button->priv->icon_widget); button->priv->icon_widget);
} }
g_object_unref (G_OBJECT (button->priv->icon_widget)); g_object_unref (button->priv->icon_widget);
} }
if (icon_widget) if (icon_widget)

2
gtk/gtktoolitem.c
View File

@ -1104,7 +1104,7 @@ gtk_tool_item_set_proxy_menu_item (GtkToolItem *tool_item,
if (tool_item->priv->menu_item != menu_item) if (tool_item->priv->menu_item != menu_item)
{ {
if (tool_item->priv->menu_item) if (tool_item->priv->menu_item)
g_object_unref (G_OBJECT (tool_item->priv->menu_item)); g_object_unref (tool_item->priv->menu_item);
if (menu_item) if (menu_item)
{ {

22
gtk/gtktreemodelfilter.c
View File

@ -2331,15 +2331,15 @@ gtk_tree_model_filter_set_model (GtkTreeModelFilter *filter,
if (filter->priv->child_model) if (filter->priv->child_model)
{ {
g_signal_handler_disconnect (G_OBJECT (filter->priv->child_model), g_signal_handler_disconnect (filter->priv->child_model,
filter->priv->changed_id); filter->priv->changed_id);
g_signal_handler_disconnect (G_OBJECT (filter->priv->child_model), g_signal_handler_disconnect (filter->priv->child_model,
filter->priv->inserted_id); filter->priv->inserted_id);
g_signal_handler_disconnect (G_OBJECT (filter->priv->child_model), g_signal_handler_disconnect (filter->priv->child_model,
filter->priv->has_child_toggled_id); filter->priv->has_child_toggled_id);
g_signal_handler_disconnect (G_OBJECT (filter->priv->child_model), g_signal_handler_disconnect (filter->priv->child_model,
filter->priv->deleted_id); filter->priv->deleted_id);
g_signal_handler_disconnect (G_OBJECT (filter->priv->child_model), g_signal_handler_disconnect (filter->priv->child_model,
filter->priv->reordered_id); filter->priv->reordered_id);
/* reset our state */ /* reset our state */
@ -2347,7 +2347,7 @@ gtk_tree_model_filter_set_model (GtkTreeModelFilter *filter,
gtk_tree_model_filter_free_level (filter, filter->priv->root); gtk_tree_model_filter_free_level (filter, filter->priv->root);
filter->priv->root = NULL; filter->priv->root = NULL;
g_object_unref (G_OBJECT (filter->priv->child_model)); g_object_unref (filter->priv->child_model);
filter->priv->visible_column = -1; filter->priv->visible_column = -1;
/* FIXME: destroy more crack here? the funcs? */ /* FIXME: destroy more crack here? the funcs? */
} }
@ -2356,7 +2356,7 @@ gtk_tree_model_filter_set_model (GtkTreeModelFilter *filter,
if (child_model) if (child_model)
{ {
g_object_ref (G_OBJECT (filter->priv->child_model)); g_object_ref (filter->priv->child_model);
filter->priv->changed_id = filter->priv->changed_id =
g_signal_connect (child_model, "row_changed", g_signal_connect (child_model, "row_changed",
G_CALLBACK (gtk_tree_model_filter_row_changed), G_CALLBACK (gtk_tree_model_filter_row_changed),
@ -2417,10 +2417,10 @@ gtk_tree_model_filter_new (GtkTreeModel *child_model,
g_return_val_if_fail (GTK_IS_TREE_MODEL (child_model), NULL); g_return_val_if_fail (GTK_IS_TREE_MODEL (child_model), NULL);
retval = GTK_TREE_MODEL (g_object_new (GTK_TYPE_TREE_MODEL_FILTER, retval = g_object_new (GTK_TYPE_TREE_MODEL_FILTER,
"child_model", child_model, "child_model", child_model,
"virtual_root", root, "virtual_root", root,
NULL)); NULL);
return retval; return retval;
} }

4
gtk/gtktreeselection.c
View File

@ -1304,8 +1304,8 @@ tree_column_is_sensitive (GtkTreeViewColumn *column,
list = cells; list = cells;
while (list) while (list)
{ {
g_object_get (G_OBJECT (list->data), g_object_get (list->data,
"sensitive", &sensitive, "sensitive", &sensitive,
"visible", &visible, "visible", &visible,
NULL); NULL);

2
gtk/gtktreeviewcolumn.c
View File

@ -692,7 +692,7 @@ gtk_tree_view_column_cell_layout_clear (GtkCellLayout *cell_layout)
GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)column->cell_list->data; GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)column->cell_list->data;
gtk_tree_view_column_cell_layout_clear_attributes (cell_layout, info->cell); gtk_tree_view_column_cell_layout_clear_attributes (cell_layout, info->cell);
g_object_unref (G_OBJECT (info->cell)); g_object_unref (info->cell);
g_free (info); g_free (info);
column->cell_list = g_list_delete_link (column->cell_list, column->cell_list = g_list_delete_link (column->cell_list,
column->cell_list); column->cell_list);

6
gtk/gtkuimanager.c
View File

@ -2380,7 +2380,7 @@ update_node (GtkUIManager *self,
{ {
/* don't show accels in popups */ /* don't show accels in popups */
GtkWidget *label = GTK_BIN (info->proxy)->child; GtkWidget *label = GTK_BIN (info->proxy)->child;
g_object_set (G_OBJECT (label), g_object_set (label,
"accel_closure", NULL, "accel_closure", NULL,
NULL); NULL);
} }
@ -2420,8 +2420,8 @@ update_node (GtkUIManager *self,
* tooltips on toolitems can't be set before the toolitem * tooltips on toolitems can't be set before the toolitem
* is added to the toolbar. * is added to the toolbar.
*/ */
g_object_get (G_OBJECT (action), "tooltip", &tooltip, NULL); g_object_get (action, "tooltip", &tooltip, NULL);
g_object_set (G_OBJECT (action), "tooltip", tooltip, NULL); g_object_set (action, "tooltip", tooltip, NULL);
g_free (tooltip); g_free (tooltip);
} }
} }