[GNUnet-SVN] r1556 - in gnunet-gtk: . src/core src/plugins/fs

[grothoff]

Author: grothoff
Date: 2005-07-16 09:36:33 -0700 (Sat, 16 Jul 2005)
New Revision: 1556

Modified:
   gnunet-gtk/TODO
   gnunet-gtk/src/core/main.c
   gnunet-gtk/src/plugins/fs/meta.c
Log:
fix

Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO     2005-07-16 15:51:25 UTC (rev 1555)
+++ gnunet-gtk/TODO     2005-07-16 16:36:33 UTC (rev 1556)
@@ -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 

Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c  2005-07-16 15:51:25 UTC (rev 1555)
+++ gnunet-gtk/src/core/main.c  2005-07-16 16:36:33 UTC (rev 1556)
@@ -100,6 +100,8 @@
     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

Modified: gnunet-gtk/src/plugins/fs/meta.c
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.c    2005-07-16 15:51:25 UTC (rev 1555)
+++ gnunet-gtk/src/plugins/fs/meta.c    2005-07-16 16:36:33 UTC (rev 1556)
@@ -108,9 +108,11 @@
     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);
+    }
   }
 }