diff options
Diffstat (limited to 'calendar/gui')
-rw-r--r-- | calendar/gui/GnomeCal.idl | 21 | ||||
-rw-r--r-- | calendar/gui/Makefile.am | 1 | ||||
-rw-r--r-- | calendar/gui/alarm-notify/alarm.h | 1 | ||||
-rw-r--r-- | calendar/gui/alarm.h | 1 | ||||
-rw-r--r-- | calendar/gui/corba-cal-factory.h | 2 | ||||
-rw-r--r-- | calendar/gui/corba-cal.c | 18 | ||||
-rw-r--r-- | calendar/gui/gncal-todo.c | 2 | ||||
-rw-r--r-- | calendar/gui/gnome-cal.c | 3 | ||||
-rw-r--r-- | calendar/gui/layout.c | 2 | ||||
-rw-r--r-- | calendar/gui/main.c | 15 | ||||
-rw-r--r-- | calendar/gui/quick-view.c | 2 |
11 files changed, 8 insertions, 60 deletions
diff --git a/calendar/gui/GnomeCal.idl b/calendar/gui/GnomeCal.idl index 1e426fae36..3838c7c0bc 100644 --- a/calendar/gui/GnomeCal.idl +++ b/calendar/gui/GnomeCal.idl @@ -20,18 +20,6 @@ module GNOME { raises (NotFound); /* - * get_objects_by_id_list: - * @uid_list: a sequence of Unique Identifiers - * - * Returns a vCalendar object for the objects - * that matches the given UID list @uid_list; - * NotFound is raised if any of the given UIDs - * were not found. - */ - string get_objects_by_id_list (in String_Sequence uid) - raises (NotFound); - - /* * get_object_by_pilot_id: * @pilot_id: the pilot id * @@ -75,15 +63,6 @@ module GNOME { raises (NotFound); /* - * get_objects: - * - * Danger Will Robinson : This can result in a - * huge string, namely the size of all your entries. - * Returns a vCalendar with all the objects - */ - string get_objects (); - - /* * get_object_id_list * * Returns a sequence of the UID's of the entries diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 5fa18ba0dd..23bc461141 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -90,7 +90,6 @@ gnomecal_SOURCES = \ gnome-month-item.h \ gnome-cal.c \ gnome-cal.h \ - html-month.c \ goto.c \ layout.c \ layout.h \ diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h index 81710bda5e..2dc77e623b 100644 --- a/calendar/gui/alarm-notify/alarm.h +++ b/calendar/gui/alarm-notify/alarm.h @@ -2,6 +2,7 @@ #define ALARM_H #include <time.h> +#include "calobj.h" typedef void (*AlarmFunction)(time_t time, CalendarAlarm *which, void *closuse); diff --git a/calendar/gui/alarm.h b/calendar/gui/alarm.h index 81710bda5e..2dc77e623b 100644 --- a/calendar/gui/alarm.h +++ b/calendar/gui/alarm.h @@ -2,6 +2,7 @@ #define ALARM_H #include <time.h> +#include "calobj.h" typedef void (*AlarmFunction)(time_t time, CalendarAlarm *which, void *closuse); diff --git a/calendar/gui/corba-cal-factory.h b/calendar/gui/corba-cal-factory.h index 5d3bcb3140..096baef012 100644 --- a/calendar/gui/corba-cal-factory.h +++ b/calendar/gui/corba-cal-factory.h @@ -5,7 +5,7 @@ CORBA_ORB orb; PortableServer_POA poa; -void corba_server_init (void); +void init_corba_server (void); void unregister_calendar_services (void); #endif /* _CORBA_CAL_FACTORY_H_ */ diff --git a/calendar/gui/corba-cal.c b/calendar/gui/corba-cal.c index 7b9878f875..6d848ddb87 100644 --- a/calendar/gui/corba-cal.c +++ b/calendar/gui/corba-cal.c @@ -193,23 +193,6 @@ cal_repo_update_pilot_id (PortableServer_Servant servant, obj->pilot_status = pilot_status; } -static CORBA_char * -cal_repo_get_objects (PortableServer_Servant servant, - CORBA_Environment *ev) -{ - GnomeCalendar *gcal = gnomecal_from_servant (servant); - char *str; - CORBA_char *res; - - str = calendar_get_as_vcal_string (gcal->cal); - g_message("length of result is %d",strlen(str)); - res = CORBA_string_dup (str); - free(str); /* ...get_as_vcal calls writeMemVObject, which uses realloc to - allocate this string */ - - return res; -} - static CORBA_long cal_repo_get_number_of_objects (PortableServer_Servant servant, GNOME_Calendar_Repository_RecordStatus record_status, @@ -318,7 +301,6 @@ init_calendar_repo_class (void) calendar_repository_epv.get_id_from_pilot_id = cal_repo_get_id_from_pilot_id; calendar_repository_epv.delete_object = cal_repo_delete_object; calendar_repository_epv.update_object = cal_repo_update_object; - calendar_repository_epv.get_objects = cal_repo_get_objects; calendar_repository_epv.get_number_of_objects = cal_repo_get_number_of_objects; calendar_repository_epv.get_updated_objects = cal_repo_get_updated_objects; calendar_repository_epv.update_pilot_id = cal_repo_update_pilot_id; diff --git a/calendar/gui/gncal-todo.c b/calendar/gui/gncal-todo.c index 3be3ac4517..64ea8d0638 100644 --- a/calendar/gui/gncal-todo.c +++ b/calendar/gui/gncal-todo.c @@ -354,7 +354,7 @@ clist_row_selected (GtkCList *clist, gint row, gint column, GdkEventButton *even * once we get a call back stating that a column * has been resized never ever automatically resize again */ -void +static void column_resized (GtkWidget *widget, GncalTodo *todo) { /* disabling autoresize of columns */ diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 387d46a31c..d54c4e98df 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -10,6 +10,7 @@ #include <signal.h> #include <sys/wait.h> #include <fcntl.h> +#include "alarm.h" #include "calendar.h" #include "gnome-cal.h" #include "gncal-day-panel.h" @@ -357,7 +358,7 @@ execute (char *command, int close_standard) sigaction (SIGQUIT, &save_quit, NULL); } -void +static void mail_notify (char *mail_address, char *text, time_t app_time) { pid_t pid; diff --git a/calendar/gui/layout.c b/calendar/gui/layout.c index 1367ae3f8f..7042071056 100644 --- a/calendar/gui/layout.c +++ b/calendar/gui/layout.c @@ -93,7 +93,7 @@ build_partition (struct layout_info *li) } /* Returns the index of the element in the partition that corresponds to the specified time */ -int +static int find_index (struct layout_info *li, time_t t) { int i; diff --git a/calendar/gui/main.c b/calendar/gui/main.c index 9dead6b92e..ee4111b03e 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -576,14 +576,6 @@ save_default_calendar (GnomeCalendar *gcal) save_calendar_cmd (NULL, gcal); } -#if 0 -static void -make_html_cmd (GtkWidget *widget, GtkWidget *gcal) -{ - make_month_html (gcal, "output.html"); -} -#endif - static GnomeUIInfo gnome_cal_file_menu [] = { GNOMEUIINFO_MENU_NEW_ITEM(N_("_New calendar"), N_("Create a new calendar"), @@ -597,13 +589,6 @@ static GnomeUIInfo gnome_cal_file_menu [] = { GNOMEUIINFO_SEPARATOR, -#if 0 - GNOMEUIINFO_ITEM(N_("Create HTML for this month"), - N_("Creates an HTML version of this month's appointments"), - make_html_cmd, NULL); -#endif - GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_MENU_CLOSE_ITEM(close_cmd, NULL), GNOMEUIINFO_MENU_EXIT_ITEM(quit_cmd, NULL), diff --git a/calendar/gui/quick-view.c b/calendar/gui/quick-view.c index c23ed612c0..42da747259 100644 --- a/calendar/gui/quick-view.c +++ b/calendar/gui/quick-view.c @@ -105,7 +105,7 @@ quick_view_map_event (GtkWidget *widget, GdkEventAny *event) * items to create and returns the y position of the next item to create. Also takes in the current * maximum width for items and returns the new maximum width. */ -void +static void create_items_for_event (QuickView *qv, CalendarObject *co, double *y, double *max_width) { GnomeCanvas *canvas; |