pool/evolution
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=37

Browse Source
This commit is contained in:
OBS User unknown 2008-05-22 23:33:26 +00:00 committed by Git OBS Bridge
parent 7d4c4338ae
commit ef10dddc35
4 changed files with 115 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bgo-533820-fix-crash-on-border-clicking-meetings.diff Normal file
View File

@ -0,0 +1,24 @@
Index: calendar/gui/e-day-view.c
===================================================================
--- calendar/gui/e-day-view.c (revision 35521)
+++ calendar/gui/e-day-view.c (working copy)
@@ -3822,6 +3822,9 @@ e_day_view_update_resize (EDayView *day_
g_print ("Updating resize Row:%i\n", row);
#endif
+ if (day_view->resize_event_num == -1)
+ return;
+
day = day_view->resize_event_day;
event_num = day_view->resize_event_num;
event = &g_array_index (day_view->events[day], EDayViewEvent,
@@ -3972,6 +3975,9 @@ e_day_view_finish_resize (EDayView *day_
CalObjModType mod = CALOBJ_MOD_ALL;
GtkWindow *toplevel;
+ if (day_view->resize_event_num == -1)
+ return;
+
day = day_view->resize_event_day;
event_num = day_view->resize_event_num;
event = &g_array_index (day_view->events[day], EDayViewEvent,

73
bgo-534012-backup-permission.patch Normal file
View File

@ -0,0 +1,73 @@
Index: plugins/backup-restore/org-gnome-backup-restore.error.xml
===================================================================
--- plugins/backup-restore/org-gnome-backup-restore.error.xml (revision 35517)
+++ plugins/backup-restore/org-gnome-backup-restore.error.xml (working copy)
@@ -17,4 +17,8 @@
<button stock="gtk-no" response="GTK_RESPONSE_NO"/>
<button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
</error>
+ <error id="insufficient-permissions" type="error">
+ <_title>Insufficient Permissions</_title>
+ <_secondary>The selected folder does not have enough permissions to create the file</_secondary>
+ </error>
</error-list>
Index: plugins/backup-restore/backup-restore.c
===================================================================
--- plugins/backup-restore/backup-restore.c (revision 35517)
+++ plugins/backup-restore/backup-restore.c (working copy)
@@ -3,6 +3,7 @@
#include <sys/wait.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <glib/gstdio.h>
#include <libgnomeui/libgnomeui.h>
#include "shell/es-menu.h"
#include "mail/em-config.h"
@@ -86,6 +87,16 @@ dialog_prompt_user(GtkWindow *parent, co
return mask;
}
+static gboolean
+epbr_perform_pre_backup_checks (char* dir)
+{
+#ifdef G_OS_WIN32
+ return TRUE;
+#else
+ return (g_access (dir, W_OK) == 0);
+#endif
+}
+
void
org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target)
{
@@ -110,18 +121,27 @@ org_gnome_backup_restore_backup (EPlugin
char *filename;
guint32 mask;
char *uri = NULL;
+ char *dir;
uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (dlg));
e_file_update_save_path(uri, TRUE);
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dlg));
+ dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dlg));
gtk_widget_destroy (dlg);
- mask = dialog_prompt_user (GTK_WINDOW (target->target.widget), _("_Restart Evolution after backup"), "org.gnome.backup-restore:backup-confirm", NULL);
- if (mask & BR_OK)
- backup (filename, (mask & BR_START) ? TRUE: FALSE);
+
+ if (epbr_perform_pre_backup_checks (dir)) {
+
+ mask = dialog_prompt_user (GTK_WINDOW (target->target.widget), _("_Restart Evolution after backup"), "org.gnome.backup-restore:backup-confirm", NULL);
+ if (mask & BR_OK)
+ backup (filename, (mask & BR_START) ? TRUE: FALSE);
+ } else {
+ e_error_run (NULL, "org.gnome.backup-restore:insufficient-permissions", NULL);
+ }
g_free (filename);
+ g_free (dir);
return;
}

7
evolution.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed May 21 21:27:53 IST 2008 - msuman@suse.de
- Added
+ bgo-534012-backup-permission.patch (Sankar P)
+ bgo-533820-fix-crash-on-border-clicking-meetings.diff (Chenthill P) (bnc#391993)
-------------------------------------------------------------------
Wed May 14 17:28:46 CEST 2008 - abharath@suse.de

12
evolution.spec
View File

@ -22,7 +22,7 @@ AutoReqProv: on
# BASE_VERSION (as defined in configure.in).
%define evolution_base_version 2.22
Version: 2.22.1.1
Release: 5
Release: 9
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
#Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.22/%{name}-%{version}.tar.bz2
Source0: %{name}-%{version}.tar.bz2
@ -54,6 +54,10 @@ Patch11: bnc-188523-evo-fix-authenticated-proxy-support.diff
Patch12: evolution-po-update.patch
# PATCH-FIX-UPSTREAM bgo-531519-print-preview-crash.patch bgo#531519 -- Patch is in Upstream now
Patch13: bgo-531519-print-preview-crash.patch
# PATCH-FIX-UPSTREAM bgo-534012-backup-permission.patch bgo#534012 bnc#386416 psankar@suse.de -- Patch is in Upstream now
Patch14: bgo-534012-backup-permission.patch
# PATCH-FIX-UPSTREAM bgo-533820-fix-crash-on-border-clicking-meetings.diff bgo#533820 bnc#391993 pchenthill@suse.de -- Patch is in Upstream now
Patch15: bgo-533820-fix-crash-on-border-clicking-meetings.diff
Url: http://gnome.org/projects/evolution/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: yelp
@ -290,6 +294,8 @@ Authors:
%patch11
#%patch12
%patch13
%patch14
%patch15
%build
autoreconf -f -i
@ -401,6 +407,10 @@ fi
%{_libdir}/evolution/*/conduits/*.so
%changelog
* Wed May 21 2008 msuman@suse.de
- Added
+ bgo-534012-backup-permission.patch (Sankar P)
+ bgo-533820-fix-crash-on-border-clicking-meetings.diff (Chenthill P) (bnc#391993)
* Wed May 14 2008 abharath@suse.de
- Cleanup (unwanted patches)
- bnc#153807 - bnc-153807-msg-composer-dont-raise.patch