-fix compiler warning

2 files changed, 12 insertions, 12 deletions

diff --git a/contrib/gnunet_fs_gtk_about_window.glade b/contrib/gnunet_fs_gtk_about_window.glade
index 90d118e4..95534b63 100644
--- a/contrib/gnunet_fs_gtk_about_window.glade
+++ b/contrib/gnunet_fs_gtk_about_window.glade
@@ -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>
diff --git a/src/fs/gnunet-fs-gtk-common.c b/src/fs/gnunet-fs-gtk-common.c
index 1a250c62..e9c052e6 100644
--- a/src/fs/gnunet-fs-gtk-common.c
+++ b/src/fs/gnunet-fs-gtk-common.c
@@ -48,9 +48,11 @@ GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls, const char *plugin_name,
                                            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 @@ GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls, const char *plugin_name,
   }
   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;
 }