aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gui/Makefile.am47
-rw-r--r--calendar/gui/calendar-component.c2
-rw-r--r--calendar/gui/calendar-config.c1
-rw-r--r--calendar/gui/comp-util.c1
-rw-r--r--calendar/gui/e-alarm-list.c4
-rw-r--r--calendar/gui/e-date-time-list.c6
-rw-r--r--calendar/gui/e-day-view-time-item.c2
-rw-r--r--calendar/gui/e-day-view.c4
-rw-r--r--calendar/gui/e-itip-control.c3
-rw-r--r--calendar/gui/e-week-view-titles-item.c1
-rw-r--r--calendar/gui/e-week-view.c3
-rw-r--r--calendar/gui/itip-bonobo-control.c1
-rw-r--r--calendar/gui/print.c1
13 files changed, 35 insertions, 41 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 64095ab21f..b3f9041c9e 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -33,36 +33,31 @@ SUBDIRS = alarm-notify dialogs
component_LTLIBRARIES = libevolution-calendar.la
-INCLUDES = \
- -DG_LOG_DOMAIN=\"calendar-gui\" \
- -I$(top_builddir)/shell \
- -I$(top_srcdir)/shell \
- -I$(top_srcdir) \
- -I$(top_srcdir)/calendar \
- -I$(top_srcdir)/calendar/cal-client \
- -I$(top_builddir)/calendar/cal-client \
- -I$(top_srcdir)/libical/src/libical \
- -I$(top_builddir)/libical/src/libical \
- -I$(top_srcdir)/addressbook/backend \
- -I$(top_builddir)/addressbook/backend \
- -I$(top_srcdir)/widgets \
- -I$(includedir) \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
- -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
- -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
- -DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/images\" \
- -DEVOLUTION_GALVIEWSDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/views\" \
- -DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"calendar-gui\" \
+ -I$(top_builddir)/shell \
+ -I$(top_srcdir)/shell \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/calendar \
+ -I$(top_srcdir)/calendar/cal-client \
+ -I$(top_builddir)/calendar/cal-client \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+ -I$(top_srcdir)/widgets \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
+ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
+ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
$(EVOLUTION_CALENDAR_CFLAGS)
-gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA = \
e-itip-control.glade \
goto-dialog.glade
-etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec/
etspec_DATA = e-calendar-table.etspec e-meeting-time-sel.etspec
libevolution_calendar_la_SOURCES = \
@@ -177,12 +172,10 @@ libevolution_calendar_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
$(EVOLUTION_CALENDAR_LIBS)
-libevolution_calendar_la_LDFLAGS = \
- -export-dynamic -avoid-version
+libevolution_calendar_la_LDFLAGS = -avoid-version -module
server_in_files = GNOME_Evolution_Calendar.server.in.in
-serverdir = $(libdir)/bonobo/servers
server_DATA = $(server_in_files:.server.in.in=.server)
$(server_in_files:.server.in.in=.server.in): $(server_in_files)
sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 9d64b2db67..6beb5964e3 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -689,7 +689,7 @@ add_creatable_item (EvolutionShellComponent *shell_component,
icon_path = NULL;
icon = NULL;
} else {
- icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, icon_name);
+ icon_path = g_concat_dir_and_file (EVOLUTION_IMAGESDIR, icon_name);
icon = gdk_pixbuf_new_from_file (icon_path, NULL);
}
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 9ba4d2e5db..0b3d5377d0 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#include <string.h>
#include <time.h>
#include <gtk/gtksignal.h>
#include <libgnome/gnome-config.h>
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index 5e1b5799d2..df4817d70d 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <string.h>
#include "calendar-config.h"
#include "comp-util.h"
#include "dialogs/delete-comp.h"
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index e81db8c302..4f29829c32 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -27,6 +27,7 @@
#include <libgnome/gnome-i18n.h>
#include <glib.h>
#include <cal-util/timeutil.h>
+#include <e-util/e-time-utils.h>
#include "calendar-config.h"
#include "e-alarm-list.h"
@@ -182,7 +183,6 @@ static void
row_deleted (EAlarmList *alarm_list, gint n)
{
GtkTreePath *path;
- gint i;
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, n);
@@ -298,8 +298,6 @@ void
e_alarm_list_append (EAlarmList *alarm_list, GtkTreeIter *iter,
const CalComponentAlarm *alarm)
{
- CalComponentAlarm *alarm_copy;
-
g_return_if_fail (alarm != NULL);
alarm_list->list = g_list_append (alarm_list->list, copy_alarm (alarm));
diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c
index f5d3608122..13bfc6df28 100644
--- a/calendar/gui/e-date-time-list.c
+++ b/calendar/gui/e-date-time-list.c
@@ -25,7 +25,10 @@
#include <gtk/gtksignal.h>
#include <gtk/gtktreednd.h>
#include <glib.h>
+#include <e-util/e-time-utils.h>
#include "e-date-time-list.h"
+#include "cal-util/timeutil.h"
+#include "calendar-config.h"
#define G_LIST(x) ((GList *) x)
#define E_DATE_TIME_LIST_IS_SORTED(list) (E_DATE_TIME_LIST (list)->sort_column_id != -2)
@@ -179,7 +182,6 @@ static void
row_deleted (EDateTimeList *date_time_list, gint n)
{
GtkTreePath *path;
- gint i;
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, n);
@@ -307,8 +309,6 @@ void
e_date_time_list_append (EDateTimeList *date_time_list, GtkTreeIter *iter,
const CalComponentDateTime *datetime)
{
- CalComponentDateTime *datetime_copy;
-
g_return_if_fail (datetime != NULL);
date_time_list->list = g_list_append (date_time_list->list, copy_datetime (datetime));
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index b6e902e318..af180c4e1b 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#include <string.h>
#include <glib.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkradiomenuitem.h>
@@ -181,7 +182,6 @@ e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem)
EDayView *day_view;
GtkStyle *style;
GdkFont *small_font;
- PangoFontMetrics *large_font_metrics;
gint digit, large_digit_width, max_large_digit_width = 0;
gint max_suffix_width, max_minute_or_suffix_width;
gint column_width_default, column_width_60_min_rows;
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 91baa1e382..ce74f4793c 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1077,7 +1077,6 @@ e_day_view_unrealize (GtkWidget *widget)
{
EDayView *day_view;
GdkColormap *colormap;
- gint i;
day_view = E_DAY_VIEW (widget);
@@ -1103,7 +1102,6 @@ e_day_view_style_set (GtkWidget *widget,
{
EDayView *day_view;
GdkFont *font;
- PangoContext *context;
gint top_rows, top_canvas_height;
gint hour, max_large_hour_width;
gint minute, max_minute_width, i;
@@ -1251,7 +1249,9 @@ e_day_view_set_event_font_cb (EDayView *day_view,
gpointer data)
{
EDayViewEvent *event;
+#if 0
GdkFont *font = data;
+#endif
if (day == E_DAY_VIEW_LONG_EVENT)
event = &g_array_index (day_view->long_events,
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 0cd4e8e566..9d2c894781 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -28,6 +28,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <unistd.h>
#include <glib.h>
#include <gtk/gtkmisc.h>
#include <libgnome/gnome-i18n.h>
@@ -2042,7 +2043,7 @@ url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpoint
int len, fd;
char *path;
- path = g_strdup_printf ("%s/%s", EVOLUTION_ICONSDIR, url);
+ path = g_strdup_printf ("%s/%s", EVOLUTION_IMAGESDIR, url);
if ((fd = open (path, O_RDONLY)) == -1) {
g_warning ("%s", g_strerror (errno));
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index 13faac1fce..d22938c8b8 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -27,6 +27,7 @@
*/
#include <config.h>
+#include <string.h>
#include "e-week-view-titles-item.h"
static void e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 8996aa9c8e..c30839c675 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -597,7 +597,6 @@ e_week_view_unrealize (GtkWidget *widget)
{
EWeekView *week_view;
GdkColormap *colormap;
- gint i;
week_view = E_WEEK_VIEW (widget);
@@ -655,12 +654,10 @@ e_week_view_style_set (GtkWidget *widget,
GtkStyle *previous_style)
{
EWeekView *week_view;
- EWeekViewEventSpan *span;
GdkFont *font;
GtkStyle *style;
gint day, day_width, max_day_width, max_abbr_day_width;
gint month, month_width, max_month_width, max_abbr_month_width;
- gint span_num;
GDate date;
gchar buffer[128];
PangoLayout *layout;
diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c
index 2906046a39..910b84b57b 100644
--- a/calendar/gui/itip-bonobo-control.c
+++ b/calendar/gui/itip-bonobo-control.c
@@ -21,6 +21,7 @@
*/
#include <config.h>
+#include <string.h>
#include <glib.h>
#include <gtk/gtkobject.h>
#include <gtk/gtkwidget.h>
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index e21e77c6bf..b299d60df9 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -26,6 +26,7 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <math.h>
+#include <string.h>
#include <time.h>
#include <glib.h>
#include <gtk/gtkradiobutton.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 05:45:56 +0800