[gthumb] Removed gnomevfs from gtk-utils.c



commit 02061db3900977cdb1a0250bac6251007f7a0569
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date:   Tue May 19 12:50:43 2009 -0400

    Removed gnomevfs from gtk-utils.c
---
 libgthumb/gtk-utils.c  |   17 -----------------
 libgthumb/gtk-utils.h  |    2 --
 src/dlg-web-exporter.c |    5 ++---
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/libgthumb/gtk-utils.c b/libgthumb/gtk-utils.c
index 47200a4..cf3a6c5 100644
--- a/libgthumb/gtk-utils.c
+++ b/libgthumb/gtk-utils.c
@@ -25,7 +25,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <libgnome/libgnome.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <glade/glade.h>
 #include "gtk-utils.h"
 #include "gconf-utils.h"
@@ -759,22 +758,6 @@ _gtk_button_set_filename_label (GtkButton   *button,
 }
 
 
-char *
-_gtk_button_get_filename_label (GtkButton   *button)
-{
-	const char *utf8_text;
-	char       *text;
-
-	utf8_text = gtk_button_get_label (button);
-	if (utf8_text == NULL)
-		return NULL;
-
-	text = gnome_vfs_escape_string (utf8_text);
-
-	return text;
-}
-
-
 gboolean
 exec_command (const char *application,
 	      GList      *file_list)
diff --git a/libgthumb/gtk-utils.h b/libgthumb/gtk-utils.h
index e407015..3bdcc77 100644
--- a/libgthumb/gtk-utils.h
+++ b/libgthumb/gtk-utils.h
@@ -96,8 +96,6 @@ char *      _gtk_entry_get_filename_text (GtkEntry   *entry);
 void        _gtk_button_set_filename_label (GtkButton   *button,
 					  const char *text);
 
-char *      _gtk_button_get_filename_label (GtkButton   *button);
-
 gboolean    exec_command                 (const char *application,
 					  GList      *file_list);
 
diff --git a/src/dlg-web-exporter.c b/src/dlg-web-exporter.c
index 5b9ed87..4f2e047 100644
--- a/src/dlg-web-exporter.c
+++ b/src/dlg-web-exporter.c
@@ -130,7 +130,7 @@ export (GtkWidget  *widget,
 	CatalogWebExporter *exporter = data->exporter;
 	char               *location;
 	char               *path;
-	char               *theme;
+	const char         *theme;
 	const char         *header;
 	const char         *footer;
 
@@ -168,7 +168,7 @@ export (GtkWidget  *widget,
 	footer = gtk_entry_get_text (GTK_ENTRY (data->wa_footer_entry));
 	eel_gconf_set_string (PREF_WEB_ALBUM_FOOTER, footer);
 
-	theme = _gtk_button_get_filename_label (GTK_BUTTON (data->wa_select_theme_button));
+	theme = gtk_button_get_label (GTK_BUTTON (data->wa_select_theme_button));
 	eel_gconf_set_string (PREF_WEB_ALBUM_THEME, theme);
 
 	if (strcmp (theme, "") == 0) {
@@ -207,7 +207,6 @@ export (GtkWidget  *widget,
 	catalog_web_exporter_set_style (exporter, theme);
 
 	g_free (location);
-	g_free (theme);
 
 	/* Export. */
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]