aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/e-shell-folder-commands.c4
-rw-r--r--shell/evolution-shell-component.c5
3 files changed, 15 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index b059c622a1..a495ccea3a 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,13 @@
2001-08-10 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell-folder-commands.c (rename_clicked): `#if 0'ed out.
+ (rename_cb): Likewise.
+
+ * evolution-shell-component.c (destroy): Fixed a confusion between
+ GList and GSList.
+
+2001-08-10 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell-user-creatable-items-handler.c (component_free): Only
free the `type_list' if not NULL.
(setup_menu_xml): Deal with the case of `type_list' being NULL
diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c
index f13be35d5f..831a2458d5 100644
--- a/shell/e-shell-folder-commands.c
+++ b/shell/e-shell-folder-commands.c
@@ -421,6 +421,7 @@ e_shell_command_delete_folder (EShell *shell,
g_free (path);
}
+#if 0
static void
rename_clicked (GtkWidget *dialog, gint button_num, void *data)
{
@@ -430,6 +431,7 @@ rename_clicked (GtkWidget *dialog, gint button_num, void *data)
entry = gtk_object_get_data (GTK_OBJECT (dialog), "entry");
*retval = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
}
+#endif
#if 0
static char *
@@ -489,6 +491,7 @@ rename_dialog (char *folder_name)
+#if 0
static void
rename_cb (EStorageSet *storage_set,
EStorageResult result,
@@ -496,6 +499,7 @@ rename_cb (EStorageSet *storage_set,
{
/* FIXME: Do something? */
}
+#endif
#if 0
void
diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c
index ce49e843d4..a7054564d0 100644
--- a/shell/evolution-shell-component.c
+++ b/shell/evolution-shell-component.c
@@ -553,6 +553,7 @@ destroy (GtkObject *object)
EvolutionShellComponent *shell_component;
EvolutionShellComponentPrivate *priv;
CORBA_Environment ev;
+ GSList *sp;
GList *p;
shell_component = EVOLUTION_SHELL_COMPONENT (object);
@@ -582,8 +583,8 @@ destroy (GtkObject *object)
e_free_string_list (priv->external_uri_schemas);
- for (p = priv->user_creatable_item_types; p != NULL; p = p->next)
- user_creatable_item_type_free ((UserCreatableItemType *) p->data);
+ for (sp = priv->user_creatable_item_types; sp != NULL; sp = sp->next)
+ user_creatable_item_type_free ((UserCreatableItemType *) sp->data);
g_slist_free (priv->user_creatable_item_types);
g_free (priv);