aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/e-bconf-map.h8
-rw-r--r--shell/e-shell-importer.c4
-rw-r--r--shell/e-shell-window-commands.c2
-rw-r--r--shell/e-user-creatable-items-handler.c3
-rw-r--r--shell/main.c6
5 files changed, 13 insertions, 10 deletions
diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h
index 1d72119c8c..e6e16de6d4 100644
--- a/e-util/e-bconf-map.h
+++ b/e-util/e-bconf-map.h
@@ -83,13 +83,13 @@ enum {
};
typedef struct {
- char *from;
- char *to;
- int type;
+ const gchar *from;
+ const gchar *to;
+ gint type;
} e_gconf_map_t;
typedef struct {
- char *root;
+ const gchar *root;
e_gconf_map_t *map;
} e_gconf_map_list_t;
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 8bc3b12c5c..cb990f973b 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -121,8 +121,8 @@ typedef struct _ImportData {
#endif
static struct {
- char *name;
- char *text;
+ const gchar *name;
+ const gchar *text;
} info[] = {
{ "type_html",
N_("Choose the type of importer to run:")
diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c
index 3d148781f1..cdd9e3b82e 100644
--- a/shell/e-shell-window-commands.c
+++ b/shell/e-shell-window-commands.c
@@ -123,7 +123,7 @@ command_submit_bug (BonoboUIComponent *uih,
EShellWindow *window,
const char *path)
{
- gchar *command_line;
+ const gchar *command_line;
GError *error = NULL;
command_line = "bug-buddy --sm-disable --package=Evolution";
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index abc4848663..ef58e3d659 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -158,7 +158,8 @@ get_components_from_bonobo (EUserCreatableItemsHandler *handler)
Bonobo_ServerInfoList *info_list;
Bonobo_ActivationProperty *property;
CORBA_Environment ev;
- char *iid, *alias;
+ const gchar *alias;
+ char *iid;
GNOME_Evolution_Component corba_component;
Component *component;
int i;
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);