From e134fc8fe3d78dfc9340b513bc3bbb61631cece4 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Sun, 3 Nov 2002 23:38:42 +0000 Subject: use EConfigListener instead of BonoboConfig. 2002-11-03 Rodrigo Moya * cal-client/cal-client.c (get_default_uri): use EConfigListener instead of BonoboConfig. * cal-client/cal-client.c: * cal-client/cal-listener.[ch]: * cal-client/query-listener.c: warning free. svn path=/trunk/; revision=18517 --- calendar/ChangeLog | 9 +++++++++ calendar/cal-client/cal-client.c | 31 ++++++++++--------------------- calendar/cal-client/cal-listener.c | 8 ++++---- calendar/cal-client/cal-listener.h | 4 ++-- calendar/cal-client/query-listener.c | 8 ++++---- calendar/cal-client/query-listener.h | 2 +- 6 files changed, 30 insertions(+), 32 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index c224f85686..62e4553fb8 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2002-11-03 Rodrigo Moya + + * cal-client/cal-client.c (get_default_uri): use EConfigListener + instead of BonoboConfig. + + * cal-client/cal-client.c: + * cal-client/cal-listener.[ch]: + * cal-client/query-listener.c: warning free. + 2002-11-03 Rodrigo Moya * pcs/cal-backend-util.[ch]: don't use BonoboConfig, but diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c index 9881a7c032..aa048065f2 100644 --- a/calendar/cal-client/cal-client.c +++ b/calendar/cal-client/cal-client.c @@ -25,11 +25,10 @@ #include #include #include -#include -#include #include #include "e-util/e-component-listener.h" +#include "e-util/e-config-listener.h" #include "cal-client-types.h" #include "cal-client.h" #include "cal-listener.h" @@ -552,7 +551,7 @@ cal_set_mode_cb (CalListener *listener, /* Handle the obj_updated signal from the listener */ static void -obj_updated_cb (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid, gpointer data) +obj_updated_cb (CalListener *listener, const CORBA_char *uid, gpointer data) { CalClient *client; @@ -562,7 +561,7 @@ obj_updated_cb (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID /* Handle the obj_removed signal from the listener */ static void -obj_removed_cb (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid, gpointer data) +obj_removed_cb (CalListener *listener, const CORBA_char *uid, gpointer data) { CalClient *client; @@ -865,31 +864,21 @@ get_fall_back_uri (gboolean tasks) static char * get_default_uri (gboolean tasks) { - Bonobo_ConfigDatabase db; + EConfigListener *db; char *uri; - CORBA_Environment ev; - CORBA_exception_init (&ev); - - db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev); + db = e_config_listener_new (); - if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) { - CORBA_exception_free (&ev); - return NULL; - } - if (tasks) - uri = bonobo_config_get_string (db, "/DefaultFolders/tasks_uri", &ev); + uri = e_config_listener_get_string (db, "/apps/Evolution/DefaultFolders/tasks_uri"); else - uri = bonobo_config_get_string (db, "/DefaultFolders/calendar_uri", &ev); - bonobo_object_release_unref (db, NULL); + uri = e_config_listener_get_string (db, "/apps/Evolution/DefaultFolders/calendar_uri"); + g_object_unref (G_OBJECT (db)); - if (BONOBO_EX (&ev)) { - CORBA_exception_free (&ev); + if (!uri) uri = get_fall_back_uri (tasks); - } else { + else uri = cal_util_expand_uri (uri, tasks); - } return uri; } diff --git a/calendar/cal-client/cal-listener.c b/calendar/cal-client/cal-listener.c index b96f0848fe..71cbb9ae3f 100644 --- a/calendar/cal-client/cal-listener.c +++ b/calendar/cal-client/cal-listener.c @@ -53,10 +53,10 @@ static void impl_notifyCalSetMode (PortableServer_Servant servant, GNOME_Evolution_Calendar_CalMode mode, CORBA_Environment *ev); static void impl_notifyObjUpdated (PortableServer_Servant servant, - GNOME_Evolution_Calendar_CalObjUID uid, + const CORBA_char *uid, CORBA_Environment *ev); static void impl_notifyObjRemoved (PortableServer_Servant servant, - GNOME_Evolution_Calendar_CalObjUID uid, + const CORBA_char *uid, CORBA_Environment *ev); static void impl_notifyErrorOccurred (PortableServer_Servant servant, const CORBA_char *message, @@ -200,7 +200,7 @@ impl_notifyCalSetMode (PortableServer_Servant servant, /* ::notifyObjUpdated method */ static void impl_notifyObjUpdated (PortableServer_Servant servant, - GNOME_Evolution_Calendar_CalObjUID uid, + const CORBA_char *uid, CORBA_Environment *ev) { CalListener *listener; @@ -219,7 +219,7 @@ impl_notifyObjUpdated (PortableServer_Servant servant, /* ::notifyObjRemoved method */ static void impl_notifyObjRemoved (PortableServer_Servant servant, - GNOME_Evolution_Calendar_CalObjUID uid, + const CORBA_char *uid, CORBA_Environment *ev) { CalListener *listener; diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h index 536ea035c6..08db22a54b 100644 --- a/calendar/cal-client/cal-listener.h +++ b/calendar/cal-client/cal-listener.h @@ -63,10 +63,10 @@ typedef void (* CalListenerCalSetModeFn) (CalListener *listener, gpointer data); typedef void (* CalListenerObjUpdatedFn) (CalListener *listener, - const GNOME_Evolution_Calendar_CalObjUID uid, + const CORBA_char *uid, gpointer data); typedef void (* CalListenerObjRemovedFn) (CalListener *listener, - const GNOME_Evolution_Calendar_CalObjUID uid, + const CORBA_char *uid, gpointer data); typedef void (* CalListenerErrorOccurredFn) (CalListener *listener, diff --git a/calendar/cal-client/query-listener.c b/calendar/cal-client/query-listener.c index ab02f2faca..6f090717d7 100644 --- a/calendar/cal-client/query-listener.c +++ b/calendar/cal-client/query-listener.c @@ -47,14 +47,14 @@ static void query_listener_init (QueryListener *ql); static void query_listener_destroy (GtkObject *object); static void impl_notifyObjUpdated (PortableServer_Servant servant, - GNOME_Evolution_Calendar_CalObjUIDSeq *uids, + const GNOME_Evolution_Calendar_CalObjUIDSeq *uids, CORBA_boolean query_in_progress, CORBA_long n_scanned, CORBA_long total, CORBA_Environment *ev); static void impl_notifyObjRemoved (PortableServer_Servant servant, - GNOME_Evolution_Calendar_CalObjUID uid, + const CORBA_char *uid, CORBA_Environment *ev); static void impl_notifyQueryDone (PortableServer_Servant servant, @@ -146,7 +146,7 @@ query_listener_destroy (GtkObject *object) /* ::notifyObjUpdated() method */ static void impl_notifyObjUpdated (PortableServer_Servant servant, - GNOME_Evolution_Calendar_CalObjUIDSeq *uids, + const GNOME_Evolution_Calendar_CalObjUIDSeq *uids, CORBA_boolean query_in_progress, CORBA_long n_scanned, CORBA_long total, @@ -168,7 +168,7 @@ impl_notifyObjUpdated (PortableServer_Servant servant, /* ::notifyObjRemoved() method */ static void impl_notifyObjRemoved (PortableServer_Servant servant, - GNOME_Evolution_Calendar_CalObjUID uid, + const CORBA_char *uid, CORBA_Environment *ev) { QueryListener *ql; diff --git a/calendar/cal-client/query-listener.h b/calendar/cal-client/query-listener.h index fe509643dd..ab59345cf4 100644 --- a/calendar/cal-client/query-listener.h +++ b/calendar/cal-client/query-listener.h @@ -61,7 +61,7 @@ typedef void (* QueryListenerObjUpdatedFn) (QueryListener *ql, gpointer data); typedef void (* QueryListenerObjRemovedFn) (QueryListener *ql, - const GNOME_Evolution_Calendar_CalObjUID uid, + const CORBA_char *uid, gpointer data); typedef void (* QueryListenerQueryDoneFn) ( -- cgit v1.2.3