[GNUnet-SVN] r339 - in branches/GNUnet06: . src/applications/afs/gtkui src/applications/afs/tools

[grothoff]

Author: grothoff
Date: 2005-02-27 15:27:15 -0800 (Sun, 27 Feb 2005)
New Revision: 339

Modified:
   branches/GNUnet06/ChangeLog
   branches/GNUnet06/src/applications/afs/gtkui/insert.c
   branches/GNUnet06/src/applications/afs/tools/gnunet-insert.c
Log:
bugfix, including mantis 832

Modified: branches/GNUnet06/ChangeLog
===================================================================
--- branches/GNUnet06/ChangeLog 2005-02-27 20:32:41 UTC (rev 338)
+++ branches/GNUnet06/ChangeLog 2005-02-27 23:27:15 UTC (rev 339)
@@ -1,3 +1,6 @@
+Sun Feb 27 18:15:02 EST 2005
+       Fixing serious problem with LE in gnunet-insert.
+
 Thu Feb 17 01:14:30 EST 2005
        Various memory leaks for Win32 fixed.
        Added support for GNUNET(D)_CONFIG environment variable.

Modified: branches/GNUnet06/src/applications/afs/gtkui/insert.c
===================================================================
--- branches/GNUnet06/src/applications/afs/gtkui/insert.c       2005-02-27 
20:32:41 UTC (rev 338)
+++ branches/GNUnet06/src/applications/afs/gtkui/insert.c       2005-02-27 
23:27:15 UTC (rev 339)
@@ -433,6 +433,17 @@
 }
 
 /**
+ * The index/insert file button was clicked.
+ *
+ * @param w the button
+ * @param ewm state of the edit window
+ */
+static void button_index_clicked_directory(GtkWidget * w,
+                                          EditDirectoryWindowModel * ewm) {
+  gtk_widget_set_sensitive(ewm->checkCopy, w == ewm->indexButton);
+}
+
+/**
  * Exit the application (called when the main window
  * is closed or the user selects File-Quit).
  */
@@ -939,7 +950,7 @@
                                                 _("Index only"));
   gtk_signal_connect(GTK_OBJECT(indexbutton1),
                     "toggled",
-                     GTK_SIGNAL_FUNC(button_index_clicked),
+                     GTK_SIGNAL_FUNC(button_index_clicked_directory),
                      ewm);    
   ewm->indexButton = indexbutton1;
   gtk_box_pack_start(GTK_BOX (hbox),
@@ -954,8 +965,8 @@
   check_copy = gtk_check_button_new_with_label(_("Copy file to shared 
directory"));
   ewm->checkCopy = check_copy;
   gtk_signal_connect(GTK_OBJECT(indexbutton2),
-                          "toggled",
-                     GTK_SIGNAL_FUNC(button_index_clicked),
+                    "toggled",
+                     GTK_SIGNAL_FUNC(button_index_clicked_directory),
                      ewm);
   gtk_box_pack_start(GTK_BOX(hbox), 
                     indexbutton2, 
@@ -968,15 +979,14 @@
                                "YES") == YES) {
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(indexbutton1), 
                                 TRUE);
-               doIndex = 1;
+    doIndex = 1;
   }
   else {
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(indexbutton2), 
                                 TRUE);
-               doIndex = 0;
+    doIndex = 0;
   }
 
-
   gtk_box_pack_start(GTK_BOX(hbox),
                      check_copy,
                      TRUE,

Modified: branches/GNUnet06/src/applications/afs/tools/gnunet-insert.c
===================================================================
--- branches/GNUnet06/src/applications/afs/tools/gnunet-insert.c        
2005-02-27 20:32:41 UTC (rev 338)
+++ branches/GNUnet06/src/applications/afs/tools/gnunet-insert.c        
2005-02-27 23:27:15 UTC (rev 339)
@@ -635,7 +635,9 @@
           "-X", "-x");
   extractors = (testConfigurationString("GNUNET-INSERT",
                                        "EXTRACT-KEYWORDS",
-                                       "NO")) ? NULL : extractors;
+                                       "NO")) 
+    ? NULL 
+    : getExtractors();
 #endif
   
   /* fixme: other sanity checks here? */