Remove dependencies to gob2

[andy/viking.git] / src / vikfilelist.c

diff --git a/src/vikfilelist.c b/src/vikfilelist.c
index 1fc8828c0e7dc7dee6fb8026fc049b87d40343fe..1e12d928a41725b95a4fa6a3255ce58676d1cd54 100644 (file)
--- a/src/vikfilelist.c
+++ b/src/vikfilelist.c
@@ -19,7 +19,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "vikfilelist.h"
 
@@ -32,26 +37,39 @@ struct _VikFileList {
 
 static void file_list_add ( VikFileList *vfl )
 {
+  GSList *files = NULL;
+  GSList *fiter = NULL;
+  
   if ( ! vfl->file_selector )
   {
     GtkWidget *win;
     g_assert ( (win = gtk_widget_get_toplevel(GTK_WIDGET(vfl))) );
-    vfl->file_selector = gtk_file_selection_new ("Choose file(s)");
-    gtk_file_selection_set_select_multiple ( GTK_FILE_SELECTION(vfl->file_selector), TRUE );
+    vfl->file_selector = gtk_file_chooser_dialog_new (_("Choose file(s)"),
+                                     GTK_WINDOW(win),
+                                     GTK_FILE_CHOOSER_ACTION_OPEN,
+                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                     GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                     NULL);
+    gtk_file_chooser_set_select_multiple ( GTK_FILE_CHOOSER(vfl->file_selector), TRUE );
     gtk_window_set_transient_for ( GTK_WINDOW(vfl->file_selector), GTK_WINDOW(win) );
     gtk_window_set_destroy_with_parent ( GTK_WINDOW(vfl->file_selector), TRUE );
   }
 
-  if ( gtk_dialog_run ( GTK_DIALOG(vfl->file_selector) ) == GTK_RESPONSE_OK ) {
-    gchar **files = gtk_file_selection_get_selections ( GTK_FILE_SELECTION(vfl->file_selector) );
-    gchar **fiter = files;
+  if ( gtk_dialog_run ( GTK_DIALOG(vfl->file_selector) ) == GTK_RESPONSE_ACCEPT ) {
+    files = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER(vfl->file_selector) );
+    fiter = files;
     GtkTreeIter iter;
-    while (*fiter) {
+    while ( fiter ) {
+      gchar *file_name = fiter->data;
+      
       gtk_list_store_append ( GTK_LIST_STORE(vfl->model), &iter );
-      gtk_list_store_set ( GTK_LIST_STORE(vfl->model), &iter, 0, *fiter, -1 );
-      fiter++;
+      gtk_list_store_set ( GTK_LIST_STORE(vfl->model), &iter, 0, file_name, -1 );
+      
+      g_free (file_name);
+      
+      fiter = g_slist_next (fiter);
     }
-    g_strfreev(files);
+    g_slist_free (files);
   }
     gtk_widget_hide ( vfl->file_selector );
 }
@@ -105,8 +123,8 @@ GtkWidget *vik_file_list_new ( const gchar *title )
 
   gtk_widget_set_size_request ( vfl->treeview, 200, 100);
 
-  add_btn = gtk_button_new_with_label("Add...");
-  del_btn = gtk_button_new_with_label("Delete");
+  add_btn = gtk_button_new_with_label(_("Add..."));
+  del_btn = gtk_button_new_with_label(_("Delete"));
 
   g_signal_connect_swapped ( G_OBJECT(add_btn), "clicked", G_CALLBACK(file_list_add), vfl );
   g_signal_connect_swapped ( G_OBJECT(del_btn), "clicked", G_CALLBACK(file_list_del), vfl );
@@ -134,7 +152,7 @@ static gboolean get_file_name(GtkTreeModel *model, GtkTreePath *path, GtkTreeIte
 {
   gchar *str;
   gtk_tree_model_get ( model, iter, 0, &str, -1 );
-  g_debug("get_file_name: %s", str);
+  g_debug ("%s: %s", __FUNCTION__, str);
   (*list) = g_list_append((*list), g_strdup(str));
   return FALSE;
 }