From a361cff4042770c35b2ae9f5dcfb6153711d2c41 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 25 May 2009 23:17:51 -0400 Subject: Fix compiler warnings in shell. --- shell/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'shell/main.c') 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); -- cgit v1.2.3 From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- shell/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'shell/main.c') diff --git a/shell/main.c b/shell/main.c index 5ffe316c26..c6959d7663 100644 --- a/shell/main.c +++ b/shell/main.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -398,7 +398,7 @@ idle_cb (gchar **uris) bonobo_main_quit (); } - /* This must be done after Bonobo has created all the components. For + /* This must be done after Bonobo has created all the components. For * example the mail component makes the global variable `session` which * is being used by several EPlugins */ @@ -630,7 +630,7 @@ main (int argc, char **argv) client = gconf_client_get_default (); #ifdef DEVELOPMENT - + if (force_migrate) { destroy_config (client); } -- cgit v1.2.3