aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/e-activity-handler.c2
-rw-r--r--shell/e-shell-folder-commands.c3
3 files changed, 12 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 20b8032566..a911c7716b 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,13 @@
2002-03-09 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell-folder-commands.c (e_shell_command_rename_folder): Make
+ old_name_locale non-const to placate a compiler warning.
+ (get_corba_null_value): Likewise.
+
+ * e-activity-handler.c (report_task_event): `#if 0' out.
+
+2002-03-09 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell-settings-dialog.c (load_pages): Use ECorbaConfigPages.
* e-corba-config-page.c: New.
diff --git a/shell/e-activity-handler.c b/shell/e-activity-handler.c
index 9e85e44afb..d132fe0c8e 100644
--- a/shell/e-activity-handler.c
+++ b/shell/e-activity-handler.c
@@ -98,6 +98,7 @@ lookup_activity (GList *list,
return NULL;
}
+#if 0
static const CORBA_any *
get_corba_null_value (void)
{
@@ -125,6 +126,7 @@ report_task_event (ActivityInfo *activity_info,
CORBA_exception_free (&ev);
}
+#endif
/* ETaskWidget actions. */
diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c
index 4a2bbe7e4f..ada09a2b1d 100644
--- a/shell/e-shell-folder-commands.c
+++ b/shell/e-shell-folder-commands.c
@@ -524,7 +524,8 @@ e_shell_command_rename_folder (EShell *shell,
EStorageSet *storage_set;
EFolder *folder;
RenameCallbackData *callback_data;
- const char *old_name, *old_name_locale;
+ const char *old_name;
+ char *old_name_locale;
char *prompt;
char *new_name;
char *old_base_path;