fix

3 files changed, 7 insertions, 4 deletions

diff --git a/TODO b/TODO
index 3ab1bcf0..a8973b5a 100644
--- a/TODO
+++ b/TODO
@@ -8,7 +8,6 @@
 5) why can the "file sharing" tab not be selected first
    (I can select first "General" and then "file sharing"!,
     glade shows no difference between the two!!!)
-6) i18n does not work (UTF-8/pango problems)
 
 Later (0.7.1+):
 1) auto-rename downloaded files 
diff --git a/src/core/main.c b/src/core/main.c
index 9d6c0638..ab43f6d3 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -100,6 +100,8 @@ int main(int argc,
     return 0;
   BINDTEXTDOMAIN(PACKAGE_NAME, PACKAGE_LOCALE_DIR);
   textdomain(PACKAGE);
+  bind_textdomain_codeset("GNUnet", "UTF-8");
+  bind_textdomain_codeset("gnunet-gtk", "UTF-8");
   startCron();
   initGNUnetGTKCommon();
   root
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index 044e9d82..8009368f 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -108,9 +108,11 @@ void createMetaDataListTreeView(GladeXML * xml,
     pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
     gdk_pixbuf_loader_close(loader,
                             NULL);    
-    gtk_image_set_from_pixbuf(GTK_IMAGE(preview),
-                              pixbuf);
-    g_object_unref(pixbuf);
+    if (pixbuf != NULL) {
+      gtk_image_set_from_pixbuf(GTK_IMAGE(preview),
+                                pixbuf);
+      g_object_unref(pixbuf);
+    }
   }
 }