diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-27 04:58:27 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-27 04:58:27 +0800 |
| commit | 333656eba50f2120bbee3e817b8faf0baf448faf (patch) | |
| tree | 3869bc4847dd4ab67625b82207ff98ef19045e8d /shell/main.c | |
| parent | 1682814ef78902b385fe84589f8755b0ff4b5b5a (diff) | |
| parent | ffa17ed195a6bbb40d386fb572b7941e22f47f8d (diff) | |
| download | gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.gz gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.bz2 gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.lz gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.xz gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.zst gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.zip | |
Merge branch 'warnings'
Diffstat (limited to 'shell/main.c')
| -rw-r--r-- | shell/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/shell/main.c b/shell/main.c index 2abd30eec1..5ffe316c26 100644 --- a/shell/main.c +++ b/shell/main.c @@ -155,7 +155,8 @@ kill_old_dataserver (void) CORBA_exception_init (&ev); /* FIXME Should we really kill it off? We also shouldn't hard code the version */ - iface = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_DataServer_InterfaceCheck", 0, NULL, &ev); + iface = bonobo_activation_activate_from_id ( + (Bonobo_ActivationID) "OAFIID:GNOME_Evolution_DataServer_InterfaceCheck", 0, NULL, &ev); if (BONOBO_EX (&ev) || iface == CORBA_OBJECT_NIL) { kill_dataserver (); CORBA_exception_free (&ev); @@ -345,7 +346,8 @@ idle_cb (gchar **uris) break; case E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER: - corba_shell = bonobo_activation_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev); + corba_shell = bonobo_activation_activate_from_id ( + (Bonobo_ActivationID) E_SHELL_OAFIID, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION || corba_shell == CORBA_OBJECT_NIL) { e_error_run(NULL, "shell:noshell", NULL); CORBA_exception_free (&ev); |