diff --git a/ChangeLog b/ChangeLog index 485a739aa6..36674823ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2008-07-04 Michael Natterer + + Fix make check: + + * gtk/Makefile.am: remove GTK_DISABLE_DEPRECATED from INCLUDES + again :-( + + * gtk/gtkclist.c + * gtk/gtkcombo.c + * gtk/gtkctree.c + * gtk/gtklist.c + * gtk/gtklistitem.c + * gtk/gtknotebook.c + * gtk/gtkobject.c + * gtk/gtkoldeditable.c + * gtk/gtkpixmap.c + * gtk/gtktext.c + * gtk/gtktree.c + * gtk/gtktreeitem.c: don't #define it again before including + gtkalias.h after it has been #undef'ed before. + 2008-07-04 Michael Natterer * gtk/gtkentry.c (_gtk_entry_reset_im_context): set need_im_reset diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 2d11750a2b..9b4a017139 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -35,7 +35,6 @@ INCLUDES = \ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(GTK_DEBUG_FLAGS) \ diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 796f3c99b5..4c23fc351b 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -34,8 +34,6 @@ #include -#undef GTK_DISABLE_DEPRECATED - #include "gtkmain.h" #include "gtkobject.h" #include "gtkctree.h" @@ -45,7 +43,6 @@ #include "gtkmarshalers.h" #include "gtkintl.h" -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" /* length of button_actions array */ @@ -1162,7 +1159,7 @@ gtk_clist_set_hadjustment (GtkCList *clist, if (clist->hadjustment) { gtk_signal_disconnect_by_data (GTK_OBJECT (clist->hadjustment), clist); - gtk_object_unref (GTK_OBJECT (clist->hadjustment)); + g_object_unref (clist->hadjustment); } clist->hadjustment = adjustment; @@ -1209,7 +1206,7 @@ gtk_clist_set_vadjustment (GtkCList *clist, if (clist->vadjustment) { gtk_signal_disconnect_by_data (GTK_OBJECT (clist->vadjustment), clist); - gtk_object_unref (GTK_OBJECT (clist->vadjustment)); + g_object_unref (clist->vadjustment); } clist->vadjustment = adjustment; @@ -2598,7 +2595,7 @@ cell_size_request (GtkCList *clist, requisition->width = logical_rect.width; requisition->height = logical_rect.height; - g_object_unref (G_OBJECT (layout)); + g_object_unref (layout); } else { @@ -4384,13 +4381,13 @@ gtk_clist_destroy (GtkObject *object) if (clist->hadjustment) { gtk_signal_disconnect_by_data (GTK_OBJECT (clist->hadjustment), clist); - gtk_object_unref (GTK_OBJECT (clist->hadjustment)); + g_object_unref (clist->hadjustment); clist->hadjustment = NULL; } if (clist->vadjustment) { gtk_signal_disconnect_by_data (GTK_OBJECT (clist->vadjustment), clist); - gtk_object_unref (GTK_OBJECT (clist->vadjustment)); + g_object_unref (clist->vadjustment); clist->vadjustment = NULL; } @@ -5852,7 +5849,7 @@ draw_row (GtkCList *clist, offset, row_rectangle.y + row_center_offset + clist_row->cell[i].vertical, layout); - g_object_unref (G_OBJECT (layout)); + g_object_unref (layout); gdk_gc_set_clip_rectangle (fg_gc, NULL); } break; diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index 0afdff3b97..890855cc05 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -50,7 +50,6 @@ #include "gtkprivate.h" #include "gtkintl.h" -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" static const gchar gtk_combo_string_key[] = "gtk-combo-string-value"; diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 7d8e7e137f..3d1c105a4b 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -29,7 +29,6 @@ */ #undef GDK_DISABLE_DEPRECATED -#undef GTK_DISABLE_DEPRECATED #include "config.h" #include @@ -41,7 +40,6 @@ #include "gtkintl.h" #include -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" #define PM_SIZE 8 diff --git a/gtk/gtklist.c b/gtk/gtklist.c index 1d8a804bb6..839da5e3c0 100644 --- a/gtk/gtklist.c +++ b/gtk/gtklist.c @@ -24,8 +24,6 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#undef GTK_DISABLE_DEPRECATED - #include "config.h" #include /* memset */ @@ -37,7 +35,6 @@ #include "gtkmarshalers.h" #include "gtkintl.h" -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" enum { @@ -872,7 +869,7 @@ gtk_list_set_focus_child (GtkContainer *container, if (container->focus_child) { list->last_focus_child = container->focus_child; - gtk_widget_unref (container->focus_child); + g_object_unref (container->focus_child); } container->focus_child = child; if (container->focus_child) @@ -1184,7 +1181,7 @@ gtk_list_clear_items (GtkList *list, if (widget == list->last_focus_child) list->last_focus_child = NULL; - gtk_widget_unref (widget); + g_object_unref (widget); } g_list_free (start_list); @@ -1320,7 +1317,7 @@ gtk_list_remove_items_internal (GtkList *list, if (widget == list->last_focus_child) list->last_focus_child = NULL; - gtk_widget_unref (widget); + g_object_unref (widget); } if (new_focus_child && new_focus_child != old_focus_child) @@ -2505,7 +2502,7 @@ gtk_list_signal_item_deselect (GtkListItem *list_item, { list->selection = g_list_remove_link (list->selection, node); g_list_free_1 (node); - gtk_widget_unref (GTK_WIDGET (list_item)); + g_object_unref (list_item); gtk_signal_emit (GTK_OBJECT (list), list_signals[SELECTION_CHANGED]); } } diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c index 4dd304bd68..370c746ca0 100644 --- a/gtk/gtklistitem.c +++ b/gtk/gtklistitem.c @@ -28,8 +28,6 @@ #include -#undef GTK_DISABLE_DEPRECATED - #include "gtkbindings.h" #include "gtklabel.h" #include "gtklistitem.h" @@ -38,7 +36,6 @@ #include "gtksignal.h" #include "gtkintl.h" -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index be072c18d7..b623e15ea3 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -46,7 +46,6 @@ #include "gtkdnd.h" #include "gtkbuildable.h" -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" #define SCROLL_DELAY_FACTOR 5 diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index a2dde92d84..c960d8f203 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -37,7 +37,6 @@ #include "gtkmarshalers.h" #include "gtkprivate.h" -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c index 5ccb9deb6e..139dd4d766 100644 --- a/gtk/gtkoldeditable.c +++ b/gtk/gtkoldeditable.c @@ -38,7 +38,6 @@ #include "gtksignal.h" #include "gtkintl.h" -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" #define MIN_EDITABLE_WIDTH 150 @@ -397,7 +396,7 @@ gtk_old_editable_insert_text (GtkEditable *editable, if (new_text_length > 63) g_free (text); - gtk_widget_unref (GTK_WIDGET (editable)); + g_object_unref (editable); } static void @@ -416,7 +415,7 @@ gtk_old_editable_delete_text (GtkEditable *editable, old_editable->has_selection) gtk_old_editable_claim_selection (old_editable, FALSE, GDK_CURRENT_TIME); - gtk_widget_unref (GTK_WIDGET (old_editable)); + g_object_unref (old_editable); } static void diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c index 2190f88aed..774570fb79 100644 --- a/gtk/gtkpixmap.c +++ b/gtk/gtkpixmap.c @@ -28,7 +28,6 @@ */ #undef GDK_DISABLE_DEPRECATED -#undef GTK_DISABLE_DEPRECATED #include "config.h" #include @@ -36,7 +35,6 @@ #include "gtkpixmap.h" #include "gtkintl.h" -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" diff --git a/gtk/gtktext.c b/gtk/gtktext.c index 8d34911f28..2c2bfc6be6 100644 --- a/gtk/gtktext.c +++ b/gtk/gtktext.c @@ -48,7 +48,6 @@ #include "gtkprivate.h" #include "gtkintl.h" -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" @@ -797,13 +796,13 @@ gtk_text_set_adjustments (GtkText *text, if (text->hadj && (text->hadj != hadj)) { gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text); - gtk_object_unref (GTK_OBJECT (text->hadj)); + g_object_unref (text->hadj); } if (text->vadj && (text->vadj != vadj)) { gtk_signal_disconnect_by_data (GTK_OBJECT (text->vadj), text); - gtk_object_unref (GTK_OBJECT (text->vadj)); + g_object_unref (text->vadj); } g_object_freeze_notify (G_OBJECT (text)); @@ -1175,13 +1174,13 @@ gtk_text_destroy (GtkObject *object) if (text->hadj) { gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text); - gtk_object_unref (GTK_OBJECT (text->hadj)); + g_object_unref (text->hadj); text->hadj = NULL; } if (text->vadj) { gtk_signal_disconnect_by_data (GTK_OBJECT (text->vadj), text); - gtk_object_unref (GTK_OBJECT (text->vadj)); + g_object_unref (text->vadj); text->vadj = NULL; } diff --git a/gtk/gtktree.c b/gtk/gtktree.c index 56c63216a3..08528dc282 100644 --- a/gtk/gtktree.c +++ b/gtk/gtktree.c @@ -37,7 +37,6 @@ #include "gtktreeitem.h" #include "gtkintl.h" -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" enum { @@ -395,7 +394,7 @@ gtk_tree_destroy (GtkObject *object) gtk_widget_ref (child); gtk_widget_unparent (child); gtk_widget_destroy (child); - gtk_widget_unref (child); + g_object_unref (child); } g_list_free (tree->children); @@ -405,7 +404,7 @@ gtk_tree_destroy (GtkObject *object) { GList *node; for (node = tree->selection; node; node = node->next) - gtk_widget_unref ((GtkWidget *)node->data); + g_object_unref (node->data); g_list_free (tree->selection); tree->selection = NULL; } @@ -459,7 +458,7 @@ gtk_tree_unselect_all (GtkTree *tree) GTK_TREE (tmp_item->parent)->root_tree == tree) gtk_tree_item_deselect (GTK_TREE_ITEM (tmp_item)); - gtk_widget_unref (tmp_item); + g_object_unref (tmp_item); tmp_list = tmp_list->next; } @@ -778,7 +777,7 @@ gtk_tree_remove_items (GtkTree *tree, root_tree->selection = g_list_remove (root_tree->selection, widget); /* unref it to authorize is destruction */ - gtk_widget_unref (widget); + g_object_unref (widget); } /* emit only one selection_changed signal */ @@ -1011,7 +1010,7 @@ gtk_real_tree_select_child (GtkTree *tree, selection = selection->next; root_selection = g_list_remove_link (root_selection, tmp_list); - gtk_widget_unref (tmp_item); + g_object_unref (tmp_item); g_list_free (tmp_list); } @@ -1029,7 +1028,7 @@ gtk_real_tree_select_child (GtkTree *tree, { gtk_tree_item_deselect (GTK_TREE_ITEM (child)); root_selection = g_list_remove (root_selection, child); - gtk_widget_unref (child); + g_object_unref (child); } tree->root_tree->selection = root_selection; @@ -1054,7 +1053,7 @@ gtk_real_tree_select_child (GtkTree *tree, selection = selection->next; root_selection = g_list_remove_link (root_selection, tmp_list); - gtk_widget_unref (tmp_item); + g_object_unref (tmp_item); g_list_free (tmp_list); } @@ -1096,7 +1095,7 @@ gtk_real_tree_unselect_child (GtkTree *tree, GtkTree* root_tree = GTK_TREE_ROOT_TREE(tree); gtk_tree_item_deselect (GTK_TREE_ITEM (child)); root_tree->selection = g_list_remove (root_tree->selection, child); - gtk_widget_unref (child); + g_object_unref (child); gtk_signal_emit (GTK_OBJECT (tree->root_tree), tree_signals[SELECTION_CHANGED]); } diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c index c137e3482e..972066da58 100644 --- a/gtk/gtktreeitem.c +++ b/gtk/gtktreeitem.c @@ -39,7 +39,6 @@ #include "gtktreeitem.h" #include "gtkintl.h" -#define GTK_DISABLE_DEPRECATED #include "gtkalias.h" #include "tree_plus.xpm" @@ -851,7 +850,7 @@ gtk_tree_item_destroy (GtkObject *object) gtk_widget_ref (child); gtk_widget_unparent (child); gtk_widget_destroy (child); - gtk_widget_unref (child); + g_object_unref (child); item->subtree = NULL; } @@ -862,7 +861,7 @@ gtk_tree_item_destroy (GtkObject *object) gtk_widget_ref (child); gtk_widget_unparent (child); gtk_widget_destroy (child); - gtk_widget_unref (child); + g_object_unref (child); item->pixmaps_box = NULL; } @@ -871,7 +870,7 @@ gtk_tree_item_destroy (GtkObject *object) if (item->plus_pix_widget) { gtk_widget_destroy (item->plus_pix_widget); - gtk_widget_unref (item->plus_pix_widget); + g_object_unref (item->plus_pix_widget); item->plus_pix_widget = NULL; } @@ -879,7 +878,7 @@ gtk_tree_item_destroy (GtkObject *object) if (item->minus_pix_widget) { gtk_widget_destroy (item->minus_pix_widget); - gtk_widget_unref (item->minus_pix_widget); + g_object_unref (item->minus_pix_widget); item->minus_pix_widget = NULL; }