aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend/ebook
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2002-11-07 11:44:41 +0800
committerChris Toshok <toshok@src.gnome.org>2002-11-07 11:44:41 +0800
commitf1bf0afda992d969be86bfe29c464a8c435dcebf (patch)
treebc6ca2961999420dc0a404e53d0df0ff7e544d00 /addressbook/backend/ebook
parent4dec64f37372d00c85060c11837fa818d5dc7bcc (diff)
downloadgsoc2013-evolution-f1bf0afda992d969be86bfe29c464a8c435dcebf.tar.gz
gsoc2013-evolution-f1bf0afda992d969be86bfe29c464a8c435dcebf.tar.zst
gsoc2013-evolution-f1bf0afda992d969be86bfe29c464a8c435dcebf.zip
use g_type_class_peek_parent.
2002-11-06 Chris Toshok <toshok@ximian.com> * backend/pas/pas-backend-card-sexp.c (pas_backend_card_sexp_class_init): use g_type_class_peek_parent. * backend/pas/pas-card-cursor.c (pas_card_cursor_class_init): same. * backend/pas/pas-book-view.c (pas_book_view_class_init): same. * backend/pas/pas-book-factory.c (pas_book_factory_class_init): same. * backend/pas/pas-backend-summary.c (pas_backend_summary_class_init): same. * backend/pas/pas-backend-ldap.c (pas_backend_ldap_class_init): same. * backend/pas/pas-backend-file.c (pas_backend_file_class_init): same. * backend/ebook/e-book-marshal.list: ENUM -> INT. * backend/ebook/e-book-view.c (e_book_view_dispose): guard against this being called multiple times. (e_book_view_class_init): ENUM -> INT in the sequence_complete signal. * backend/ebook/e-book.c (e_book_do_response_open): un-ifdef the component_died signal stuff. svn path=/trunk/; revision=18623
Diffstat (limited to 'addressbook/backend/ebook')
-rw-r--r--addressbook/backend/ebook/e-book-marshal.list2
-rw-r--r--addressbook/backend/ebook/e-book-view.c43
-rw-r--r--addressbook/backend/ebook/e-book.c2
3 files changed, 24 insertions, 23 deletions
diff --git a/addressbook/backend/ebook/e-book-marshal.list b/addressbook/backend/ebook/e-book-marshal.list
index 3624766421..680ea039a3 100644
--- a/addressbook/backend/ebook/e-book-marshal.list
+++ b/addressbook/backend/ebook/e-book-marshal.list
@@ -2,4 +2,4 @@ NONE:NONE
NONE:BOOL
NONE:POINTER
NONE:STRING
-NONE:ENUM
+NONE:INT
diff --git a/addressbook/backend/ebook/e-book-view.c b/addressbook/backend/ebook/e-book-view.c
index 47f8575b8f..68c73e06f7 100644
--- a/addressbook/backend/ebook/e-book-view.c
+++ b/addressbook/backend/ebook/e-book-view.c
@@ -231,32 +231,35 @@ e_book_view_dispose (GObject *object)
EBookView *book_view = E_BOOK_VIEW (object);
CORBA_Environment ev;
- if (book_view->priv->book) {
- g_object_unref (book_view->priv->book);
- }
+ if (book_view->priv) {
+ if (book_view->priv->book) {
+ g_object_unref (book_view->priv->book);
+ }
- if (book_view->priv->corba_book_view) {
- CORBA_exception_init (&ev);
+ if (book_view->priv->corba_book_view) {
+ CORBA_exception_init (&ev);
- bonobo_object_release_unref (book_view->priv->corba_book_view, &ev);
+ bonobo_object_release_unref (book_view->priv->corba_book_view, &ev);
- if (ev._major != CORBA_NO_EXCEPTION) {
- g_warning ("EBookView: Exception while releasing BookView\n");
+ if (ev._major != CORBA_NO_EXCEPTION) {
+ g_warning ("EBookView: Exception while releasing BookView\n");
+ }
+
+ CORBA_exception_free (&ev);
}
- CORBA_exception_free (&ev);
- }
+ if (book_view->priv->listener) {
+ if (book_view->priv->responses_queued_id)
+ g_signal_handler_disconnect(book_view->priv->listener,
+ book_view->priv->responses_queued_id);
+ e_book_view_listener_stop (book_view->priv->listener);
+ bonobo_object_unref (BONOBO_OBJECT(book_view->priv->listener));
+ }
- if (book_view->priv->listener) {
- if (book_view->priv->responses_queued_id)
- g_signal_handler_disconnect(book_view->priv->listener,
- book_view->priv->responses_queued_id);
- e_book_view_listener_stop (book_view->priv->listener);
- bonobo_object_unref (BONOBO_OBJECT(book_view->priv->listener));
+ g_free (book_view->priv);
+ book_view->priv = NULL;
}
- g_free (book_view->priv);
-
G_OBJECT_CLASS(parent_class)->dispose (object);
}
@@ -303,9 +306,9 @@ e_book_view_class_init (EBookViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EBookViewClass, sequence_complete),
NULL, NULL,
- e_book_marshal_NONE__ENUM,
+ e_book_marshal_NONE__INT,
G_TYPE_NONE, 1,
- G_TYPE_ENUM);
+ G_TYPE_INT);
e_book_view_signals [STATUS_MESSAGE] =
g_signal_new ("status_message",
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index fe8f90cee7..40938b1e8f 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -421,11 +421,9 @@ e_book_do_response_open (EBook *book,
book->priv->corba_book = resp->book;
book->priv->load_state = URILoaded;
-#if PENDING_PORT_WORK
book->priv->comp_listener = e_component_listener_new (book->priv->corba_book, 0);
book->priv->died_signal = g_signal_connect (book->priv->comp_listener, "component_died",
G_CALLBACK (backend_died_cb), book);
-#endif
}
op = e_book_pop_op (book);