[GNUnet-SVN] r7458 - gnunet-gtk/src/plugins/fs

[gnunet]

Author: grothoff
Date: 2008-07-19 02:35:03 -0600 (Sat, 19 Jul 2008)
New Revision: 7458

Modified:
   gnunet-gtk/src/plugins/fs/search.c
Log:
moved code

Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c  2008-07-19 08:33:21 UTC (rev 7457)
+++ gnunet-gtk/src/plugins/fs/search.c  2008-07-19 08:35:03 UTC (rev 7458)
@@ -395,8 +395,6 @@
 }
 
 
-
-
 static int
 on_search_display_metadata_activate (void *cls, GtkWidget * searchEntry)
 {
@@ -406,8 +404,6 @@
   struct GNUNET_ECRS_URI *uri;
   struct GNUNET_MetaData *meta;
   char *str;
-  GladeXML *xml;
-  GtkWidget *dialog;
 
   path = NULL;
   if (FALSE == gtk_tree_view_get_path_at_pos (list->treeview,
@@ -431,16 +427,8 @@
   gtk_tree_model_get (GTK_TREE_MODEL (list->tree),
                       &iter, SEARCH_URI, &uri, SEARCH_META, &meta, -1);
   str = GNUNET_ECRS_uri_to_string (uri);
-  xml = glade_xml_new (GNUNET_GTK_get_glade_filename (),
-                       "metaDisplayDialog", PACKAGE_NAME);
-  GNUNET_GTK_connect_glade_with_plugins (xml);
-  dialog = glade_xml_get_widget (xml, "metaDisplayDialog");
-  gtk_window_set_title (GTK_WINDOW (dialog), str);
-  createMetaDataListTreeView (xml, "metaDisplayDialogTreeView", NULL, meta);
-  gtk_dialog_run (GTK_DIALOG (dialog));
+  open_meta_data_display_dialog(meta, str);
   GNUNET_free_non_null (str);
-  gtk_widget_destroy (dialog);
-  UNREF (xml);
   return FALSE;
 }
 
@@ -490,6 +478,7 @@
   GladeXML *uploadXML;
   GtkFileChooser *dialog;
   char *ret;
+  gint gret;
 
   uploadXML
     = glade_xml_new (GNUNET_GTK_get_glade_filename (),
@@ -497,11 +486,12 @@
   GNUNET_GTK_connect_glade_with_plugins (uploadXML);
   dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
                                                    "directorySaveDialog"));
-  if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_CANCEL)
+  gret = gtk_dialog_run (GTK_DIALOG (dialog));
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+  if (gret != GTK_RESPONSE_CANCEL)
     ret = gtk_file_chooser_get_filename (dialog);
   else
     ret = NULL;
-  gtk_widget_destroy (GTK_WIDGET (dialog));
   UNREF (uploadXML);
   return ret;
 }