diff options
| -rw-r--r-- | mail/e-mail.h | 1 | ||||
| -rw-r--r-- | marshal.mk | 7 | ||||
| -rw-r--r-- | modules/offline-alert/Makefile.am | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 8 | ||||
| -rw-r--r-- | shell/test/e-test-shell-view.c | 2 | ||||
| -rw-r--r-- | widgets/table/Makefile.am | 3 |
6 files changed, 15 insertions, 10 deletions
diff --git a/mail/e-mail.h b/mail/e-mail.h index aa19737785..7c40b20947 100644 --- a/mail/e-mail.h +++ b/mail/e-mail.h @@ -37,7 +37,6 @@ #include <mail/e-mail-migrate.h> #include <mail/e-mail-notebook-view.h> #include <mail/e-mail-paned-view.h> -#include <mail/e-mail-pane.h> #include <mail/e-mail-reader.h> #include <mail/e-mail-reader-utils.h> #include <mail/e-mail-session.h> diff --git a/marshal.mk b/marshal.mk new file mode 100644 index 0000000000..5da83b80ec --- /dev/null +++ b/marshal.mk @@ -0,0 +1,7 @@ +%.h: %.list + ( $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $< --header > $@.tmp \ + && mv $@.tmp $@ ) || ( rm -f $@.tmp && exit 1 ) + +%.c: %.list %.h + ( (echo "#include \"$*.h\""; $(GLIB_GENMARSHAL) --prefix=$(subst -,_,$*) $(srcdir)/$*.list --body) > $@.tmp \ + && mv $@.tmp $@ ) || ( rm -f $@.tmp && exit 1 ) diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am index 2979343869..c8c705183f 100644 --- a/modules/offline-alert/Makefile.am +++ b/modules/offline-alert/Makefile.am @@ -22,6 +22,10 @@ error_DATA = evolution-offline-alert.error errordir = $(privdatadir)/errors @EVO_PLUGIN_RULE@ +BUILT_SOURCES = $(error_DATA) + +CLEANFILES = $(BUILT_SOURCES) + EXTRA_DIST = evolution-offline-alert.error.xml -include $(top_srcdir)/git.mk diff --git a/po/POTFILES.in b/po/POTFILES.in index 38116a4620..ecaf5223d3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -43,7 +43,6 @@ calendar/gui/alarm-notify/alarm-notify-dialog.c [type: gettext/glade]calendar/gui/alarm-notify/alarm-notify.ui calendar/gui/alarm-notify/alarm-queue.c calendar/gui/alarm-notify/util.c -calendar/gui/apps_evolution_calendar.schemas.in calendar/gui/cal-editor-utils.c calendar/gui/calendar-view-factory.c calendar/gui/caltypes.xml @@ -51,8 +50,6 @@ calendar/gui/dialogs/alarm-dialog.c [type: gettext/glade]calendar/gui/dialogs/alarm-dialog.ui calendar/gui/dialogs/alarm-list-dialog.c [type: gettext/glade]calendar/gui/dialogs/alarm-list-dialog.ui -calendar/gui/dialogs/cal-prefs-dialog.c -[type: gettext/glade]calendar/gui/dialogs/cal-prefs-dialog.ui calendar/gui/dialogs/calendar-setup.c calendar/gui/dialogs/cancel-comp.c calendar/gui/dialogs/changed-comp.c @@ -95,8 +92,6 @@ calendar/gui/e-cell-date-edit-text.c calendar/gui/e-day-view-time-item.c calendar/gui/e-day-view-top-item.c calendar/gui/e-day-view.c -calendar/gui/e-itip-control.c -[type: gettext/glade]calendar/gui/e-itip-control.ui calendar/gui/e-meeting-list-view.c calendar/gui/e-meeting-store.c calendar/gui/e-meeting-time-sel-item.c @@ -243,6 +238,8 @@ modules/addressbook/e-book-shell-view-actions.c modules/addressbook/e-book-shell-view.c modules/addressbook/eab-composer-util.c [type: gettext/glade]modules/addressbook/ldap-config.ui +[type: gettext/glade]modules/calendar/e-calendar-preferences.ui +modules/calendar/apps_evolution_calendar.schemas.in modules/calendar/e-cal-attachment-handler.c modules/calendar/e-cal-shell-backend.c modules/calendar/e-cal-shell-content.c @@ -253,6 +250,7 @@ modules/calendar/e-cal-shell-view-memopad.c modules/calendar/e-cal-shell-view-private.c modules/calendar/e-cal-shell-view-taskpad.c modules/calendar/e-cal-shell-view.c +modules/calendar/e-calendar-preferences.c modules/calendar/e-memo-shell-backend.c modules/calendar/e-memo-shell-content.c modules/calendar/e-memo-shell-migrate.c diff --git a/shell/test/e-test-shell-view.c b/shell/test/e-test-shell-view.c index 924f9891f4..68d4ff9a7b 100644 --- a/shell/test/e-test-shell-view.c +++ b/shell/test/e-test-shell-view.c @@ -56,7 +56,7 @@ test_shell_view_dispose (GObject *object) priv = E_TEST_SHELL_VIEW_GET_PRIVATE (object); if (priv->activity != NULL) { - e_activity_complete (priv->activity); + e_activity_set_state (priv->activity, E_ACTIVITY_COMPLETED); g_object_unref (priv->activity); priv->activity = NULL; } diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am index b2afc9990e..04ce1c6f66 100644 --- a/widgets/table/Makefile.am +++ b/widgets/table/Makefile.am @@ -179,13 +179,10 @@ libetable_la_LIBADD = \ $(GNOME_PLATFORM_LIBS) icons = \ - add-col.xpm \ arrow-down.xpm \ arrow-up.xpm \ - add-col.xpm \ check-empty.xpm \ check-filled.xpm \ - remove-col.xpm \ tree-expanded.xpm \ tree-unexpanded.xpm |