diff options
author | JP Rosevear <jpr@novell.com> | 2005-03-01 14:17:20 +0800 |
---|---|---|
committer | JP Rosevear <jpr@src.gnome.org> | 2005-03-01 14:17:20 +0800 |
commit | fc1558ac985ba9b075da93d14b20ff333ce98283 (patch) | |
tree | df7566760e7fd1b235dad4b820e1839e5400bef6 /shell | |
parent | 7cb4234412eb57a17875e1d8519dc5312c592040 (diff) | |
download | gsoc2013-evolution-fc1558ac985ba9b075da93d14b20ff333ce98283.tar.gz gsoc2013-evolution-fc1558ac985ba9b075da93d14b20ff333ce98283.tar.zst gsoc2013-evolution-fc1558ac985ba9b075da93d14b20ff333ce98283.zip |
bump version, requires
2005-02-28 JP Rosevear <jpr@novell.com>
* configure.in: bump version, requires
2005-02-28 JP Rosevear <jpr@novell.com>
* configure.in: add startup wizard plugin
2005-02-28 JP Rosevear <jpr@novell.com>
* plugins/Makefile.am: dist standard and experimental plugins
* configure.in: move "all" plugins to standard and experimental
and default to building the standard set
svn path=/trunk/; revision=28927
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ChangeLog | 2 | ||||
-rw-r--r-- | shell/e-shell.c | 18 | ||||
-rw-r--r-- | shell/es-event.c | 13 | ||||
-rw-r--r-- | shell/es-event.h | 11 |
4 files changed, 36 insertions, 8 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index b412c4b8d4..7fcca9c5fc 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,7 +1,7 @@ 2005-02-28 JP Rosevear <jpr@novell.com> * e-shell-window-commands.c (command_submit_bug): update authors - list for about dialogs + list for about dialog 2005-02-21 JP Rosevear <jpr@novell.com> diff --git a/shell/e-shell.c b/shell/e-shell.c index bd9b332f37..d61ba3b8ed 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -652,13 +652,6 @@ e_shell_construct (EShell *shell, e_shell_attempt_upgrade(shell); -#if 0 - if (e_shell_startup_wizard_create () == FALSE) { - bonobo_object_unref (BONOBO_OBJECT (shell)); - exit (0); - } -#endif - priv->is_initialized = TRUE; switch (startup_line_mode) { @@ -781,6 +774,7 @@ e_shell_attempt_upgrade (EShell *shell) int done_upgrade = FALSE; char *oldpath; struct stat st; + ESEvent *ese; gconf_client = gconf_client_get_default(); @@ -871,6 +865,16 @@ check_old: g_free(oldpath); g_object_unref (gconf_client); + /** @Event: Shell attempted upgrade + * @Id: upgrade.done + * @Target: ESMenuTargetState + * + * This event is emitted whenever the shell successfully attempts an upgrade. + * + */ + ese = es_event_peek(); + e_event_emit((EEvent *)ese, "upgrade.done", (EEventTarget *)es_event_target_new_upgrade(ese, cmajor, cminor, crevision)); + return TRUE; } diff --git a/shell/es-event.c b/shell/es-event.c index c49ce66163..72a05931bd 100644 --- a/shell/es-event.c +++ b/shell/es-event.c @@ -129,6 +129,18 @@ es_event_target_new_state(ESEvent *eme, int state) return t; } +ESEventTargetUpgrade * +es_event_target_new_upgrade(ESEvent *eme, int major, int minor, int revision) +{ + ESEventTargetUpgrade *t = e_event_target_new(&eme->event, ES_EVENT_TARGET_UPGRADE, sizeof(*t)); + + t->major = major; + t->minor = minor; + t->revision = revision; + + return t; +} + /* ********************************************************************** */ static void *emeh_parent_class; @@ -142,6 +154,7 @@ static const EEventHookTargetMask emeh_state_masks[] = { static const EEventHookTargetMap emeh_targets[] = { { "state", ES_EVENT_TARGET_STATE, emeh_state_masks }, + { "upgrade", ES_EVENT_TARGET_UPGRADE, NULL }, { 0 } }; diff --git a/shell/es-event.h b/shell/es-event.h index f660733fbb..db18dbce2d 100644 --- a/shell/es-event.h +++ b/shell/es-event.h @@ -38,6 +38,7 @@ typedef struct _ESEventClass ESEventClass; /* Current target description */ enum _es_event_target_t { ES_EVENT_TARGET_STATE, + ES_EVENT_TARGET_UPGRADE }; /* Flags that qualify TARGET_STATE */ @@ -47,6 +48,7 @@ enum { }; typedef struct _ESEventTargetState ESEventTargetState; +typedef struct _ESEventTargetUpgrade ESEventTargetUpgrade; struct _ESEventTargetState { EEventTarget target; @@ -54,6 +56,14 @@ struct _ESEventTargetState { int state; }; +struct _ESEventTargetUpgrade { + EEventTarget target; + + int major; + int minor; + int revision; +}; + typedef struct _EEventItem ESEventItem; /* The object */ @@ -72,6 +82,7 @@ GType es_event_get_type(void); ESEvent *es_event_peek(void); ESEventTargetState *es_event_target_new_state(ESEvent *emp, int state); +ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, int major, int minor, int revision); /* ********************************************************************** */ |