aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorArturo Espinosa <unammx@src.gnome.org>2000-01-31 07:47:42 +0800
committerArturo Espinosa <unammx@src.gnome.org>2000-01-31 07:47:42 +0800
commita2d268b3d195589ab41ddf2e13eaf45040e86803 (patch)
tree9eab3857b5393a7129a09d1a1ab3a6c82dca5d8d /calendar
parent6f3fcd5ccd7d70bd270c354f9e019368099f866e (diff)
downloadgsoc2013-evolution-a2d268b3d195589ab41ddf2e13eaf45040e86803.tar
gsoc2013-evolution-a2d268b3d195589ab41ddf2e13eaf45040e86803.tar.gz
gsoc2013-evolution-a2d268b3d195589ab41ddf2e13eaf45040e86803.tar.bz2
gsoc2013-evolution-a2d268b3d195589ab41ddf2e13eaf45040e86803.tar.lz
gsoc2013-evolution-a2d268b3d195589ab41ddf2e13eaf45040e86803.tar.xz
gsoc2013-evolution-a2d268b3d195589ab41ddf2e13eaf45040e86803.tar.zst
gsoc2013-evolution-a2d268b3d195589ab41ddf2e13eaf45040e86803.zip
Sync to desktop - Federico
svn path=/trunk/; revision=1657
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/Makefile.am6
-rw-r--r--calendar/cal-client.c9
-rw-r--r--calendar/cal-client.h2
-rw-r--r--calendar/cal-client/cal-client.c9
-rw-r--r--calendar/cal-client/cal-client.h2
-rw-r--r--calendar/gui/Makefile.am6
7 files changed, 29 insertions, 10 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 47098393fc..5b65cc3ee0 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,10 @@
2000-01-30 Federico Mena Quintero <federico@helixcode.com>
+ * Makefile.am (gnomecal_SOURCES): Added cal-client.[ch] and
+ cal-listener.[ch].
+
+2000-01-30 Federico Mena Quintero <federico@helixcode.com>
+
* evolution-calendar.idl: Changed the namespace from
GNOME::Calendar to Evolution::Calendar.
(Listener::LoadStatus): Fixed SUCESSS -> SUCCESS typo. And I
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index 47f1328f02..9f239454ee 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -48,6 +48,10 @@ gnomecal_SOURCES = \
GnomeCal.h \
alarm.c \
alarm.h \
+ cal-client.c \
+ cal-client.h \
+ cal-listener.c \
+ cal-listener.h \
calendar.c \
calendar.h \
calendar-conduit.h \
@@ -55,11 +59,11 @@ gnomecal_SOURCES = \
calobj.h \
eventedit.c \
eventedit.h \
- getdate.y \
corba-cal.c \
corba-cal.h \
corba-cal-factory.c \
corba-cal-factory.h \
+ getdate.y \
gncal-day-panel.c \
gncal-day-panel.h \
gncal-day-view.c \
diff --git a/calendar/cal-client.c b/calendar/cal-client.c
index bfb496528c..1458a41b4b 100644
--- a/calendar/cal-client.c
+++ b/calendar/cal-client.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <gtk/gtksignal.h>
+#include <libgnorba/gnorba.h>
#include "cal-client.h"
#include "cal-listener.h"
@@ -231,7 +233,7 @@ cal_client_new (void)
if (!cal_client_construct (client)) {
g_message ("cal_client_new(): could not construct the calendar client");
- gtk_object_unref (client);
+ gtk_object_unref (GTK_OBJECT (client));
return NULL;
}
@@ -270,7 +272,8 @@ cal_client_load_calendar (CalClient *client, const char *str_uri)
return FALSE;
}
- corba_listener = (Evolution_Calendar_Listener) bonobo_object_corba_objref (priv->listener);
+ corba_listener = (Evolution_Calendar_Listener) bonobo_object_corba_objref (
+ BONOBO_OBJECT (priv->listener));
CORBA_exception_init (&ev);
@@ -279,7 +282,7 @@ cal_client_load_calendar (CalClient *client, const char *str_uri)
if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("cal_client_load_calendar(): load request failed");
- gtk_object_unref (priv->listener);
+ gtk_object_unref (GTK_OBJECT (priv->listener));
priv->listener = NULL;
priv->load_state = LOAD_STATE_NOT_LOADED;
CORBA_exception_free (&ev);
diff --git a/calendar/cal-client.h b/calendar/cal-client.h
index 95895f6079..1056fd1022 100644
--- a/calendar/cal-client.h
+++ b/calendar/cal-client.h
@@ -63,7 +63,7 @@ CalClient *cal_client_construct (CalClient *client);
CalClient *cal_client_new (void);
-void cal_client_load_calendar (CalClient *client, const char *str_uri);
+gboolean cal_client_load_calendar (CalClient *client, const char *str_uri);
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index bfb496528c..1458a41b4b 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <gtk/gtksignal.h>
+#include <libgnorba/gnorba.h>
#include "cal-client.h"
#include "cal-listener.h"
@@ -231,7 +233,7 @@ cal_client_new (void)
if (!cal_client_construct (client)) {
g_message ("cal_client_new(): could not construct the calendar client");
- gtk_object_unref (client);
+ gtk_object_unref (GTK_OBJECT (client));
return NULL;
}
@@ -270,7 +272,8 @@ cal_client_load_calendar (CalClient *client, const char *str_uri)
return FALSE;
}
- corba_listener = (Evolution_Calendar_Listener) bonobo_object_corba_objref (priv->listener);
+ corba_listener = (Evolution_Calendar_Listener) bonobo_object_corba_objref (
+ BONOBO_OBJECT (priv->listener));
CORBA_exception_init (&ev);
@@ -279,7 +282,7 @@ cal_client_load_calendar (CalClient *client, const char *str_uri)
if (ev._major != CORBA_NO_EXCEPTION) {
g_message ("cal_client_load_calendar(): load request failed");
- gtk_object_unref (priv->listener);
+ gtk_object_unref (GTK_OBJECT (priv->listener));
priv->listener = NULL;
priv->load_state = LOAD_STATE_NOT_LOADED;
CORBA_exception_free (&ev);
diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h
index 95895f6079..1056fd1022 100644
--- a/calendar/cal-client/cal-client.h
+++ b/calendar/cal-client/cal-client.h
@@ -63,7 +63,7 @@ CalClient *cal_client_construct (CalClient *client);
CalClient *cal_client_new (void);
-void cal_client_load_calendar (CalClient *client, const char *str_uri);
+gboolean cal_client_load_calendar (CalClient *client, const char *str_uri);
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 47f1328f02..9f239454ee 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -48,6 +48,10 @@ gnomecal_SOURCES = \
GnomeCal.h \
alarm.c \
alarm.h \
+ cal-client.c \
+ cal-client.h \
+ cal-listener.c \
+ cal-listener.h \
calendar.c \
calendar.h \
calendar-conduit.h \
@@ -55,11 +59,11 @@ gnomecal_SOURCES = \
calobj.h \
eventedit.c \
eventedit.h \
- getdate.y \
corba-cal.c \
corba-cal.h \
corba-cal-factory.c \
corba-cal-factory.h \
+ getdate.y \
gncal-day-panel.c \
gncal-day-panel.h \
gncal-day-view.c \