diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-04-22 00:06:38 +0800 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-04-22 00:06:38 +0800 |
| commit | a84b1a325147e6321b90f491a1dc686e588869dc (patch) | |
| tree | 409a66488e99ed288c9ff2b4eb90f1993ae537ab /plugins | |
| parent | e9c4388490925de25b029fa0d6437a34a6386c05 (diff) | |
| parent | ece7dcdcea82d0e1fbc104cf48b2928a449b8748 (diff) | |
| download | gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar.gz gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar.bz2 gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar.lz gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar.xz gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.tar.zst gsoc2013-evolution-a84b1a325147e6321b90f491a1dc686e588869dc.zip | |
Merge commit 'origin/gnome-2-30' into express2
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/backup-restore/backup.c | 4 | ||||
| -rw-r--r-- | plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml | 2 | ||||
| -rw-r--r-- | plugins/google-account-setup/org-gnome-evolution-google.eplug.xml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 9f7e70c5b2..dcaaa7e4fe 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -188,7 +188,7 @@ backup (const gchar *filename) CANCEL (complete); txt = _("Shutting down Evolution"); /* FIXME Will the versioned setting always work? */ - run_cmd (EVOLUTION " --force-shutdown"); + run_cmd (EVOLUTION " --quit"); run_cmd ("rm $HOME/.evolution/.running"); @@ -249,7 +249,7 @@ restore (const gchar *filename) /* FIXME Will the versioned setting always work? */ CANCEL (complete); txt = _("Shutting down Evolution"); - run_cmd (EVOLUTION " --force-shutdown"); + run_cmd (EVOLUTION " --quit"); CANCEL (complete); txt = _("Backup current Evolution data"); diff --git a/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml b/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml index 89c0d307d0..17ba087058 100644 --- a/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml +++ b/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml @@ -28,7 +28,7 @@ </group> </hook> <hook class="org.gnome.evolution.calendar.events:1.0"> - <event target="component" id="component.migration" handle="e_calendar_weather_migrate"/> + <event target="module" id="module.migration" handle="e_calendar_weather_migrate"/> </hook> </e-plugin> </e-plugin-list> diff --git a/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml b/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml index 8eefe3dfce..2148cb8b50 100644 --- a/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml +++ b/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml @@ -12,7 +12,7 @@ </group> </hook> <hook class="org.gnome.evolution.calendar.events:1.0"> - <event target="component" id="component.migration" handle="e_calendar_google_migrate"/> + <event target="module" id="module.migration" handle="e_calendar_google_migrate"/> </hook> <hook class="org.gnome.evolution.addressbook.config:1.0"> |