[GNUnet-SVN] r18645 - in gnunet-gtk: contrib src/fs

[gnunet]

Author: grothoff
Date: 2011-12-16 20:07:24 +0100 (Fri, 16 Dec 2011)
New Revision: 18645

Modified:
   gnunet-gtk/contrib/gnunet_fs_gtk_about_window.glade
   gnunet-gtk/src/fs/gnunet-fs-gtk-common.c
Log:
-fix compiler warning

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_about_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_about_window.glade 2011-12-16 19:04:56 UTC 
(rev 18644)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_about_window.glade 2011-12-16 19:07:24 UTC 
(rev 18645)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.24"/>
+  <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="about_window">
     <property name="can_focus">False</property>

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-common.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-common.c    2011-12-16 19:04:56 UTC (rev 
18644)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-common.c    2011-12-16 19:07:24 UTC (rev 
18645)
@@ -48,9 +48,11 @@
                                            const char *data_mime_type,
                                            const char *data, size_t data_len)
 {
-  gchar *data_to_insert = NULL;
-  gboolean freedata = FALSE;
   GtkListStore *ls = GTK_LIST_STORE (cls);
+  const gchar *data_to_insert = NULL;
+  gchar *free_data = NULL;
+  gsize rd;
+  gsize wr;
 
   if (format == EXTRACTOR_METAFORMAT_UTF8)
   {
@@ -61,19 +63,17 @@
   }
   if (format == EXTRACTOR_METAFORMAT_C_STRING)
   {
-    gsize rd, wr;
-    data_to_insert = g_locale_to_utf8 (data, data_len, &rd, &wr, NULL);
-    freedata = TRUE;
+    free_data = g_locale_to_utf8 (data, data_len, &rd, &wr, NULL);
+    data_to_insert = free_data;
   }
 
-  if (data_to_insert)
-  {
+  if (NULL != data_to_insert)  
     gtk_list_store_insert_with_values (ls, NULL, G_MAXINT, 0, type, 1, format,
                                        2, EXTRACTOR_metatype_to_string (type),
-                                       3, data_to_insert, -1);
-    if (freedata)
-      g_free (data_to_insert);
-  }
+                                       3, data_to_insert, -1);  
+  if (NULL != free_data)
+    g_free (free_data);
+
   return 0;
 }