Initial original import from: fuse-2.4.2-2.fc4

[captive.git] / src / install / acquire / ui-gnome.c

diff --git a/src/install/acquire/ui-gnome.c b/src/install/acquire/ui-gnome.c
index d565f69..eb52c09 100644 (file)
--- a/src/install/acquire/ui-gnome.c
+++ b/src/install/acquire/ui-gnome.c
@@ -178,15 +178,15 @@ static gboolean some_module_ntfs_sys_found=FALSE;
 
        gdk_threads_enter();
 
-       iter=DriversTreeStore_Iter_hash_get_iter(module_available->module->type);
+       iter=DriversTreeStore_Iter_hash_get_iter((const gchar *)module_available->module->type);
        gtk_tree_store_set(DriversTreeStore,iter,
                        DRIVERS_TREE_STORE_COLUMN_TYPE,module_available->module->type,
                        DRIVERS_TREE_STORE_COLUMN_ID  ,module_available->module->id,
                        -1);
 
-       if (!strcmp(module_available->module->type,"ntoskrnl.exe"))
+       if (!strcmp((const char *)module_available->module->type,"ntoskrnl.exe"))
                some_module_ntoskrnl_exe_found=TRUE;
-       if (!strcmp(module_available->module->type,"ntfs.sys"))
+       if (!strcmp((const char *)module_available->module->type,"ntfs.sys"))
                some_module_ntfs_sys_found=TRUE;
 
        some_modules_found=some_module_ntoskrnl_exe_found && some_module_ntfs_sys_found;
@@ -250,6 +250,8 @@ struct timeval diff_timeval;
 
 static gboolean ui_gnome_progress(GnomeVFSURI *uri)
 {
+gboolean want_gdk_flush=FALSE;
+
        /* 'uri' may be NULL */
 
        gdk_threads_enter();
@@ -267,9 +269,11 @@ static gchar *uri_text=NULL;
                        }
 
                if (uri_text) {
-                       if (want_progress_update(&ProgressEntry_updated_timeval))
+                       if (want_progress_update(&ProgressEntry_updated_timeval)) {
                                gtk_entry_set_text(ProgressEntry,
                                                uri_text+(strncmp(uri_text,"file://",strlen("file://")) ? 0 : strlen("file://")));
+                               want_gdk_flush=TRUE;
+                               }
                        }
                }
 
@@ -280,7 +284,8 @@ static gchar *uri_text=NULL;
                                FALSE); /* may_block */
 #endif /* UI_GNOME_THREADS */
 
-       gdk_flush();
+       if (want_gdk_flush)
+               gdk_flush();
        gdk_threads_leave();
 
        /* Do not: g_thread_yield();
@@ -448,7 +453,7 @@ static GnomeVFSURI *process_scan_path_scan_path_uri;
 /* 'process_t' typed. */
 static void process_scan_path(void)
 {
-       mod_uri_load(process_scan_path_scan_path_uri);
+       mod_uri_load_base_reporting(process_scan_path_scan_path_uri);
 }
 
 /* 'process_t' typed. */