[GNUnet-SVN] r20719 - gnunet-gtk/src/gns

[gnunet]

Author: wachs
Date: 2012-03-23 14:33:49 +0100 (Fri, 23 Mar 2012)
New Revision: 20719

Modified:
   gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
Log:
- fix


Modified: gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c    2012-03-23 13:02:57 UTC (rev 
20718)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c    2012-03-23 13:33:49 UTC (rev 
20719)
@@ -63,7 +63,7 @@
   char * name;
 };
 
-void
+static void
 check_name_validity_and_commit_remove_proc (void *cls,
                                             int32_t success,
                                             const char *emsg)
@@ -138,9 +138,8 @@
   struct GNUNET_NAMESTORE_RecordData *rd = GNUNET_malloc (children * sizeof 
(struct GNUNET_NAMESTORE_RecordData));
 
   if (FALSE == gtk_tree_model_iter_children (gns->tm, &it, &parent))
-  {
     return;
-  }
+
   for (c = 0; c < children; c++)
   {
     gtk_tree_model_get(gns->tm, &it,
@@ -803,7 +802,8 @@
   return TRUE;
 }
 
-void set_relative_expiration_time (struct GNUNET_GNS_Context *gns, struct 
GNUNET_TIME_Relative reltime)
+static void
+set_relative_expiration_time (struct GNUNET_GNS_Context *gns, struct 
GNUNET_TIME_Relative reltime)
 {
   GtkTreeIter it;
   GtkTreeIter parent;
@@ -815,28 +815,28 @@
   char *path;
   int not_dummy;
 
-  if (TRUE == gtk_tree_selection_get_selected (ts, &tm, &it))
-  {
-    gtk_tree_model_get(tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
-    if (GNUNET_NO == not_dummy)
-      return;
+  if (FALSE == gtk_tree_selection_get_selected (ts, &tm, &it))
+    return;
 
-    /* Has parent? */
-    has_parent = gtk_tree_model_iter_parent (tm, &parent, &it);
+  gtk_tree_model_get(tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
+  if (GNUNET_NO == not_dummy)
+    return;
 
-    if (FALSE == has_parent)
-      return;
+  /* Has parent? */
+  has_parent = gtk_tree_model_iter_parent (tm, &parent, &it);
 
-    abstime = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), reltime);
+  if (FALSE == has_parent)
+    return;
 
-    /* this is a single record */
-    renderer = GTK_CELL_RENDERER_TEXT((gtk_builder_get_object (gns->builder, 
"GNUNET_GNS_GTK_name_cellrenderertext")));
-    path = gtk_tree_model_get_string_from_iter (tm, &it);
-    GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb (renderer,
-                                                          path,
-                                                          
convert_time_to_string (abstime),
-                                                          gns);
-  }
+  abstime = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), reltime);
+
+  /* this is a single record */
+  renderer = GTK_CELL_RENDERER_TEXT((gtk_builder_get_object (gns->builder, 
"GNUNET_GNS_GTK_name_cellrenderertext")));
+  path = gtk_tree_model_get_string_from_iter (tm, &it);
+  GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb (renderer,
+                                                        path,
+                                                        convert_time_to_string 
(abstime),
+                                                        gns);
 }
 
 
@@ -903,7 +903,8 @@
   char *label;
 };
 
-void GNUNET_GNS_GTK_delete_popup_menu_delete_cb (GtkMenuItem *menuitem,
+void
+GNUNET_GNS_GTK_delete_popup_menu_delete_cb (GtkMenuItem *menuitem,
                                                  gpointer user_data)
 {
   struct GNUNET_GNS_Context *gns = user_data;
@@ -916,7 +917,6 @@
   ts = gtk_tree_view_get_selection(gns->tv);
   if (TRUE == gtk_tree_selection_get_selected (ts, &tm, &it))
   {
-    gtk_tree_selection_get_selected (ts, &tm, &it);
     gtk_tree_model_get(tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
     if (GNUNET_NO == not_dummy)
       return; /* do not delete the dummy line */
@@ -927,7 +927,8 @@
   }
 }
 
-void zone_iteration_proc (void *cls,
+static void
+zone_iteration_proc (void *cls,
                           const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded 
*zone_key,
                           struct GNUNET_TIME_Absolute expire,
                           const char *name,