gthumb r2475 - in trunk: . libgthumb src

[mjc svn gnome org]

Author: mjc
Date: Wed Dec 24 14:19:53 2008
New Revision: 2475
URL: http://svn.gnome.org/viewvc/gthumb?rev=2475&view=rev

Log:
2008-12-24  Michael J. Chudobiak  <mjc svn gnome org>

        * libgthumb/gfile-utils.c: (gfile_get_display_name):
        * libgthumb/gfile-utils.h:
        * src/dlg-web-exporter.c: (add_theme_dir),
        (theme_dialog__install_theme_clicked):
        More gfile migration and gnomevfs purging.



Modified:
   trunk/ChangeLog
   trunk/libgthumb/gfile-utils.c
   trunk/libgthumb/gfile-utils.h
   trunk/src/dlg-web-exporter.c

Modified: trunk/libgthumb/gfile-utils.c
==============================================================================
--- trunk/libgthumb/gfile-utils.c	(original)
+++ trunk/libgthumb/gfile-utils.c	Wed Dec 24 14:19:53 2008
@@ -402,6 +402,34 @@
 }
 
 
+char *
+gfile_get_display_name (GFile *file)
+{
+        GFileInfo *info;
+        char      *name = NULL;
+        GError    *err = NULL;
+
+	g_assert (file != NULL);
+
+        info = g_file_query_info (file,
+                                  G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+                                  G_FILE_QUERY_INFO_NONE,
+                                  NULL,
+                                  &err);
+        if (err == NULL) {
+                name = g_strdup (g_file_info_get_display_name (info));
+        } else {
+                gfile_warning ("Failed to get file display name", file, err);
+                g_error_free (err);
+        }
+
+        g_object_unref (info);
+
+        return name;
+}
+
+
+
 /* Directory utils */
 
 static gboolean

Modified: trunk/libgthumb/gfile-utils.h
==============================================================================
--- trunk/libgthumb/gfile-utils.h	(original)
+++ trunk/libgthumb/gfile-utils.h	Wed Dec 24 14:19:53 2008
@@ -73,6 +73,7 @@
 gboolean      gfile_path_is_file               (GFile      *file);
 gboolean      gfile_path_is_dir                (GFile      *file);
 goffset       gfile_get_file_size              (GFile      *file);
+char *        gfile_get_display_name           (GFile      *file);
 
 /* Directory utils */
 

Modified: trunk/src/dlg-web-exporter.c
==============================================================================
--- trunk/src/dlg-web-exporter.c	(original)
+++ trunk/src/dlg-web-exporter.c	Wed Dec 24 14:19:53 2008
@@ -38,6 +38,7 @@
 #include "catalog-web-exporter.h"
 #include "dlg-file-utils.h"
 #include "file-utils.h"
+#include "gfile-utils.h"
 #include "gtk-utils.h"
 #include "gth-file-view.h"
 #include "main.h"
@@ -651,44 +652,31 @@
 add_theme_dir (ThemeDialogData *tdata,
 	       char            *theme_dir)
 {
-	GnomeVFSResult  result;
-	GList          *file_list = NULL;
+	GList          *dir_list = NULL;
 	GList          *scan;
 
 	debug (DEBUG_INFO, "theme dir: %s", theme_dir);
 
-	if (theme_dir != NULL)
-		result = gnome_vfs_directory_list_load (&file_list,
-							theme_dir,
-							GNOME_VFS_FILE_INFO_DEFAULT);
-	else
-		result = GNOME_VFS_ERROR_NOT_A_DIRECTORY;
-
-	if (result == GNOME_VFS_OK)
-		for (scan = file_list; scan; scan = scan->next) {
-			GnomeVFSFileInfo *info = scan->data;
-			char             *utf8_name;
-			GtkTreeIter       iter;
-
-			if (info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
-				continue;
-
-			if ((strcmp (info->name, ".") == 0)
-			    || (strcmp (info->name, "..") == 0))
-				continue;
-
-			utf8_name = get_utf8_display_name_from_uri (info->name);
+	if (path_is_dir (theme_dir))
+		path_list_new (theme_dir, NULL, &dir_list);
 
-			gtk_list_store_append (tdata->list_store, &iter);
-			gtk_list_store_set (tdata->list_store, &iter,
-					    THEME_NAME_COLUMN, utf8_name,
-					    -1);
-
-			g_free (utf8_name);
-		}
-
-	if (file_list != NULL)
-		gnome_vfs_file_info_list_free (file_list);
+	for (scan = dir_list; scan; scan = scan->next) {
+		GtkTreeIter  iter;
+		char        *dir = scan->data;
+		char        *display_name;
+		GFile       *gfile;
+		
+		gfile = gfile_new (dir);
+		display_name = gfile_get_display_name (gfile);
+
+		gtk_list_store_append (tdata->list_store, &iter);
+		gtk_list_store_set (tdata->list_store, &iter,
+				    THEME_NAME_COLUMN, display_name,
+				    -1);
+		g_object_unref (gfile);
+		g_free (display_name);
+	}
+	path_list_free (dir_list);
 }
 
 
@@ -836,7 +824,6 @@
 						GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
 						NULL);
 
-	/* Permit VFS URIs */
 	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (file_sel), FALSE);
 	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (file_sel), g_get_home_dir ());
 	gtk_dialog_set_default_response (GTK_DIALOG (file_sel), GTK_RESPONSE_ACCEPT);