aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-02-25 20:32:32 +0800
committerMilan Crha <mcrha@redhat.com>2010-02-25 20:32:32 +0800
commit1341a56ed1347f0762e9d81f4cfc6197c1656f0b (patch)
tree633cdf04043063992aed81d8447b466a788f4b11 /calendar/gui
parent98f8e3672530a9231c3c28cea137452e9127d214 (diff)
downloadgsoc2013-evolution-1341a56ed1347f0762e9d81f4cfc6197c1656f0b.tar.gz
gsoc2013-evolution-1341a56ed1347f0762e9d81f4cfc6197c1656f0b.tar.zst
gsoc2013-evolution-1341a56ed1347f0762e9d81f4cfc6197c1656f0b.zip
Bug #529331 - Deletes appointments when moving to the same calendar
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/dialogs/copy-source-dialog.c2
-rw-r--r--calendar/gui/dialogs/select-source-dialog.c5
-rw-r--r--calendar/gui/dialogs/select-source-dialog.h2
3 files changed, 6 insertions, 3 deletions
diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
index aafe66a90f..9b8c8c4fed 100644
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ b/calendar/gui/dialogs/copy-source-dialog.c
@@ -172,7 +172,7 @@ copy_source_dialog (GtkWindow *parent, ESource *source, ECalSourceType obj_type)
csdd.selected_source = NULL;
csdd.obj_type = obj_type;
- csdd.selected_source = select_source_dialog (parent, obj_type);
+ csdd.selected_source = select_source_dialog (parent, obj_type, source);
if (csdd.selected_source) {
result = copy_source (&csdd);
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index bae86827b9..e517819c6b 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -35,7 +35,7 @@
* Implements dialog for allowing user to select a destination source.
*/
ESource *
-select_source_dialog (GtkWindow *parent, ECalSourceType obj_type)
+select_source_dialog (GtkWindow *parent, ECalSourceType obj_type, ESource *except_source)
{
GtkWidget *dialog;
ESourceList *source_list;
@@ -69,6 +69,9 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type)
if (icon_name)
gtk_window_set_icon_name (GTK_WINDOW (dialog), icon_name);
+ if (except_source)
+ g_object_set_data (G_OBJECT (dialog), "except-source", except_source);
+
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
selected_source = e_source_selector_dialog_peek_primary_selection (E_SOURCE_SELECTOR_DIALOG (dialog));
if (selected_source) {
diff --git a/calendar/gui/dialogs/select-source-dialog.h b/calendar/gui/dialogs/select-source-dialog.h
index 850eddd610..902ac3fc03 100644
--- a/calendar/gui/dialogs/select-source-dialog.h
+++ b/calendar/gui/dialogs/select-source-dialog.h
@@ -30,6 +30,6 @@
#include <libedataserver/e-source.h>
#include <libecal/e-cal.h>
-ESource *select_source_dialog (GtkWindow *parent, ECalSourceType type);
+ESource *select_source_dialog (GtkWindow *parent, ECalSourceType type, ESource *except_source);
#endif