diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-22 01:06:45 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-22 01:06:45 +0800 |
| commit | 84c2e3735ce6e4df88142e86446f9179b6e341e4 (patch) | |
| tree | 7e6d2043810d0c37ee2581f0783095aefdec1e1b /calendar/gui/e-calendar-table.c | |
| parent | aaa180af5abef44bb3e3d3c3c5968ca191a3dbda (diff) | |
| parent | 2914345f9672559fed0ad88d2841ea4801d8d244 (diff) | |
| download | gsoc2013-evolution-84c2e3735ce6e4df88142e86446f9179b6e341e4.tar gsoc2013-evolution-84c2e3735ce6e4df88142e86446f9179b6e341e4.tar.gz gsoc2013-evolution-84c2e3735ce6e4df88142e86446f9179b6e341e4.tar.bz2 gsoc2013-evolution-84c2e3735ce6e4df88142e86446f9179b6e341e4.tar.lz gsoc2013-evolution-84c2e3735ce6e4df88142e86446f9179b6e341e4.tar.xz gsoc2013-evolution-84c2e3735ce6e4df88142e86446f9179b6e341e4.tar.zst gsoc2013-evolution-84c2e3735ce6e4df88142e86446f9179b6e341e4.zip | |
Merge branch 'master' into kill-bonobo
Conflicts:
addressbook/gui/component/addressbook-view.c
addressbook/gui/component/component-factory.c
addressbook/gui/component/eab-composer-util.h
addressbook/gui/widgets/Makefile.am
addressbook/gui/widgets/e-addressbook-model.c
addressbook/gui/widgets/e-addressbook-view.c
addressbook/gui/widgets/e-addressbook-view.h
addressbook/gui/widgets/eab-gui-util.c
addressbook/gui/widgets/eab-gui-util.h
addressbook/gui/widgets/eab-menu.h
addressbook/gui/widgets/eab-popup.h
calendar/gui/calendar-component.c
calendar/gui/e-cal-event.h
calendar/gui/e-calendar-table.c
calendar/gui/e-calendar-view.c
calendar/gui/e-calendar-view.h
calendar/gui/e-memo-table.c
calendar/gui/memos-component.c
calendar/gui/tasks-component.c
composer/e-composer-header-table.c
composer/e-composer-private.h
composer/e-msg-composer.c
composer/e-msg-composer.h
composer/evolution-composer.ui
configure.ac
data/icons/Makefile.am
em-format/em-format.c
em-format/em-format.h
mail/Makefile.am
mail/e-mail-shell-migrate.c
mail/e-searching-tokenizer.c
mail/e-searching-tokenizer.h
mail/em-composer-utils.c
mail/em-composer-utils.h
mail/em-folder-browser.c
mail/em-folder-tree-model.c
mail/em-folder-view.c
mail/em-format-html-display.c
mail/em-format-html-display.h
mail/em-mailer-prefs.c
mail/em-message-browser.c
plugins/vcard-inline/Makefile.am
plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml
plugins/vcard-inline/vcard-inline.c
shell/e-component-registry.h
shell/e-shell-window.c
shell/es-menu.h
widgets/misc/e-filter-bar.c
widgets/misc/e-filter-bar.h
widgets/misc/e-search-bar.c
widgets/misc/e-search-bar.h
Diffstat (limited to 'calendar/gui/e-calendar-table.c')
| -rw-r--r-- | calendar/gui/e-calendar-table.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index e914e5095b..26c0ad6dea 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -1132,9 +1132,6 @@ check_for_retract (ECalComponent *comp, ECal *client) ret_val = TRUE; } - if (!ret_val) - ret_val = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL; - g_free (email); return ret_val; } @@ -1180,8 +1177,7 @@ e_calendar_table_delete_selected (ECalendarTable *cal_table) char *retract_comment = NULL; gboolean retract = FALSE; - retract = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_table)); - delete = retract; + delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_table), &retract); if (retract) { GList *users = NULL; icalcomponent *icalcomp = NULL, *mod_comp = NULL; |