# HG changeset patch # User Will Thompson # Date 1194223994 0 # Node ID 6225cd764a0662b92bae50fdf441645364ada35e # Parent dc5012153bfa83b979759d988f1624f41ce4ad98 Don't override any of the GtkContainer API in PidginMiniDialog. It's more trouble than it's worth. diff -r dc5012153bfa -r 6225cd764a06 pidgin/minidialog.c --- a/pidgin/minidialog.c Sun Nov 04 23:58:50 2007 +0000 +++ b/pidgin/minidialog.c Mon Nov 05 00:53:14 2007 +0000 @@ -273,62 +273,15 @@ } static void -pidgin_mini_dialog_add(GtkContainer *container, - GtkWidget *widget) -{ - PidginMiniDialog *self = PIDGIN_MINI_DIALOG(container); - gtk_widget_show_all(widget); - gtk_box_pack_start(self->contents, widget, FALSE, FALSE, 0); -} - -static void -pidgin_mini_dialog_remove(GtkContainer *container, - GtkWidget *widget) -{ - PidginMiniDialog *self = PIDGIN_MINI_DIALOG(container); - gtk_container_remove(GTK_CONTAINER(self->contents), widget); -} - -static void -pidgin_mini_dialog_forall(GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data) -{ - PidginMiniDialog *self = PIDGIN_MINI_DIALOG(container); - PidginMiniDialogPrivate *priv = PIDGIN_MINI_DIALOG_GET_PRIVATE(self); - GtkContainer *contents = GTK_CONTAINER(self->contents); - - if(include_internals) - { - (*callback)(GTK_WIDGET(priv->title_box), callback_data); - (*callback)(GTK_WIDGET(priv->desc_box), callback_data); - } - - gtk_container_foreach(contents, callback, callback_data); - - if (include_internals) - (*callback)(GTK_WIDGET(priv->buttons), callback_data); -} - -static void pidgin_mini_dialog_class_init(PidginMiniDialogClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); - GtkContainerClass *container_class = GTK_CONTAINER_CLASS(klass); GParamSpec *param_spec; object_class->get_property = pidgin_mini_dialog_get_property; object_class->set_property = pidgin_mini_dialog_set_property; object_class->finalize = pidgin_mini_dialog_finalize; - container_class->add = pidgin_mini_dialog_add; - container_class->remove = pidgin_mini_dialog_remove; - container_class->forall = pidgin_mini_dialog_forall; - /* TODO: Implement set_focus_child, {get,set}_child_property and pals - * if necessary. - */ - param_spec = g_param_spec_string("title", "title", "String specifying the mini-dialog's title", NULL, #if GTK_CHECK_VERSION(2,8,0)