diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 21 | ||||
| -rw-r--r-- | calendar/gui/e-cal-list-view.h | 1 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.h | 4 | ||||
| -rw-r--r-- | calendar/gui/e-itip-control.c | 7 | ||||
| -rw-r--r-- | calendar/gui/main.c | 2 | ||||
| -rw-r--r-- | calendar/gui/tasks-component.c | 4 |
6 files changed, 28 insertions, 11 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 795d8e3301..5ef9afff34 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,24 @@ +2003-12-03 Ettore Perazzoli <ettore@ximian.com> + + * importers/icalendar-importer.c: Do not #include shell stuff. + + * gui/main.c: Do not #include <evolution-shell-client.h>. + + * gui/e-itip-control.c: Do not #include + <e-folder-selector-button.h> nor <evolution-shell-client.h>. + (start_default_server): Return FALSE. + (default_server_started_cb): Do not connect the "selected" signal + on the button since it's now NULL. + (button_selected_cb): #if 0 out. + + * gui/e-cal-list-view.h: Do not #include + "evolution-activity-client.h". + + * gui/tasks-component.c (impl_createControls): Give an empty label + for the status bar. + + * gui/e-day-view.h: Remove all deps on evolution-activity-client. + 2003-12-02 Rodney Dawes <dobey@ximian.com> * gui/Makefile.am: Version the schemas diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h index 37c0e9675b..08d5b7c0e8 100644 --- a/calendar/gui/e-cal-list-view.h +++ b/calendar/gui/e-cal-list-view.h @@ -30,7 +30,6 @@ #include "e-cal-view.h" #include "gnome-cal.h" -#include "evolution-activity-client.h" #ifdef __cplusplus extern "C" { diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h index e31f0946dd..652efc7399 100644 --- a/calendar/gui/e-day-view.h +++ b/calendar/gui/e-day-view.h @@ -32,7 +32,6 @@ #include "e-cal-view.h" #include "gnome-cal.h" -#include "evolution-activity-client.h" #ifdef __cplusplus extern "C" { @@ -449,9 +448,6 @@ struct _EDayView gchar *pm_string; gint am_string_width; gint pm_string_width; - - /* The activity client used to show messages on the status bar. */ - EvolutionActivityClient *activity; }; struct _EDayViewClass diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 5819daa7d9..44f0a97c2c 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -47,8 +47,6 @@ #include <libecal/e-cal.h> #include <e-util/e-time-utils.h> #include <e-util/e-dialog-widgets.h> -#include <evolution-shell-client.h> -#include <evolution-folder-selector-button.h> #include <camel/camel-mime-filter-tohtml.h> #include "dialogs/delete-error.h" #include "calendar-config.h" @@ -156,6 +154,7 @@ start_default_server (EItipControl *itip, ECal *client, gboolean tasks) else return e_cal_open_default_calendar (client, FALSE); #endif + return FALSE; } #if 0 /* EPFIXME, rewrite this */ @@ -2079,6 +2078,7 @@ send_freebusy (EItipControl *itip) gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); } +#if 0 /* FIXME */ static void button_selected_cb (EvolutionFolderSelectorButton *button, GNOME_Evolution_Folder *folder, gpointer data) { @@ -2100,6 +2100,7 @@ button_selected_cb (EvolutionFolderSelectorButton *button, GNOME_Evolution_Folde g_free (uri); } +#endif static void url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data) @@ -2181,7 +2182,9 @@ default_server_started_cb (ECal *client, ECalendarStatus status, gpointer data) button = NULL; } +#if 0 g_signal_connect (button, "selected", G_CALLBACK (button_selected_cb), context->itip); +#endif gtk_container_add (GTK_CONTAINER (context->eb), button); gtk_widget_show (button); diff --git a/calendar/gui/main.c b/calendar/gui/main.c index 404cec6622..838917244d 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -36,8 +36,6 @@ #include <gal/widgets/e-cursors.h> -#include <evolution-shell-client.h> - #include "dialogs/cal-prefs-dialog.h" #include "calendar-commands.h" #include "calendar-config.h" diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 9b29767396..57079a62e9 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -538,9 +538,9 @@ impl_createControls (PortableServer_Servant servant, *corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (sidebar_control), ev); *corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (view_control), ev); - /* FIXME temporary for testing. */ + /* The tasks component doesn't use the status bar so just return an empty label. */ { - GtkLabel *label = gtk_label_new ("Hey hey this is the tasks component"); + GtkLabel *label = gtk_label_new (""); BonoboControl *control; gtk_widget_show (label); |