[GNUnet-SVN] r20715 - gnunet-gtk/src/fs

[gnunet]

Author: grothoff
Date: 2012-03-23 12:59:35 +0100 (Fri, 23 Mar 2012)
New Revision: 20715

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
   gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
   gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c
   gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_manager.c
Log:
-fix error handling for corner cases

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2012-03-23 11:15:14 UTC 
(rev 20714)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2012-03-23 11:59:35 UTC 
(rev 20715)
@@ -1468,14 +1468,18 @@
              "Updating search result SR=%p with %d, %u, %u\n",
              sr, availability_rank,
              availability_certainty, applicability_rank);
-  desc = GNUNET_FS_GTK_get_description_from_metadata (meta, &desc_is_a_dup);
-  mime = get_mimetype_from_metadata (meta);
-  pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
   tp = gtk_tree_row_reference_get_path (sr->rr);
   tm = gtk_tree_row_reference_get_model (sr->rr);
   ts = GTK_TREE_STORE (tm);
-  gtk_tree_model_get_iter (tm, &iter, tp);
+  if (! gtk_tree_model_get_iter (tm, &iter, tp))
+  {
+    GNUNET_break (0);
+    return;
+  }
   gtk_tree_path_free (tp);
+  desc = GNUNET_FS_GTK_get_description_from_metadata (meta, &desc_is_a_dup);
+  mime = get_mimetype_from_metadata (meta);
+  pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
   gtk_tree_model_get (tm, &iter, 0, &ometa, -1);
   if (NULL != ometa)
     GNUNET_CONTAINER_meta_data_destroy (ometa);

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c    
2012-03-23 11:15:14 UTC (rev 20714)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c    
2012-03-23 11:59:35 UTC (rev 20715)
@@ -370,7 +370,7 @@
     memcpy (selected_ns_id, key, sizeof (GNUNET_HashCode));
   }
 
-  if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
       main_ctx->search_ns_treestore), &iter))
   {
     while (TRUE)
@@ -398,7 +398,7 @@
       add_namespace_to_ts, main_ctx->search_ns_treestore);
   main_ctx->ns_callback_registered = GNUNET_YES;
 
-  if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
       main_ctx->search_ns_treestore), &iter))
   {
     while (TRUE)
@@ -418,19 +418,22 @@
         g_free (value);
     }
   }
-  if (!found)
+  if ( (!found) &&
+       gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+                                                     
main_ctx->search_ns_treestore), &iter))
   {
-    gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
-        main_ctx->search_ns_treestore), &iter);
     gtk_tree_model_get (GTK_TREE_MODEL (main_ctx->search_ns_treestore), &iter,
         0, &value, 1, &key, -1);
     found = TRUE;
   }
-  gtk_tree_selection_select_iter (gtk_tree_view_get_selection
-                                  (main_ctx->ns_selector_treeview), &iter);
+  if (found)
+    gtk_tree_selection_select_iter (gtk_tree_view_get_selection
+                                   (main_ctx->ns_selector_treeview), &iter);
   if (value != NULL)
+  {
     gtk_label_set_text (main_ctx->search_ns_label, value);
-  g_free(value);
+    g_free(value);
+  }
   GNUNET_free_non_null (selected_ns_id);
 }
 

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c        2012-03-23 
11:15:14 UTC (rev 20714)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c        2012-03-23 
11:59:35 UTC (rev 20715)
@@ -63,7 +63,8 @@
     if ( (NULL != mime_model) && 
         gtk_combo_box_get_active_iter (mime_combo, &iter))
       gtk_tree_model_get (mime_model, &iter, 0, &mime_keyword, -1);
-    if (0 == strcmp (mime_keyword, " "))
+    if ( (NULL != mime_keyword) &&
+        (0 == strcmp (mime_keyword, " ")) )
     {
       g_free (mime_keyword);
       mime_keyword = NULL;

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_manager.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_manager.c 2012-03-23 11:15:14 UTC 
(rev 20714)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_manager.c 2012-03-23 11:59:35 UTC 
(rev 20715)
@@ -87,7 +87,7 @@
 
   row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
       ctx->ns_order_store), NULL);
-  if (TRUE != gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
       ctx->ns_order_store), &iter))
     return;
 
@@ -141,6 +141,8 @@
         cmp_result = strcmp (row_strings[i], row_strings[i + 1]);
         break;
       default:
+       GNUNET_break (0);
+       cmp_result = 0;
         break;
       }
 
@@ -316,7 +318,7 @@
 
   row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
       ctx->ns_order_store), NULL);
-  if (TRUE != gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
       ctx->ns_order_store), &iter))
     return;
 
@@ -388,7 +390,7 @@
 
   row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
       ctx->ns_details_store), NULL);
-  if ((row_count > 0) && (TRUE != gtk_tree_model_get_iter_first (
+  if ((row_count > 0) && (! gtk_tree_model_get_iter_first (
       GTK_TREE_MODEL (ctx->ns_details_store), &iter)))
   {
     /* This should not happen */
@@ -657,7 +659,7 @@
 
   row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
       ctx->known_ns_store), NULL);
-  if (TRUE != gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
       ctx->known_ns_store), &iter))
     return;
 
@@ -690,7 +692,7 @@
 
   row_count = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (
       ctx->known_ns_store), NULL);
-  if (TRUE != gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+  if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
       ctx->known_ns_store), &iter))
     return;