GNOME.org
 

[gthumb] More path to utf8_path conversions

commit 1448cc926eadb4ad773418829e3022bc637f6529
Author: mjclab <mjclab pekkala localdomain>
Date:   Fri May 29 15:15:26 2009 -0400

    More path to utf8_path conversions
---
 libgthumb/dlg-save-image.c       |    4 ++--
 libgthumb/file-utils.c           |    5 +++--
 libgthumb/gth-file-view-list.c   |   12 ++++++------
 libgthumb/gth-file-view-thumbs.c |   12 ++++++------
 libgthumb/gth-sort-utils.c       |    2 +-
 libgthumb/image-loader.c         |    2 +-
 libgthumb/image-viewer-image.c   |    2 +-
 libgthumb/print-callbacks.c      |    2 +-
 libgthumb/thumb-loader.c         |    8 ++++----
 src/catalog-list.c               |    6 +++---
 src/catalog-png-exporter.c       |   14 +++++++-------
 src/catalog-web-exporter.c       |   18 +++++++++---------
 12 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/libgthumb/dlg-save-image.c b/libgthumb/dlg-save-image.c
index 2a9ef1a..098d301 100644
--- a/libgthumb/dlg-save-image.c
+++ b/libgthumb/dlg-save-image.c
@@ -193,7 +193,7 @@ file_save_ok_cb (GtkDialog *file_sel,
 	idx = gtk_combo_box_get_active (GTK_COMBO_BOX (combo_box));
 	if (idx < 0
             || file_options[idx].type == IMAGE_TYPE_AUTOMATIC)
-		mime_type = get_file_mime_type (file->path, FALSE);
+		mime_type = get_file_mime_type (file->utf8_path, FALSE);
 	else
 		mime_type = file_options[idx].mime_type;
 	file->mime_type = get_static_string (mime_type);
@@ -350,7 +350,7 @@ dlg_save_image (GtkWindow       *parent,
 	data->done_data = done_data;
 	data->metadata = metadata;
 
-	save_image (parent, file, file->path, pixbuf, data, NULL);
+	save_image (parent, file, file->utf8_path, pixbuf, data, NULL);
 }
 
 
diff --git a/libgthumb/file-utils.c b/libgthumb/file-utils.c
index 942dd8d..dbd1e34 100644
--- a/libgthumb/file-utils.c
+++ b/libgthumb/file-utils.c
@@ -449,7 +449,7 @@ visit_rc_directory_sync (const char *rc_dir,
 		FileData *file = scan->data;
 		char     *rc_file, *real_file;
 
-		rc_file = file->path;
+		rc_file = file->utf8_path;
 		real_file = g_strndup (rc_file + prefix_len,
 				       strlen (rc_file) - prefix_len - ext_len);
 		if (do_something)
@@ -1225,6 +1225,7 @@ gboolean
 path_in_path (const char  *path_src,
 	      const char  *path_dest)
 {
+	/* FIXME - need gfile version */
 	int path_src_l, path_dest_l;
 
 	if ((path_src == NULL) || (path_dest == NULL))
@@ -2172,7 +2173,7 @@ free_cache (void)
 		GList *scan;
 		for (scan = files; scan; scan = scan->next ) {
 			FileData *file = scan->data;
-			file_unlink (file->path);
+			file_unlink (file->utf8_path);
 		}
 	}
 
diff --git a/libgthumb/gth-file-view-list.c b/libgthumb/gth-file-view-list.c
index cc01d33..4fef5db 100644
--- a/libgthumb/gth-file-view-list.c
+++ b/libgthumb/gth-file-view-list.c
@@ -646,8 +646,8 @@ gfv_get_file_list_selection (GthFileView *file_view)
 
 		pos = gtk_tree_path_get_indices (path)[0];
 		fd = gth_file_view_get_image_data (file_view, pos);
-		if ((fd != NULL) && (fd->path != NULL))
-			list = g_list_prepend (list, g_strdup (fd->path));
+		if ((fd != NULL) && (fd->utf8_path != NULL))
+			list = g_list_prepend (list, g_strdup (fd->utf8_path));
 		file_data_unref (fd);
 	}
 
@@ -1572,7 +1572,7 @@ comp_func_size (gconstpointer  ptr1,
 	if ((fd1 == NULL) || (fd2 == NULL))
 		return 0;
 
-	return gth_sort_by_size_then_name (fd1->size, fd2->size, fd1->path, fd2->path);
+	return gth_sort_by_size_then_name (fd1->size, fd2->size, fd1->utf8_path, fd2->utf8_path);
 }
 
 
@@ -1586,7 +1586,7 @@ comp_func_time (gconstpointer  ptr1,
 		return 0;
 
 	return gth_sort_by_filetime_then_name (fd1->mtime, fd2->mtime,
-						 fd1->path, fd2->path);
+						 fd1->utf8_path, fd2->utf8_path);
 }
 
 
@@ -1612,7 +1612,7 @@ comp_func_path (gconstpointer  ptr1,
 	if ((fd1 == NULL) || (fd2 == NULL))
 		return 0;
 
-	return gth_sort_by_full_path (fd1->path, fd2->path);
+	return gth_sort_by_full_path (fd1->utf8_path, fd2->utf8_path);
 }
 
 
@@ -1622,7 +1622,7 @@ comp_func_comment (gconstpointer ptr1, gconstpointer ptr2)
 	const FileData *fd1 = ptr1, *fd2 = ptr2;
 
 	return gth_sort_by_comment_then_name (fd1->comment, fd2->comment,
-					      fd1->path, fd2->path);
+					      fd1->utf8_path, fd2->utf8_path);
 }
 
 
diff --git a/libgthumb/gth-file-view-thumbs.c b/libgthumb/gth-file-view-thumbs.c
index ecdbf4c..797a40e 100644
--- a/libgthumb/gth-file-view-thumbs.c
+++ b/libgthumb/gth-file-view-thumbs.c
@@ -354,9 +354,9 @@ gfv_get_file_list_selection (GthFileView *file_view)
 	for (scan = list; scan; scan = scan->next) {
 		FileData *fd = scan->data;
 
-		if ((fd != NULL) && (fd->path != NULL))
+		if ((fd != NULL) && (fd->utf8_path != NULL))
 			file_list = g_list_prepend (file_list,
-						    g_strdup (fd->path));
+						    g_strdup (fd->utf8_path));
 	}
 	file_data_list_free (list);
 
@@ -592,7 +592,7 @@ comp_func_size (gconstpointer  ptr1,
 		return 0;
 
 	return gth_sort_by_size_then_name (fd1->size, fd2->size, 
-					   fd1->path, fd2->path);
+					   fd1->utf8_path, fd2->utf8_path);
 }
 
 
@@ -610,7 +610,7 @@ comp_func_time (gconstpointer  ptr1,
 		return 0;
 
 	return gth_sort_by_filetime_then_name (fd1->mtime, fd2->mtime,
-					       fd1->path, fd2->path);
+					       fd1->utf8_path, fd2->utf8_path);
 }
 
 
@@ -644,7 +644,7 @@ comp_func_path (gconstpointer  ptr1,
 	if ((fd1 == NULL) || (fd2 == NULL))
 		return 0;
 
-	return gth_sort_by_full_path (fd1->path, fd2->path);
+	return gth_sort_by_full_path (fd1->utf8_path, fd2->utf8_path);
 }
 
 
@@ -658,7 +658,7 @@ comp_func_comment (gconstpointer  ptr1, gconstpointer  ptr2)
 	fd2 = item2->data;
 
 	return gth_sort_by_comment_then_name (item1->comment, item2->comment,
-					fd1->path, fd2->path);
+					fd1->utf8_path, fd2->utf8_path);
 }
 
 
diff --git a/libgthumb/gth-sort-utils.c b/libgthumb/gth-sort-utils.c
index acbffc3..e2bb4b4 100644
--- a/libgthumb/gth-sort-utils.c
+++ b/libgthumb/gth-sort-utils.c
@@ -120,7 +120,7 @@ gth_sort_by_exiftime_then_name (FileData *fd1,
 	if (time1 < time2) return -1;
 	if (time1 > time2) return 1;
 
-	return gth_sort_by_filename_but_ignore_path (fd1->path, fd2->path);
+	return gth_sort_by_filename_but_ignore_path (fd1->utf8_path, fd2->utf8_path);
 }
 
 int
diff --git a/libgthumb/image-loader.c b/libgthumb/image-loader.c
index c6e5d4f..552420e 100644
--- a/libgthumb/image-loader.c
+++ b/libgthumb/image-loader.c
@@ -899,7 +899,7 @@ image_loader_get_path (ImageLoader *il)
 		g_mutex_unlock (il->priv->data_mutex);
                 return NULL;
 	}
-        path = g_strdup (il->priv->file->path);
+        path = g_strdup (il->priv->file->utf8_path);
 	g_mutex_unlock (il->priv->data_mutex);
 
         return path;
diff --git a/libgthumb/image-viewer-image.c b/libgthumb/image-viewer-image.c
index b785251..48ba1a6 100644
--- a/libgthumb/image-viewer-image.c
+++ b/libgthumb/image-viewer-image.c
@@ -528,7 +528,7 @@ image_viewer_image_get_path (ImageViewerImage* image)
 	priv = IMAGE_VIEWER_IMAGE_GET_PRIVATE (image);
 
 	if (priv->file)
-		return g_strdup (priv->file->path);
+		return g_strdup (priv->file->utf8_path);
 	else
 		return NULL;
 }
diff --git a/libgthumb/print-callbacks.c b/libgthumb/print-callbacks.c
index aa0a8ce..8fd621b 100644
--- a/libgthumb/print-callbacks.c
+++ b/libgthumb/print-callbacks.c
@@ -2245,7 +2245,7 @@ load_current_image (PrintCatalogDialogData *data)
 
 	file = data->pci->image_info[data->current_image]->file;
 
-	msg = g_strdup_printf (_("Loading image: %s"), basename_for_display (file->path));
+	msg = g_strdup_printf (_("Loading image: %s"), file->utf8_name);
 	progress_dialog_set_info (data->pd, msg);
 	g_free (msg);
 
diff --git a/libgthumb/thumb-loader.c b/libgthumb/thumb-loader.c
index 8b6ed81..efca059 100644
--- a/libgthumb/thumb-loader.c
+++ b/libgthumb/thumb-loader.c
@@ -322,9 +322,9 @@ thumb_loader_set_file (ThumbLoader *tl,
 	
 	if (fd != NULL) {
 		tl->priv->file = file_data_dup (fd);
-		if (is_local_file (tl->priv->file->path)) {
+		if (is_local_file (tl->priv->file->utf8_path)) {
 			char *resolved_path = NULL;
-			resolved_path = resolve_all_symlinks (tl->priv->file->path);
+			resolved_path = resolve_all_symlinks (tl->priv->file->utf8_path);
 			file_data_set_path (tl->priv->file, resolved_path);
 			g_free (resolved_path);
 		}
@@ -455,14 +455,14 @@ thumb_loader_save_to_cache (ThumbLoader *tl)
 	if ((tl == NULL) || (tl->priv->pixbuf == NULL))
 		return FALSE;
 
-	if (is_local_file (tl->priv->file->path)) {
+	if (is_local_file (tl->priv->file->utf8_path)) {
 		char *cache_base_uri;
 
 		/* Do not save thumbnails from the user's thumbnail directory,
 		   or an endless loop of thumbnailing may be triggered. */
 		   
 		cache_base_uri = g_strconcat (get_home_uri (), "/.thumbnails", NULL);
-		if (path_in_path (cache_base_uri, tl->priv->file->path)) {
+		if (path_in_path (cache_base_uri, tl->priv->file->utf8_path)) { /* FIXME */
 			g_free (cache_base_uri);	
 			return FALSE;
 		}
diff --git a/src/catalog-list.c b/src/catalog-list.c
index 20fe504..2935bd9 100644
--- a/src/catalog-list.c
+++ b/src/catalog-list.c
@@ -487,7 +487,7 @@ comp_by_path (gconstpointer a,
 	data_a = (FileData*) a;
 	data_b = (FileData*) b;
 
-	return uricmp (data_a->path, data_b->path);
+	return uricmp (data_a->utf8_path, data_b->utf8_path);
 }
 
 
@@ -583,7 +583,7 @@ catalog_list_refresh (CatalogList *cat_list)
 			GdkPixbuf   *pixbuf;
 			int          type;
 
-			if (file_is_search_result (file->path)) {
+			if (file_is_search_result (file->utf8_path)) {
 				type = CAT_LIST_TYPE_SEARCH;
 				pixbuf = search_pixbuf;
 			} 
@@ -599,7 +599,7 @@ catalog_list_refresh (CatalogList *cat_list)
 			gtk_list_store_set (cat_list->list_store, &iter,
 					    CAT_LIST_COLUMN_ICON, pixbuf,
 					    CAT_LIST_COLUMN_NAME, utf8_name,
-					    CAT_LIST_COLUMN_PATH, file->path,
+					    CAT_LIST_COLUMN_PATH, file->utf8_path,
 					    CAT_LIST_COLUMN_TYPE, type,
 					    -1);
 					    
diff --git a/src/catalog-png-exporter.c b/src/catalog-png-exporter.c
index 7aface2..7953e2a 100644
--- a/src/catalog-png-exporter.c
+++ b/src/catalog-png-exporter.c
@@ -823,7 +823,7 @@ set_item_caption (CatalogPngExporter *ce,
 	} 
 	else {
 		if (ce->caption_fields & GTH_CAPTION_FILE_PATH) {
-			char *path = remove_level_from_path (idata->file->path);
+			char *path = remove_level_from_path (idata->file->utf8_path);
 			char *utf8_name = get_utf8_display_name_from_uri (path);
 			idata->caption_row[row++] = utf8_name;
 			g_free (path);
@@ -1007,7 +1007,7 @@ export (CatalogPngExporter *ce)
 				image_rect.height = theight;
 
 				paint_frame (ce, &frame_rect, &image_rect,
-					     row_idata->file->path);
+					     row_idata->file->utf8_path);
 				paint_image (ce, &image_rect, pixbuf);
 			}
 
@@ -1219,7 +1219,7 @@ comp_func_name (gconstpointer a, gconstpointer b)
 	data_a = IMAGE_DATA (a);
 	data_b = IMAGE_DATA (b);
 
-	return gth_sort_by_filename_but_ignore_path (data_a->file->path, data_b->file->path);
+	return gth_sort_by_filename_but_ignore_path (data_a->file->utf8_path, data_b->file->utf8_path);
 }
 
 
@@ -1231,7 +1231,7 @@ comp_func_path (gconstpointer a, gconstpointer b)
 	data_a = IMAGE_DATA (a);
 	data_b = IMAGE_DATA (b);
 
-	return gth_sort_by_full_path (data_a->file->path, data_b->file->path);
+	return gth_sort_by_full_path (data_a->file->utf8_path, data_b->file->utf8_path);
 }
 
 
@@ -1244,7 +1244,7 @@ comp_func_comment (gconstpointer a, gconstpointer b)
 	data_b = IMAGE_DATA (b);
 
 	return gth_sort_by_comment_then_name (data_a->comment, data_b->comment,
-					data_a->file->path, data_b->file->path);
+					data_a->file->utf8_path, data_b->file->utf8_path);
 }
 
 
@@ -1257,7 +1257,7 @@ comp_func_time (gconstpointer a, gconstpointer b)
 	data_b = IMAGE_DATA (b);
 
 	return gth_sort_by_filetime_then_name (data_a->file->mtime, data_b->file->mtime,
-						data_a->file->path, data_b->file->path);
+						data_a->file->utf8_path, data_b->file->utf8_path);
 }
 
 
@@ -1281,7 +1281,7 @@ comp_func_size (gconstpointer a, gconstpointer b)
 	data_a = IMAGE_DATA (a);
 	data_b = IMAGE_DATA (b);
 
-	return gth_sort_by_size_then_name (data_a->file->size, data_b->file->size, data_a->file->path, data_b->file->path);
+	return gth_sort_by_size_then_name (data_a->file->size, data_b->file->size, data_a->file->utf8_path, data_b->file->utf8_path);
 }
 
 
diff --git a/src/catalog-web-exporter.c b/src/catalog-web-exporter.c
index 81045e6..672e1ea 100644
--- a/src/catalog-web-exporter.c
+++ b/src/catalog-web-exporter.c
@@ -731,7 +731,7 @@ comp_func_path (gconstpointer a,
 	data_a = IMAGE_DATA (a);
 	data_b = IMAGE_DATA (b);
 
-	return gth_sort_by_full_path (data_a->src_file->path, data_b->src_file->path);
+	return gth_sort_by_full_path (data_a->src_file->utf8_path, data_b->src_file->utf8_path);
 }
 
 
@@ -745,7 +745,7 @@ comp_func_comment (gconstpointer a,
 	data_b = IMAGE_DATA (b);
 
 	return gth_sort_by_comment_then_name (data_a->comment, data_b->comment,
-					      data_a->src_file->path, data_b->src_file->path);
+					      data_a->src_file->utf8_path, data_b->src_file->utf8_path);
 }
 
 
@@ -759,7 +759,7 @@ comp_func_time (gconstpointer a,
 	data_b = IMAGE_DATA (b);
 
 	return gth_sort_by_filetime_then_name (data_a->src_file->mtime, data_b->src_file->mtime,
-					       data_a->src_file->path, data_b->src_file->path);
+					       data_a->src_file->utf8_path, data_b->src_file->utf8_path);
 }
 
 
@@ -786,7 +786,7 @@ comp_func_size (gconstpointer a,
 	data_b = IMAGE_DATA (b);
 
 	return gth_sort_by_size_then_name (data_a->src_file->size, data_b->src_file->size,
-				           data_a->src_file->path, data_b->src_file->path);
+				           data_a->src_file->utf8_path, data_b->src_file->utf8_path);
 }
 
 
@@ -1317,7 +1317,7 @@ get_image_file (CatalogWebExporter *ce,
 		g_free (escaped);
 
 	} else {
-		result = gfile_new (idata->src_file->path);
+		result = gfile_new (idata->src_file->utf8_path);
 	}
 	
 	return result;
@@ -2261,7 +2261,7 @@ save_thumbnail_cb (gpointer data)
 		
 	if (idata->thumb != NULL) {
 		GFile *file;
-		GFile *src_local_gfile = gfile_new (idata->src_file->path);
+		GFile *src_local_gfile = gfile_new (idata->src_file->utf8_path);
 		char  *local_file;
 		char  *src_local_file;
 
@@ -2525,7 +2525,7 @@ save_image_preview_cb (gpointer data)
 
 		if ((! idata->no_preview) && (idata->preview != NULL)) {
 			GFile *file;
-			GFile *src_local_gfile = gfile_new (idata->src_file->path);
+			GFile *src_local_gfile = gfile_new (idata->src_file->utf8_path);
 			char  *local_file;
 			char  *src_local_file;
 
@@ -2571,7 +2571,7 @@ save_resized_image_cb (gpointer data)
 
 		if (ce->copy_images && (idata->image != NULL)) {
 			GFile *file;
-			GFile *src_local_gfile = gfile_new (idata->src_file->path);
+			GFile *src_local_gfile = gfile_new (idata->src_file->utf8_path);
 			char  *image_uri;
 			char  *local_file; 
 			char  *src_local_file;
@@ -2628,7 +2628,7 @@ export__copy_image (CatalogWebExporter *ce)
 
 	idata = ce->file_to_load->data;
 
-	sfile = gfile_new (idata->src_file->path);
+	sfile = gfile_new (idata->src_file->utf8_path);
 	
 	dfile = get_image_file (ce, 
 			        idata,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]