This commit is contained in:
parent
7c9807ba24
commit
1f906e2f10
@ -1,20 +1,20 @@
|
|||||||
Index: plugins/backup-restore/backup.c
|
Index: plugins/backup-restore/backup.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- plugins/backup-restore/backup.c (revision 36769)
|
--- plugins/backup-restore/backup.c.orig
|
||||||
+++ plugins/backup-restore/backup.c (working copy)
|
+++ plugins/backup-restore/backup.c
|
||||||
@@ -39,6 +39,7 @@
|
@@ -35,6 +35,7 @@
|
||||||
#include "e-util/e-util.h"
|
#define EVOUSERDATADIR_MAGIC "#EVO_USERDATADIR#"
|
||||||
|
|
||||||
#define EVOLUTION "evolution"
|
#define EVOLUTION "evolution"
|
||||||
+#define PKILL "/usr/bin/pkill"
|
+#define PKILL "/usr/bin/pkill"
|
||||||
#define EVOLUTION_DIR "$HOME/.evolution/"
|
#define EVOLUTION_DIR "$HOME/.evolution/"
|
||||||
#define EVOLUTION_DIR_BACKUP "$HOME/.evolution-old/"
|
#define EVOLUTION_DIR_BACKUP "$HOME/.evolution-old/"
|
||||||
#define GCONF_DUMP_FILE "backup-restore-gconf.xml"
|
#define GCONF_DUMP_FILE "backup-restore-gconf.xml"
|
||||||
@@ -272,6 +273,7 @@
|
@@ -252,6 +253,7 @@ restore (const char *filename)
|
||||||
|
|
||||||
CANCEL (complete);
|
replace_in_file (GCONF_DUMP_PATH, EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
|
||||||
txt = _("Loading Evolution settings");
|
|
||||||
+ s (PKILL " gconf");
|
+ run_cmd (PKILL " gconf");
|
||||||
s ("gconftool-2 --load " GCONF_DUMP_PATH);
|
run_cmd ("gconftool-2 --load " GCONF_DUMP_PATH);
|
||||||
|
|
||||||
CANCEL (complete);
|
CANCEL (complete);
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:2831a4601636c6cfc7eb37736e915535bcfc8165543255272f816e22796f9c43
|
|
||||||
size 32859330
|
|
3
evolution-2.27.2.tar.bz2
Normal file
3
evolution-2.27.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b41e124ffabb52395b1f2feb9a343321a126820a8d43f2145054fe1e951de2ab
|
||||||
|
size 36472704
|
@ -1,7 +1,7 @@
|
|||||||
diff --git a/configure.in b/configure.in
|
diff --git a/configure.ac b/configure.ac
|
||||||
index c1bd707..0f03233 100644
|
index c1bd707..0f03233 100644
|
||||||
--- a/configure.in
|
--- a/configure.ac
|
||||||
+++ b/configure.in
|
+++ b/configure.ac
|
||||||
@@ -537,7 +537,7 @@ esac
|
@@ -537,7 +537,7 @@ esac
|
||||||
|
|
||||||
SAVE_CFLAGS="$CFLAGS"
|
SAVE_CFLAGS="$CFLAGS"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
diff -upr evolution-2.24.1-old/configure.in evolution-2.24.1-new/configure.in
|
diff -upr evolution-2.24.1-old/configure.ac evolution-2.24.1-new/configure.ac
|
||||||
--- evolution-2.24.1-old/configure.in 2008-10-19 22:27:24.000000000 -0500
|
--- evolution-2.24.1-old/configure.ac 2008-10-19 22:27:24.000000000 -0500
|
||||||
+++ evolution-2.24.1-new/configure.in 2008-10-26 17:46:09.000000000 -0600
|
+++ evolution-2.24.1-new/configure.ac 2008-10-26 17:46:09.000000000 -0600
|
||||||
@@ -1015,6 +1015,9 @@ if test "x${enable_nss}" = "xyes" || tes
|
@@ -1015,6 +1015,9 @@ if test "x${enable_nss}" = "xyes" || tes
|
||||||
AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
|
AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
|
||||||
msg_smime="yes (Mozilla NSS)"
|
msg_smime="yes (Mozilla NSS)"
|
||||||
|
@ -1,3 +1,51 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 27 17:54:21 CEST 2009 - vuntz@novell.com
|
||||||
|
|
||||||
|
- Update to version 2.27.2:
|
||||||
|
+ bgo#274117 - Difficult to post a new message to newsgroups
|
||||||
|
+ bgo#440919 - Evolution can't attach "zero length" files
|
||||||
|
+ bgo#458491 - Remove useless "Call To..." popup menu option
|
||||||
|
+ bgo#523216 - User-oriented plugin descriptions
|
||||||
|
+ bgo#524497 - Wrong "From" value if multiple accounts configured
|
||||||
|
+ bgo#559366 - Evolution: Cannot scroll the Calendar view using
|
||||||
|
the arrow keys
|
||||||
|
+ bgo#571496 - Migrate from deprecated gnome_execute to
|
||||||
|
g_spawn/xdg-terminal
|
||||||
|
+ bgo#578176 - "Send message to contact" does not honor "always
|
||||||
|
BCC"
|
||||||
|
+ bgo#578478 - Composer shows not all "From" information
|
||||||
|
+ bgo#579779 - Evolution crashes when updating a repeated (eg,
|
||||||
|
yearly) event for all event instances
|
||||||
|
+ bgo#580163 - alarm notify window does not resize correctly
|
||||||
|
+ bgo#580900 - Kill libgnomeui/gnome-dateedit
|
||||||
|
+ bgo#580925 - Better search bar for word searches
|
||||||
|
+ bgo#581424 - Personal folder tree appears besides Public folder
|
||||||
|
when you go to Folder > Subscription
|
||||||
|
+ bgo#581454 - Move nautilus-sendto integration to Evolution
|
||||||
|
+ bgo#582144 - Evolution not showing proper attachment filename
|
||||||
|
+ bgo#582168 - Remove duplicated shebang and comment from
|
||||||
|
autogen.sh
|
||||||
|
+ bgo#582585 - Crash when deleting multiple attachments from
|
||||||
|
composed mail
|
||||||
|
+ bgo#582626 - Time zone "select" button is broken
|
||||||
|
+ bgo#582744 - CC field autofill doesn't work for replies
|
||||||
|
+ bgo#583360 - Evolution won't set "UTC" as a "second zone" on
|
||||||
|
Calendar and Tasks preferences
|
||||||
|
+ bnc#498712 - deleting meetings sometimes does not work properly
|
||||||
|
+ bnc#499107 - delete all the recurring instances from the folder
|
||||||
|
+ Updated Translations.
|
||||||
|
- Respin bnc-433448-backup-restore-fails.patch,
|
||||||
|
evolution-custom-openldap-includes.patch,
|
||||||
|
evolution-shared-nss-db.patch, sharepoint-account-setup.patch,
|
||||||
|
sp-meetingworkspace-ui.patch
|
||||||
|
- Remove individual desktop files for components: drop
|
||||||
|
ximian-evolution-pixmaps.tar.bz2 and
|
||||||
|
ximian-evolution-desktop-files.tar.bz2.
|
||||||
|
- Drop summerdance-about2.png: the about box doesn't use this
|
||||||
|
anymore.
|
||||||
|
- Add NetworkManager-devel, gstreamer-0_10-devel and libytnef-devel
|
||||||
|
BuildRequires for features we were missing.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue May 5 17:54:21 CEST 2009 - vuntz@novell.com
|
Tue May 5 17:54:21 CEST 2009 - vuntz@novell.com
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package evolution (Version 2.27.1)
|
# spec file for package evolution (Version 2.27.2)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@ -19,6 +19,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: evolution
|
Name: evolution
|
||||||
|
BuildRequires: NetworkManager-devel
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
%if %suse_version > 1100
|
%if %suse_version > 1100
|
||||||
BuildRequires: evoldap2-devel
|
BuildRequires: evoldap2-devel
|
||||||
@ -32,6 +33,7 @@ BuildRequires: gnome-doc-utils-devel
|
|||||||
BuildRequires: gnome-icon-theme-devel
|
BuildRequires: gnome-icon-theme-devel
|
||||||
BuildRequires: gnome-patch-translation
|
BuildRequires: gnome-patch-translation
|
||||||
BuildRequires: gnome-pilot-devel
|
BuildRequires: gnome-pilot-devel
|
||||||
|
BuildRequires: gstreamer-0_10-devel
|
||||||
BuildRequires: gtk-doc
|
BuildRequires: gtk-doc
|
||||||
BuildRequires: gtkhtml2-devel
|
BuildRequires: gtkhtml2-devel
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
@ -41,6 +43,7 @@ BuildRequires: libnotify-devel
|
|||||||
BuildRequires: libpisock-devel
|
BuildRequires: libpisock-devel
|
||||||
BuildRequires: libpisync-devel
|
BuildRequires: libpisync-devel
|
||||||
BuildRequires: libpst-devel
|
BuildRequires: libpst-devel
|
||||||
|
BuildRequires: libytnef-devel
|
||||||
BuildRequires: mozilla-nss-devel
|
BuildRequires: mozilla-nss-devel
|
||||||
BuildRequires: nss-shared-helper-devel
|
BuildRequires: nss-shared-helper-devel
|
||||||
BuildRequires: pilot-link
|
BuildRequires: pilot-link
|
||||||
@ -55,13 +58,10 @@ License: LGPL v2.0 only; LGPL v3 only
|
|||||||
Group: Productivity/Networking/Email/Clients
|
Group: Productivity/Networking/Email/Clients
|
||||||
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
|
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
|
||||||
%define evolution_base_version 2.28
|
%define evolution_base_version 2.28
|
||||||
Version: 2.27.1
|
Version: 2.27.2
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
|
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
|
||||||
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar.bz2
|
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar.bz2
|
||||||
Source1: summerdance-about2.png
|
|
||||||
Source2: ximian-evolution-desktop-files.tar.bz2
|
|
||||||
Source3: ximian-evolution-pixmaps.tar.bz2
|
|
||||||
# PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number
|
# PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number
|
||||||
Patch7: calendar-sendbutton.patch
|
Patch7: calendar-sendbutton.patch
|
||||||
Patch8: fix-exchange-menuitem.diff
|
Patch8: fix-exchange-menuitem.diff
|
||||||
@ -475,17 +475,7 @@ popd
|
|||||||
# Remove the libtool archive files
|
# Remove the libtool archive files
|
||||||
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*.la
|
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*.la
|
||||||
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*/*.la
|
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*/*.la
|
||||||
%{__cp} %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/%evolution_base_version/images/about-box.png
|
|
||||||
# Install the Ximian pixmaps.
|
|
||||||
%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/pixmaps
|
|
||||||
%{__tar} --bzip2 -xf %{SOURCE3} -C $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
|
|
||||||
# Install and update the SUSE desktop files.
|
|
||||||
%{__tar} --bzip2 -xf %{SOURCE2} -C $RPM_BUILD_ROOT/%{_datadir}/applications/
|
|
||||||
%suse_update_desktop_file -G "Mail and Calendar" -N "Evolution" -D "evolution" evolution Core-Office
|
%suse_update_desktop_file -G "Mail and Calendar" -N "Evolution" -D "evolution" evolution Core-Office
|
||||||
%suse_update_desktop_file evolution-addressbook
|
|
||||||
%suse_update_desktop_file evolution-calendar
|
|
||||||
%suse_update_desktop_file evolution-email
|
|
||||||
%suse_update_desktop_file evolution-tasklist
|
|
||||||
%find_lang evolution-%evolution_base_version
|
%find_lang evolution-%evolution_base_version
|
||||||
%find_lang evolution evolution-%evolution_base_version.lang
|
%find_lang evolution evolution-%evolution_base_version.lang
|
||||||
%find_gconf_schemas
|
%find_gconf_schemas
|
||||||
@ -523,7 +513,6 @@ fi
|
|||||||
%{_datadir}/applications/*.desktop
|
%{_datadir}/applications/*.desktop
|
||||||
%{_datadir}/evolution
|
%{_datadir}/evolution
|
||||||
%{_datadir}/idl/*
|
%{_datadir}/idl/*
|
||||||
%{_datadir}/pixmaps/*.png
|
|
||||||
%{_datadir}/icons/hicolor/*/apps/*.png
|
%{_datadir}/icons/hicolor/*/apps/*.png
|
||||||
%{_datadir}/icons/hicolor/scalable/apps/*.svg
|
%{_datadir}/icons/hicolor/scalable/apps/*.svg
|
||||||
%{_libdir}/bonobo/servers/*.server
|
%{_libdir}/bonobo/servers/*.server
|
||||||
@ -554,8 +543,9 @@ fi
|
|||||||
%{_libdir}/evolution/*/plugins/*-evolution-webdav.*
|
%{_libdir}/evolution/*/plugins/*-evolution-webdav.*
|
||||||
%{_libdir}/evolution/*/plugins/*-exchange-*-subscription.*
|
%{_libdir}/evolution/*/plugins/*-exchange-*-subscription.*
|
||||||
%{_libdir}/evolution/*/plugins/*-exchange-operations.*
|
%{_libdir}/evolution/*/plugins/*-exchange-operations.*
|
||||||
%{_libdir}/evolution/*/plugins/*-face.*
|
|
||||||
%{_libdir}/evolution/*/plugins/*-folder-*.*
|
%{_libdir}/evolution/*/plugins/*-folder-*.*
|
||||||
|
%{_libdir}/evolution/*/plugins/*-gnome-audio-inline.*
|
||||||
|
%{_libdir}/evolution/*/plugins/*-gnome-vcard-inline.*
|
||||||
%{_libdir}/evolution/*/plugins/*-groupwise-features.*
|
%{_libdir}/evolution/*/plugins/*-groupwise-features.*
|
||||||
%{_libdir}/evolution/*/plugins/*-gw-account-setup.*
|
%{_libdir}/evolution/*/plugins/*-gw-account-setup.*
|
||||||
%{_libdir}/evolution/*/plugins/*-imap-features.*
|
%{_libdir}/evolution/*/plugins/*-imap-features.*
|
||||||
@ -598,6 +588,51 @@ fi
|
|||||||
#%{_libdir}/evolution/*/plugins/*.dll
|
#%{_libdir}/evolution/*/plugins/*.dll
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 27 2009 vuntz@novell.com
|
||||||
|
- Update to version 2.27.2:
|
||||||
|
+ bgo#274117 - Difficult to post a new message to newsgroups
|
||||||
|
+ bgo#440919 - Evolution can't attach "zero length" files
|
||||||
|
+ bgo#458491 - Remove useless "Call To..." popup menu option
|
||||||
|
+ bgo#523216 - User-oriented plugin descriptions
|
||||||
|
+ bgo#524497 - Wrong "From" value if multiple accounts configured
|
||||||
|
+ bgo#559366 - Evolution: Cannot scroll the Calendar view using
|
||||||
|
the arrow keys
|
||||||
|
+ bgo#571496 - Migrate from deprecated gnome_execute to
|
||||||
|
g_spawn/xdg-terminal
|
||||||
|
+ bgo#578176 - "Send message to contact" does not honor "always
|
||||||
|
BCC"
|
||||||
|
+ bgo#578478 - Composer shows not all "From" information
|
||||||
|
+ bgo#579779 - Evolution crashes when updating a repeated (eg,
|
||||||
|
yearly) event for all event instances
|
||||||
|
+ bgo#580163 - alarm notify window does not resize correctly
|
||||||
|
+ bgo#580900 - Kill libgnomeui/gnome-dateedit
|
||||||
|
+ bgo#580925 - Better search bar for word searches
|
||||||
|
+ bgo#581424 - Personal folder tree appears besides Public folder
|
||||||
|
when you go to Folder > Subscription
|
||||||
|
+ bgo#581454 - Move nautilus-sendto integration to Evolution
|
||||||
|
+ bgo#582144 - Evolution not showing proper attachment filename
|
||||||
|
+ bgo#582168 - Remove duplicated shebang and comment from
|
||||||
|
autogen.sh
|
||||||
|
+ bgo#582585 - Crash when deleting multiple attachments from
|
||||||
|
composed mail
|
||||||
|
+ bgo#582626 - Time zone "select" button is broken
|
||||||
|
+ bgo#582744 - CC field autofill doesn't work for replies
|
||||||
|
+ bgo#583360 - Evolution won't set "UTC" as a "second zone" on
|
||||||
|
Calendar and Tasks preferences
|
||||||
|
+ bnc#498712 - deleting meetings sometimes does not work properly
|
||||||
|
+ bnc#499107 - delete all the recurring instances from the folder
|
||||||
|
+ Updated Translations.
|
||||||
|
- Respin bnc-433448-backup-restore-fails.patch,
|
||||||
|
evolution-custom-openldap-includes.patch,
|
||||||
|
evolution-shared-nss-db.patch, sharepoint-account-setup.patch,
|
||||||
|
sp-meetingworkspace-ui.patch
|
||||||
|
- Remove individual desktop files for components: drop
|
||||||
|
ximian-evolution-pixmaps.tar.bz2 and
|
||||||
|
ximian-evolution-desktop-files.tar.bz2.
|
||||||
|
- Drop summerdance-about2.png: the about box doesn't use this
|
||||||
|
anymore.
|
||||||
|
- Add NetworkManager-devel, gstreamer-0_10-devel and libytnef-devel
|
||||||
|
BuildRequires for features we were missing.
|
||||||
* Tue May 05 2009 vuntz@novell.com
|
* Tue May 05 2009 vuntz@novell.com
|
||||||
- Update to version 2.27.1:
|
- Update to version 2.27.1:
|
||||||
+ bgo#574680 - Remove all headers except "References" and
|
+ bgo#574680 - Remove all headers except "References" and
|
||||||
|
@ -464,10 +464,10 @@ Index: evolution-2.25.90/ui/evolution.xml
|
|||||||
<menuitem name="OpenNewWindow" verb="" pixtype="pixbuf"/>
|
<menuitem name="OpenNewWindow" verb="" pixtype="pixbuf"/>
|
||||||
|
|
||||||
<separator f="" name="eshell4"/>
|
<separator f="" name="eshell4"/>
|
||||||
Index: evolution-2.25.90/configure.in
|
Index: evolution-2.25.90/configure.ac
|
||||||
===================================================================
|
===================================================================
|
||||||
--- evolution-2.25.90.orig/configure.in
|
--- evolution-2.25.90.orig/configure.ac
|
||||||
+++ evolution-2.25.90/configure.in
|
+++ evolution-2.25.90/configure.ac
|
||||||
@@ -923,6 +923,24 @@ if test "x${enable_mono}" = "xyes"; then
|
@@ -923,6 +923,24 @@ if test "x${enable_mono}" = "xyes"; then
|
||||||
PKG_CHECK_MODULES(MONO, "mono")
|
PKG_CHECK_MODULES(MONO, "mono")
|
||||||
AC_DEFINE(ENABLE_MONO,1,[Define if Mono embedding should be enabled])
|
AC_DEFINE(ENABLE_MONO,1,[Define if Mono embedding should be enabled])
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: evolution-2.27.1/calendar/gui/dialogs/comp-editor.c
|
Index: evolution-2.27.2/calendar/gui/dialogs/comp-editor.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- evolution-2.27.1.orig/calendar/gui/dialogs/comp-editor.c
|
--- evolution-2.27.2.orig/calendar/gui/dialogs/comp-editor.c
|
||||||
+++ evolution-2.27.1/calendar/gui/dialogs/comp-editor.c
|
+++ evolution-2.27.2/calendar/gui/dialogs/comp-editor.c
|
||||||
@@ -63,6 +63,7 @@
|
@@ -63,6 +63,7 @@
|
||||||
#include "../e-cal-popup.h"
|
#include "../e-cal-popup.h"
|
||||||
#include "../calendar-config-keys.h"
|
#include "../calendar-config-keys.h"
|
||||||
@ -18,7 +18,7 @@ Index: evolution-2.27.1/calendar/gui/dialogs/comp-editor.c
|
|||||||
gchar *summary;
|
gchar *summary;
|
||||||
|
|
||||||
guint32 attachment_bar_visible : 1;
|
guint32 attachment_bar_visible : 1;
|
||||||
@@ -1599,11 +1601,11 @@ comp_editor_init (CompEditor *editor)
|
@@ -1606,11 +1608,11 @@ comp_editor_init (CompEditor *editor)
|
||||||
|
|
||||||
container = GTK_WIDGET (editor);
|
container = GTK_WIDGET (editor);
|
||||||
|
|
||||||
@ -34,7 +34,7 @@ Index: evolution-2.27.1/calendar/gui/dialogs/comp-editor.c
|
|||||||
|
|
||||||
widget = comp_editor_get_managed_widget (editor, "/main-menu");
|
widget = comp_editor_get_managed_widget (editor, "/main-menu");
|
||||||
gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
|
gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
|
||||||
@@ -1943,6 +1945,22 @@ comp_editor_get_ui_manager (CompEditor *
|
@@ -1955,6 +1957,22 @@ comp_editor_get_ui_manager (CompEditor *
|
||||||
return editor->priv->ui_manager;
|
return editor->priv->ui_manager;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -57,7 +57,7 @@ Index: evolution-2.27.1/calendar/gui/dialogs/comp-editor.c
|
|||||||
GtkAction *
|
GtkAction *
|
||||||
comp_editor_get_action (CompEditor *editor,
|
comp_editor_get_action (CompEditor *editor,
|
||||||
const gchar *action_name)
|
const gchar *action_name)
|
||||||
@@ -2100,9 +2118,15 @@ comp_editor_append_page (CompEditor *edi
|
@@ -2112,9 +2130,15 @@ comp_editor_append_page (CompEditor *edi
|
||||||
|
|
||||||
priv->pages = g_list_append (priv->pages, page);
|
priv->pages = g_list_append (priv->pages, page);
|
||||||
|
|
||||||
@ -74,10 +74,10 @@ Index: evolution-2.27.1/calendar/gui/dialogs/comp-editor.c
|
|||||||
/* Listen for things happening on the page */
|
/* Listen for things happening on the page */
|
||||||
g_signal_connect_swapped (
|
g_signal_connect_swapped (
|
||||||
page, "dates_changed",
|
page, "dates_changed",
|
||||||
Index: evolution-2.27.1/calendar/gui/dialogs/event-editor.c
|
Index: evolution-2.27.2/calendar/gui/dialogs/event-editor.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- evolution-2.27.1.orig/calendar/gui/dialogs/event-editor.c
|
--- evolution-2.27.2.orig/calendar/gui/dialogs/event-editor.c
|
||||||
+++ evolution-2.27.1/calendar/gui/dialogs/event-editor.c
|
+++ evolution-2.27.2/calendar/gui/dialogs/event-editor.c
|
||||||
@@ -38,6 +38,7 @@
|
@@ -38,6 +38,7 @@
|
||||||
#include <e-util/e-util-private.h>
|
#include <e-util/e-util-private.h>
|
||||||
#include <evolution-shell-component-utils.h>
|
#include <evolution-shell-component-utils.h>
|
||||||
@ -133,10 +133,10 @@ Index: evolution-2.27.1/calendar/gui/dialogs/event-editor.c
|
|||||||
gtk_action_set_visible (action, FALSE);
|
gtk_action_set_visible (action, FALSE);
|
||||||
|
|
||||||
g_signal_connect (
|
g_signal_connect (
|
||||||
Index: evolution-2.27.1/calendar/gui/dialogs/event-editor.h
|
Index: evolution-2.27.2/calendar/gui/dialogs/event-editor.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- evolution-2.27.1.orig/calendar/gui/dialogs/event-editor.h
|
--- evolution-2.27.2.orig/calendar/gui/dialogs/event-editor.h
|
||||||
+++ evolution-2.27.1/calendar/gui/dialogs/event-editor.h
|
+++ evolution-2.27.2/calendar/gui/dialogs/event-editor.h
|
||||||
@@ -68,6 +68,7 @@ GType event_editor_get_type (void);
|
@@ -68,6 +68,7 @@ GType event_editor_get_type (void);
|
||||||
CompEditor * event_editor_new (ECal *client,
|
CompEditor * event_editor_new (ECal *client,
|
||||||
CompEditorFlags flags);
|
CompEditorFlags flags);
|
||||||
@ -145,11 +145,11 @@ Index: evolution-2.27.1/calendar/gui/dialogs/event-editor.h
|
|||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
Index: evolution-2.27.1/calendar/gui/dialogs/event-page.c
|
Index: evolution-2.27.2/calendar/gui/dialogs/event-page.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- evolution-2.27.1.orig/calendar/gui/dialogs/event-page.c
|
--- evolution-2.27.2.orig/calendar/gui/dialogs/event-page.c
|
||||||
+++ evolution-2.27.1/calendar/gui/dialogs/event-page.c
|
+++ evolution-2.27.2/calendar/gui/dialogs/event-page.c
|
||||||
@@ -701,6 +701,26 @@ create_image_event_box (const char *imag
|
@@ -714,6 +714,26 @@ create_image_event_box (const char *imag
|
||||||
return box;
|
return box;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -176,10 +176,10 @@ Index: evolution-2.27.1/calendar/gui/dialogs/event-page.c
|
|||||||
static void
|
static void
|
||||||
sensitize_widgets (EventPage *epage)
|
sensitize_widgets (EventPage *epage)
|
||||||
{
|
{
|
||||||
Index: evolution-2.27.1/calendar/gui/dialogs/event-page.h
|
Index: evolution-2.27.2/calendar/gui/dialogs/event-page.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- evolution-2.27.1.orig/calendar/gui/dialogs/event-page.h
|
--- evolution-2.27.2.orig/calendar/gui/dialogs/event-page.h
|
||||||
+++ evolution-2.27.1/calendar/gui/dialogs/event-page.h
|
+++ evolution-2.27.2/calendar/gui/dialogs/event-page.h
|
||||||
@@ -110,6 +110,8 @@ void event_page_add_attendee (EventPag
|
@@ -110,6 +110,8 @@ void event_page_add_attendee (EventPag
|
||||||
EMeetingAttendee *attendee);
|
EMeetingAttendee *attendee);
|
||||||
void event_page_remove_all_attendees (EventPage *epage);
|
void event_page_remove_all_attendees (EventPage *epage);
|
||||||
@ -189,10 +189,10 @@ Index: evolution-2.27.1/calendar/gui/dialogs/event-page.h
|
|||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
Index: evolution-2.27.1/calendar/gui/e-cal-event.c
|
Index: evolution-2.27.2/calendar/gui/e-cal-event.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- evolution-2.27.1.orig/calendar/gui/e-cal-event.c
|
--- evolution-2.27.2.orig/calendar/gui/e-cal-event.c
|
||||||
+++ evolution-2.27.1/calendar/gui/e-cal-event.c
|
+++ evolution-2.27.2/calendar/gui/e-cal-event.c
|
||||||
@@ -103,6 +103,16 @@ e_cal_event_target_new_component (ECalEv
|
@@ -103,6 +103,16 @@ e_cal_event_target_new_component (ECalEv
|
||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
@ -229,20 +229,22 @@ Index: evolution-2.27.1/calendar/gui/e-cal-event.c
|
|||||||
static void
|
static void
|
||||||
eceh_finalize (GObject *o)
|
eceh_finalize (GObject *o)
|
||||||
{
|
{
|
||||||
Index: evolution-2.27.1/calendar/gui/e-cal-event.h
|
Index: evolution-2.27.2/calendar/gui/e-cal-event.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- evolution-2.27.1.orig/calendar/gui/e-cal-event.h
|
--- evolution-2.27.2.orig/calendar/gui/e-cal-event.h
|
||||||
+++ evolution-2.27.1/calendar/gui/e-cal-event.h
|
+++ evolution-2.27.2/calendar/gui/e-cal-event.h
|
||||||
@@ -38,6 +38,7 @@ typedef struct _ECalEventClass ECalEvent
|
@@ -37,7 +37,8 @@ typedef struct _ECalEvent ECalEvent;
|
||||||
|
typedef struct _ECalEventClass ECalEventClass;
|
||||||
|
|
||||||
enum _e_cal_event_target_t {
|
enum _e_cal_event_target_t {
|
||||||
E_CAL_EVENT_TARGET_COMPONENT,
|
- E_CAL_EVENT_TARGET_COMPONENT
|
||||||
+ E_CAL_EVENT_TARGET_COMP_EDITOR,
|
+ E_CAL_EVENT_TARGET_COMPONENT,
|
||||||
|
+ E_CAL_EVENT_TARGET_COMP_EDITOR
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Flags that describe TARGET_COMPONENT */
|
/* Flags that describe TARGET_COMPONENT */
|
||||||
@@ -45,6 +46,11 @@ enum {
|
@@ -45,6 +46,11 @@ enum {
|
||||||
E_CAL_EVENT_COMPONENT_MIGRATION = 1 << 0,
|
E_CAL_EVENT_COMPONENT_MIGRATION = 1 << 0
|
||||||
};
|
};
|
||||||
|
|
||||||
+
|
+
|
||||||
@ -276,10 +278,10 @@ Index: evolution-2.27.1/calendar/gui/e-cal-event.h
|
|||||||
|
|
||||||
/* ********************************************************************** */
|
/* ********************************************************************** */
|
||||||
|
|
||||||
Index: evolution-2.27.1/plugins/sharepoint-features/Makefile.am
|
Index: evolution-2.27.2/plugins/sharepoint-features/Makefile.am
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ evolution-2.27.1/plugins/sharepoint-features/Makefile.am
|
+++ evolution-2.27.2/plugins/sharepoint-features/Makefile.am
|
||||||
@@ -0,0 +1,40 @@
|
@@ -0,0 +1,40 @@
|
||||||
+INCLUDES = \
|
+INCLUDES = \
|
||||||
+ -I$(top_srcdir) \
|
+ -I$(top_srcdir) \
|
||||||
@ -321,10 +323,10 @@ Index: evolution-2.27.1/plugins/sharepoint-features/Makefile.am
|
|||||||
+BUILT_SOURCES = org-gnome-sharepoint-features.eplug
|
+BUILT_SOURCES = org-gnome-sharepoint-features.eplug
|
||||||
+
|
+
|
||||||
+CLEANFILES = $(BUILT_SOURCES)
|
+CLEANFILES = $(BUILT_SOURCES)
|
||||||
Index: evolution-2.27.1/plugins/sharepoint-features/meetingworkspaces.glade
|
Index: evolution-2.27.2/plugins/sharepoint-features/meetingworkspaces.glade
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ evolution-2.27.1/plugins/sharepoint-features/meetingworkspaces.glade
|
+++ evolution-2.27.2/plugins/sharepoint-features/meetingworkspaces.glade
|
||||||
@@ -0,0 +1,324 @@
|
@@ -0,0 +1,324 @@
|
||||||
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
||||||
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
||||||
@ -650,10 +652,10 @@ Index: evolution-2.27.1/plugins/sharepoint-features/meetingworkspaces.glade
|
|||||||
+</widget>
|
+</widget>
|
||||||
+
|
+
|
||||||
+</glade-interface>
|
+</glade-interface>
|
||||||
Index: evolution-2.27.1/plugins/sharepoint-features/org-gnome-sharepoint-features.eplug.xml
|
Index: evolution-2.27.2/plugins/sharepoint-features/org-gnome-sharepoint-features.eplug.xml
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ evolution-2.27.1/plugins/sharepoint-features/org-gnome-sharepoint-features.eplug.xml
|
+++ evolution-2.27.2/plugins/sharepoint-features/org-gnome-sharepoint-features.eplug.xml
|
||||||
@@ -0,0 +1,20 @@
|
@@ -0,0 +1,20 @@
|
||||||
+<e-plugin-list>
|
+<e-plugin-list>
|
||||||
+ <e-plugin
|
+ <e-plugin
|
||||||
@ -675,10 +677,10 @@ Index: evolution-2.27.1/plugins/sharepoint-features/org-gnome-sharepoint-feature
|
|||||||
+ </hook>
|
+ </hook>
|
||||||
+ </e-plugin>
|
+ </e-plugin>
|
||||||
+</e-plugin-list>
|
+</e-plugin-list>
|
||||||
Index: evolution-2.27.1/plugins/sharepoint-features/meeting-workspace.c
|
Index: evolution-2.27.2/plugins/sharepoint-features/meeting-workspace.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ evolution-2.27.1/plugins/sharepoint-features/meeting-workspace.c
|
+++ evolution-2.27.2/plugins/sharepoint-features/meeting-workspace.c
|
||||||
@@ -0,0 +1,230 @@
|
@@ -0,0 +1,230 @@
|
||||||
+#ifdef HAVE_CONFIG_H
|
+#ifdef HAVE_CONFIG_H
|
||||||
+#include <config.h>
|
+#include <config.h>
|
||||||
@ -910,11 +912,11 @@ Index: evolution-2.27.1/plugins/sharepoint-features/meeting-workspace.c
|
|||||||
+ g_error_free (error);
|
+ g_error_free (error);
|
||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
Index: evolution-2.27.1/configure.in
|
Index: evolution-2.27.2/configure.ac
|
||||||
===================================================================
|
===================================================================
|
||||||
--- evolution-2.27.1.orig/configure.in
|
--- evolution-2.27.2.orig/configure.ac
|
||||||
+++ evolution-2.27.1/configure.in
|
+++ evolution-2.27.2/configure.ac
|
||||||
@@ -938,6 +938,9 @@ if test "x${enable_mono}" = "xyes"; then
|
@@ -965,6 +965,9 @@ if test "x${enable_mono}" = "xyes"; then
|
||||||
evolution-sharp, ndesk-dbus-1.0, ndesk-dbus-glib-1.0])
|
evolution-sharp, ndesk-dbus-1.0, ndesk-dbus-glib-1.0])
|
||||||
AC_SUBST(MONO_PLATFORM_CFLAGS)
|
AC_SUBST(MONO_PLATFORM_CFLAGS)
|
||||||
AC_SUBST(MONO_PLATFORM_LIBS)
|
AC_SUBST(MONO_PLATFORM_LIBS)
|
||||||
@ -924,7 +926,7 @@ Index: evolution-2.27.1/configure.in
|
|||||||
MONO_BASED_PLUGINS=""
|
MONO_BASED_PLUGINS=""
|
||||||
|
|
||||||
dnl Sharepoint account setup
|
dnl Sharepoint account setup
|
||||||
@@ -949,7 +952,7 @@ if test "x${enable_mono}" = "xyes"; then
|
@@ -976,7 +979,7 @@ if test "x${enable_mono}" = "xyes"; then
|
||||||
PKG_CHECK_MODULES(ICE_DESKTOP, [Novell.IceDesktop, solvent])
|
PKG_CHECK_MODULES(ICE_DESKTOP, [Novell.IceDesktop, solvent])
|
||||||
AC_SUBST(ICE_DESKTOP_CFLAGS)
|
AC_SUBST(ICE_DESKTOP_CFLAGS)
|
||||||
AC_SUBST(ICE_DESKTOP_LIBS)
|
AC_SUBST(ICE_DESKTOP_LIBS)
|
||||||
@ -933,8 +935,8 @@ Index: evolution-2.27.1/configure.in
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
AC_SUBST(MONO_CFLAGS)
|
AC_SUBST(MONO_CFLAGS)
|
||||||
@@ -2148,6 +2151,7 @@ plugins/templates/Makefile
|
@@ -2161,6 +2164,7 @@ plugins/tnef-attachments/Makefile
|
||||||
plugins/tnef-attachments/Makefile
|
plugins/vcard-inline/Makefile
|
||||||
plugins/webdav-account-setup/Makefile
|
plugins/webdav-account-setup/Makefile
|
||||||
plugins/sharepoint-account-setup/Makefile
|
plugins/sharepoint-account-setup/Makefile
|
||||||
+plugins/sharepoint-features/Makefile
|
+plugins/sharepoint-features/Makefile
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ff20cf43525e5f2125d8b883ac2e78f3f9a2bc4a994dbaa9c3c9864556955393
|
|
||||||
size 28107
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:fafbe2a75a4a7709d6c95c6c10e37bc60ad71c2261df552a51a961ba67a4eda8
|
|
||||||
size 514
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:13e80f0f8258e09c9869c95b4ca3fef1fe97f8b6b42a2583a5ad9707de8c4094
|
|
||||||
size 12549
|
|
Loading…
Reference in New Issue
Block a user