diff options
| -rw-r--r-- | shell/ChangeLog | 15 | ||||
| -rw-r--r-- | shell/e-activity-handler.c | 2 | ||||
| -rw-r--r-- | shell/e-shell-folder-creation-dialog.c | 2 | ||||
| -rw-r--r-- | shell/e-shell-importer.c | 4 | ||||
| -rw-r--r-- | shell/evolution-shell-component-client.c | 1 |
5 files changed, 20 insertions, 4 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 4a5d2bcc26..a7b25b473a 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,20 @@ 2001-10-25 Ettore Perazzoli <ettore@ximian.com> + * e-shell-importer.c: #include "e-util/e-gtk-utils.h". + + * e-shell-folder-creation-dialog.c + (e_shell_show_folder_creation_dialog): Constify a local variable + to placate a warning. + + * e-activity-handler.c (task_widget_cancel_callback): #if 0'ed + out. + + * evolution-shell-component-client.c + (evolution_shell_component_client_new): Remove unused variable + `ior'. + +2001-10-25 Ettore Perazzoli <ettore@ximian.com> + * e-activity-handler.c (impl_destroy): Set ->priv to NULL. (impl_operationStarted): Check for priv not being NULL. (impl_operationProgressing): Likewise. diff --git a/shell/e-activity-handler.c b/shell/e-activity-handler.c index 960a02d19e..65dec9e5d8 100644 --- a/shell/e-activity-handler.c +++ b/shell/e-activity-handler.c @@ -170,6 +170,7 @@ report_task_event (ActivityInfo *activity_info, /* ETaskWidget actions. */ +#if 0 static void task_widget_cancel_callback (GtkWidget *widget, void *data) @@ -190,7 +191,6 @@ task_widget_show_details_callback (GtkWidget *widget, report_task_event (activity_info, "ShowDetails"); } -#if 0 static void show_cancellation_popup (ActivityInfo *activity_info, GtkWidget *task_widget, diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c index 4f0878efc2..d46002a410 100644 --- a/shell/e-shell-folder-creation-dialog.c +++ b/shell/e-shell-folder-creation-dialog.c @@ -515,7 +515,7 @@ e_shell_show_folder_creation_dialog (EShell *shell, storage_set_view = add_storage_set_view (dialog, gui, shell, default_parent_folder); if (default_type == NULL) { - char *dt; + const char *dt; dt = get_type_from_parent_path (shell, default_parent_folder); folder_types = add_folder_types (dialog, gui, shell, dt); diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 2e94553053..730ff4e3c3 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -55,10 +55,12 @@ #include <glade/glade.h> #include <gtkhtml/gtkhtml.h> #include <gal/widgets/e-gui-utils.h> -#include <e-util/e-html-utils.h> #include <gal/widgets/e-gui-utils.h> #include <gal/widgets/e-unicode.h> +#include "e-util/e-html-utils.h" +#include "e-util/e-gtk-utils.h" + #include "e-shell-importer.h" #include "importer/GNOME_Evolution_Importer.h" diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c index b1666c2f27..dc7360846b 100644 --- a/shell/evolution-shell-component-client.c +++ b/shell/evolution-shell-component-client.c @@ -381,7 +381,6 @@ evolution_shell_component_client_new (const char *id) { CORBA_Environment ev; CORBA_Object corba_object; - char *ior; g_return_val_if_fail (id != NULL, NULL); |