From 484d91f1f5c40baa74aad0a230fe89f4ed643210 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Sun, 3 Jun 2001 23:45:20 +0000 Subject: remove spew, and don't call the ShellView CORBA method if the interface 2001-06-03 Chris Toshok * gui/component/addressbook.c (set_status_message): remove spew, and don't call the ShellView CORBA method if the interface doesn't exist (for whatever reason.) * gui/widgets/e-addressbook-view.c (e_addressbook_view_destroy): unref the EAddressbookModel. (create_minicard_view): unref the adapter. (card_added_cb): call e_book_error_dialog if status != SUCCESS. (card_modified_cb): same. (card_removed_cb): new function, and same. (delete_card_cb): pass card_removed_cb as the callback. (emit_status_message): new function, just emit status_message. (status_message): change to call emit_status_message. (card_deleted_cb): emit_status_message ("Done."), and call e_book_error_dialog if status != SUCCESS. (do_remove): pass view in the closure arg. (e_addressbook_view_delete_selection): emit status "Removing cards..." before starting the removal. (e_book_error_dialog): new function - pop up a (possibly) helpful message about why an operation failed. * gui/widgets/e-minicard-view-widget.c (e_minicard_view_widget_new): ref the EAddressbookReflowAdapter. (e_minicard_view_widget_destroy): unref the adapter. (e_minicard_view_widget_get_selection_model): if there isn't a minicard view return NULL. * gui/widgets/e-addressbook-table-adapter.c (e_addressbook_table_adapter_construct): ref the EAddressbookModel. * gui/widgets/e-addressbook-reflow-adapter.c (addressbook_finalize): rename this from addressbook_destroy, to reflect the method change. (e_addressbook_reflow_adapter_class_init): same. (e_addressbook_reflow_adapter_construct): ref the EAddressbookModel. * gui/widgets/e-addressbook-model.h: add editable_set flag. * gui/widgets/e-addressbook-model.c (writable_status): only record the writable state of the addressbook if the user hasn't set it. (e_addressbook_model_init): init editable_set to FALSE. (e_addressbook_model_set_arg): set editable_set to TRUE. svn path=/trunk/; revision=10107 --- addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/widgets/e-addressbook-reflow-adapter.c') diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index dc767c142d..04f17fd074 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -244,7 +244,7 @@ e_addressbook_reflow_adapter_right_click (EAddressbookReflowAdapter *adapter, Gd } static void -addressbook_destroy(GtkObject *object) +addressbook_finalize(GtkObject *object) { EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object); @@ -495,7 +495,7 @@ e_addressbook_reflow_adapter_class_init (GtkObjectClass *object_class) object_class->set_arg = addressbook_set_arg; object_class->get_arg = addressbook_get_arg; - object_class->destroy = addressbook_destroy; + object_class->finalize = addressbook_finalize; gtk_object_add_arg_type ("EAddressbookReflowAdapter::book", GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_BOOK); @@ -567,6 +567,7 @@ e_addressbook_reflow_adapter_construct (EAddressbookReflowAdapter *adapter, EAddressbookReflowAdapterPrivate *priv = adapter->priv; priv->model = model; + gtk_object_ref (GTK_OBJECT (priv->model)); priv->create_card_id = gtk_signal_connect(GTK_OBJECT(priv->model), "card_added", -- cgit v1.2.3