diff options
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/importer/intelligent.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 44af159655..c0755b52cb 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2001-05-09 Christopher James Lahey <clahey@ximian.com> + + * importer/intelligent.c (create_gui): Made this function static. + Removed the unused variable placeholder. + (intelligent_importer_init): Cast from gpointer to int here + properly using GPOINTER_TO_INT. + 2001-05-09 Dan Winship <danw@ximian.com> * e-local-storage.c: Remove get_physical_path and load_folders, diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c index d9589df676..528b98159b 100644 --- a/shell/importer/intelligent.c +++ b/shell/importer/intelligent.c @@ -174,10 +174,10 @@ unselect_row_cb (GtkCList *clist, gtk_notebook_set_page (GTK_NOTEBOOK (d->placeholder), d->running); } -IntelligentImporterDialog * +static IntelligentImporterDialog * create_gui (GList *importers) { - GtkWidget *dialog, *clist, *placeholder, *sw; + GtkWidget *dialog, *clist, *sw; IntelligentImporterDialog *d; GList *l; int running = 0; @@ -368,7 +368,7 @@ intelligent_importer_init (void) CORBA_Environment ev; char *iid; - data = g_list_nth_data (d->importers, l->data); + data = g_list_nth_data (d->importers, GPOINTER_TO_INT (l->data)); iid = g_strdup (data->iid); new_data = g_new (SelectedImporterData, 1); |