callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove erroneously added g_return_if_fail (bug #541811).

Browse Source 
2008-07-07  Christian Dywan  <christian@imendio.com>

	* gtk/gtkcontainer.c (gtk_container_add_with_properties): Remove
	erroneously added g_return_if_fail (bug #541811).

svn path=/trunk/; revision=20792
This commit is contained in:
Christian Dywan 2008-07-06 22:24:24 +00:00 committed by Paul Pogonyshev
parent 75c668dbf2
commit bb396a07b2
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-07-07 Christian Dywan <christian@imendio.com>
* gtk/gtkcontainer.c (gtk_container_add_with_properties): Remove
erroneously added g_return_if_fail (bug #541811).
2008-07-06 Matthias Clasen <mclasen@redhat.com>
Bug 343663 – source-buffer highlighting highlights "char" in

12
gtk/gtkcomboboxentry.c
View File

@ -50,6 +50,7 @@ static void gtk_combo_box_entry_add (GtkContainer *contain
GtkWidget *child);
static void gtk_combo_box_entry_remove (GtkContainer *container,
GtkWidget *child);
static GType gtk_combo_box_entry_child_type (GtkContainer *container);
static gchar *gtk_combo_box_entry_get_active_text (GtkComboBox *combo_box);
static void gtk_combo_box_entry_active_changed (GtkComboBox *combo_box,
@ -96,6 +97,7 @@ gtk_combo_box_entry_class_init (GtkComboBoxEntryClass *klass)
container_class = (GtkContainerClass *)klass;
container_class->add = gtk_combo_box_entry_add;
container_class->remove = gtk_combo_box_entry_remove;
container_class->child_type = gtk_combo_box_entry_child_type;
combo_class = (GtkComboBoxClass *)klass;
combo_class->get_active_text = gtk_combo_box_entry_get_active_text;
@ -236,6 +238,16 @@ gtk_combo_box_entry_remove (GtkContainer *container,
GTK_CONTAINER_CLASS (gtk_combo_box_entry_parent_class)->remove (container, child);
}
static GType
gtk_combo_box_entry_child_type (GtkContainer *container)
{
if (!GTK_BIN (container)->child)
return GTK_TYPE_ENTRY;
else
return G_TYPE_NONE;
}
static void
gtk_combo_box_entry_active_changed (GtkComboBox *combo_box,
gpointer user_data)

1
gtk/gtkcontainer.c
View File

@ -819,7 +819,6 @@ gtk_container_add_with_properties (GtkContainer *container,
g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (widget->parent == NULL);
g_return_if_fail (widget->parent == container);
g_object_ref (container);
g_object_ref (widget);