From 48ff93b64492c08d82e8452cb6b0e94b8582eb3e Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Mon, 28 Aug 2000 23:27:51 +0000 Subject: New function. We need this from code that dynamically updates from a 2000-08-28 Federico Mena Quintero * cal-client/cal-client.c (cal_client_is_loaded): New function. We need this from code that dynamically updates from a client and could not have connected to the "cal_loaded" signal right after the client was created. * gui/calendar-model.c (load_objects): Do not try to load the objects if the client has not been loaded yet. (cal_loaded_cb): Check the status value. * gui/calendar-model.h (CalendarModel): Declare the private structure here so that gdb will give me love. * pcs/cal-factory.h (CalFactory): Likewise. * pcs/cal.h (Cal): Likewise. * cal-client/cal-listener.h (CalListener): Likewise. * cal-client/cal-client.h (CalClient): Likewise. * pcs/cal-backend.h (CalBackend): This no longer has a private structure, so remove it. * cal-util/Makefile.am (libcal_util_la_SOURCES): Removed the vCalendar and old iCalendar cruft. (libcal_utilinclude_HEADERS): Likewise. Removed the obsolete iCalendar test program. svn path=/trunk/; revision=5091 --- calendar/pcs/cal-backend.h | 3 --- calendar/pcs/cal-factory.c | 4 ++-- calendar/pcs/cal-factory.h | 4 +++- calendar/pcs/cal.c | 4 ++-- calendar/pcs/cal.h | 4 +++- 5 files changed, 10 insertions(+), 9 deletions(-) (limited to 'calendar/pcs') diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h index e1122f4d1c..cfc4cb8a99 100644 --- a/calendar/pcs/cal-backend.h +++ b/calendar/pcs/cal-backend.h @@ -49,9 +49,6 @@ typedef enum { struct _CalBackend { GtkObject object; - - /* Private data */ - gpointer priv; }; struct _CalBackendClass { diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c index ab19ccb8b3..a89f2fe9f4 100644 --- a/calendar/pcs/cal-factory.c +++ b/calendar/pcs/cal-factory.c @@ -31,13 +31,13 @@ /* Private part of the CalFactory structure */ -typedef struct { +struct _CalFactoryPrivate { /* Hash table from URI method strings to GtkType * for backend class types */ GHashTable *methods; /* Hash table from GnomeVFSURI structures to CalBackend objects */ GHashTable *backends; -} CalFactoryPrivate; +}; diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h index f96ba4ba92..9405a05ef8 100644 --- a/calendar/pcs/cal-factory.h +++ b/calendar/pcs/cal-factory.h @@ -41,11 +41,13 @@ BEGIN_GNOME_DECLS typedef struct _CalFactory CalFactory; typedef struct _CalFactoryClass CalFactoryClass; +typedef struct _CalFactoryPrivate CalFactoryPrivate; + struct _CalFactory { BonoboObject object; /* Private data */ - gpointer priv; + CalFactoryPrivate *priv; }; struct _CalFactoryClass { diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c index fdb7682e7c..64eb29b023 100644 --- a/calendar/pcs/cal.c +++ b/calendar/pcs/cal.c @@ -26,13 +26,13 @@ /* Private part of the Cal structure */ -typedef struct { +struct _CalPrivate { /* Our backend */ CalBackend *backend; /* Listener on the client we notify */ Evolution_Calendar_Listener listener; -} CalPrivate; +}; diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h index a11cedebbb..2b17278573 100644 --- a/calendar/pcs/cal.h +++ b/calendar/pcs/cal.h @@ -37,11 +37,13 @@ BEGIN_GNOME_DECLS #define IS_CAL(obj) (GTK_CHECK_TYPE ((obj), CAL_TYPE)) #define IS_CAL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_TYPE)) +typedef struct _CalPrivate CalPrivate; + struct _Cal { BonoboObject object; /* Private data */ - gpointer priv; + CalPrivate *priv; }; struct _CalClass { -- cgit v1.2.3