[GNUnet-SVN] r30517 - in gnunet-gtk: contrib src/namestore

[gnunet]

Author: grothoff
Date: 2013-11-05 12:15:09 +0100 (Tue, 05 Nov 2013)
New Revision: 30517

Modified:
   gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade
   gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
Log:
-fix NPE

Modified: gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade   2013-11-05 
10:24:08 UTC (rev 30516)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade   2013-11-05 
11:15:09 UTC (rev 30517)
@@ -91,7 +91,7 @@
           <object class="GtkLabel" id="about_name_version_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label">GNUnet-Peerinfo-GTK 0.9.3</property>
+            <property name="label">GNUnet-Peerinfo-GTK 0.9.5</property>
             <attributes>
               <attribute name="weight" value="bold"/>
               <attribute name="size" value="200"/>

Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk.c     2013-11-05 10:24:08 UTC 
(rev 30516)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk.c     2013-11-05 11:15:09 UTC 
(rev 30517)
@@ -2540,14 +2540,6 @@
     GNUNET_free (moc->data);
     GNUNET_free (moc);
   }
-  if (NULL != n2r)
-  {
-    GNUNET_CONTAINER_multihashmap_iterate (n2r,
-                                          &release_ri,
-                                          NULL);
-    GNUNET_CONTAINER_multihashmap_destroy (n2r);
-    n2r = NULL;
-  }
   gtk_tree_store_clear (ts);
   if (NULL != namestore)
   {
@@ -2569,6 +2561,14 @@
     GNUNET_IDENTITY_disconnect (identity);
     identity = NULL;
   }
+  if (NULL != n2r)
+  {
+    GNUNET_CONTAINER_multihashmap_iterate (n2r,
+                                          &release_ri,
+                                          NULL);
+    GNUNET_CONTAINER_multihashmap_destroy (n2r);
+    n2r = NULL;
+  }
 }