gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r7528 - in gnunet-gtk: . src/plugins/fs


From: gnunet
Subject: [GNUnet-SVN] r7528 - in gnunet-gtk: . src/plugins/fs
Date: Wed, 30 Jul 2008 05:14:07 -0600 (MDT)

Author: grothoff
Date: 2008-07-30 05:14:07 -0600 (Wed, 30 Jul 2008)
New Revision: 7528

Modified:
   gnunet-gtk/TODO
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/src/plugins/fs/fs.c
   gnunet-gtk/src/plugins/fs/namespace_search.c
   gnunet-gtk/src/plugins/fs/search.c
Log:
fix

Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO     2008-07-29 18:02:36 UTC (rev 7527)
+++ gnunet-gtk/TODO     2008-07-30 11:14:07 UTC (rev 7528)
@@ -1,9 +1,6 @@
 This is just the current plan, plans change.
 
 0.8.1 [8'08] (aka "growth"):
-- bugs:
-  * manual entry of namespace name in search tab does not
-    work (results in global search)
 - improve collection handling
   * show content of current collection somewhere
   * add 'publish now' button / menu entry

Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2008-07-29 18:02:36 UTC (rev 7527)
+++ gnunet-gtk/gnunet-gtk.glade 2008-07-30 11:14:07 UTC (rev 7528)
@@ -694,6 +694,7 @@
                                 <signal name="changed" 
handler="on_searchNamespaceComboBoxEntry_changed_"/>
                                 <child internal-child="entry">
                                   <widget class="GtkEntry" 
id="comboboxentry-entry2">
+                                    <property name="editable">False</property>
                                   </widget>
                                 </child>
                               </widget>
@@ -790,80 +791,43 @@
                       <placeholder/>
                     </child>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow10">
+                      <widget class="GtkVBox" id="vbox21">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property 
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="shadow_type">GTK_SHADOW_IN</property>
-                        <child>
-                          <widget class="GtkTreeView" id="activeDownloadsList">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="reorderable">True</property>
-                            <property name="rules_hint">True</property>
-                            <signal name="button_press_event" 
handler="on_activeDownloadsList_button_press_"/>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkVBox" id="vbox8">
-                        <property name="visible">True</property>
                         <property name="homogeneous">True</property>
                         <child>
-                          <widget class="GtkButton" id="abortDownloadButton">
+                          <widget class="GtkButton" id="stopUploadButton">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Cancel 
the selected download (and all sub-downloads) and delete incomplete download 
files</property>
-                            <property name="label">gtk-delete</property>
-                            <property name="use_stock">True</property>
-                            <property name="response_id">0</property>
-                            <signal name="clicked" 
handler="on_abortDownload_clicked_"/>
-                          </widget>
-                          <packing>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkButton" id="stopDownloadButton">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Stop 
the selected download (and all sub-downloads) and remove them from the list.  
This will NOT cause the deletion of files from incomplete downloads.</property>
+                            <property name="tooltip" translatable="yes">Cancel 
the selected upload (and all sub-uploads) and remove them from the 
list</property>
                             <property name="label">gtk-stop</property>
                             <property name="use_stock">True</property>
                             <property name="response_id">0</property>
-                            <signal name="clicked" 
handler="on_stopDownload_clicked_"/>
+                            <signal name="clicked" 
handler="on_stopUpload_clicked_" object="activeUploadsList"/>
                           </widget>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" 
id="clearCompletedDownloadsButton">
+                          <widget class="GtkButton" 
id="clearCompletedUploadsButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Clear 
completed downloads from the list</property>
+                            <property name="tooltip" translatable="yes">Clear 
completed uploads from the list</property>
                             <property name="response_id">0</property>
-                            <signal name="clicked" 
handler="on_clearCompletedDownloads_clicked_"/>
+                            <signal name="clicked" 
handler="on_clearCompletedUploads_clicked_"/>
                             <child>
-                              <widget class="GtkAlignment" id="alignment3">
+                              <widget class="GtkAlignment" id="alignment4">
                                 <property name="visible">True</property>
                                 <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="xscale">0</property>
                                 <child>
-                                  <widget class="GtkHBox" id="hbox4">
+                                  <widget class="GtkHBox" id="hbox5">
                                     <property name="visible">True</property>
                                     <property name="spacing">2</property>
                                     <child>
-                                      <widget class="GtkImage" id="image3">
+                                      <widget class="GtkImage" id="image4">
                                         <property 
name="visible">True</property>
                                         <property 
name="stock">gtk-clear</property>
                                       </widget>
@@ -873,7 +837,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label5">
+                                      <widget class="GtkLabel" id="label2">
                                         <property 
name="visible">True</property>
                                         <property name="label" 
translatable="yes">_Clean</property>
                                         <property 
name="use_underline">True</property>
@@ -890,22 +854,85 @@
                             </child>
                           </widget>
                           <packing>
-                            <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">2</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="x_padding">5</property>
                       </packing>
                     </child>
                     <child>
+                      <widget class="GtkAlignment" id="alignment14">
+                        <property name="visible">True</property>
+                        <property name="top_padding">5</property>
+                        <child>
+                          <widget class="GtkLabel" id="label46">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="xpad">5</property>
+                            <property name="ypad">5</property>
+                            <property name="label" 
translatable="yes">&lt;b&gt;Publications&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment11">
+                        <property name="visible">True</property>
+                        <property name="top_padding">5</property>
+                        <child>
+                          <widget class="GtkLabel" id="label45">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="xpad">5</property>
+                            <property name="ypad">5</property>
+                            <property name="label" 
translatable="yes">&lt;b&gt;Downloads&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="right_attach">2</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="scrolledwindow8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property 
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property name="shadow_type">GTK_SHADOW_IN</property>
+                        <child>
+                          <widget class="GtkTreeView" id="activeUploadsList">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="rules_hint">True</property>
+                            <signal name="button_press_event" 
handler="on_activeUploadsList_button_press_"/>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
+                      </packing>
+                    </child>
+                    <child>
                       <widget class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
                         <child>
@@ -1022,107 +1049,58 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow8">
+                      <widget class="GtkVBox" id="vbox8">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property 
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="shadow_type">GTK_SHADOW_IN</property>
+                        <property name="homogeneous">True</property>
                         <child>
-                          <widget class="GtkTreeView" id="activeUploadsList">
+                          <widget class="GtkButton" id="abortDownloadButton">
                             <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
-                            <property name="reorderable">True</property>
-                            <property name="rules_hint">True</property>
-                            <signal name="button_press_event" 
handler="on_activeUploadsList_button_press_"/>
+                            <property name="tooltip" translatable="yes">Cancel 
the selected download (and all sub-downloads) and delete incomplete download 
files</property>
+                            <property name="label">gtk-delete</property>
+                            <property name="use_stock">True</property>
+                            <property name="response_id">0</property>
+                            <signal name="clicked" 
handler="on_abortDownload_clicked_"/>
                           </widget>
+                          <packing>
+                            <property name="fill">False</property>
+                          </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment11">
-                        <property name="visible">True</property>
-                        <property name="top_padding">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label45">
+                          <widget class="GtkButton" id="stopDownloadButton">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="ypad">5</property>
-                            <property name="label" 
translatable="yes">&lt;b&gt;Downloads&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment14">
-                        <property name="visible">True</property>
-                        <property name="top_padding">5</property>
-                        <child>
-                          <widget class="GtkLabel" id="label46">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="ypad">5</property>
-                            <property name="label" 
translatable="yes">&lt;b&gt;Publications&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkVBox" id="vbox21">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">True</property>
-                        <child>
-                          <widget class="GtkButton" id="stopUploadButton">
-                            <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Cancel 
the selected upload (and all sub-uploads) and remove them from the 
list</property>
+                            <property name="tooltip" translatable="yes">Stop 
the selected download (and all sub-downloads) and remove them from the list.  
This will NOT cause the deletion of files from incomplete downloads.</property>
                             <property name="label">gtk-stop</property>
                             <property name="use_stock">True</property>
                             <property name="response_id">0</property>
-                            <signal name="clicked" 
handler="on_stopUpload_clicked_" object="activeUploadsList"/>
+                            <signal name="clicked" 
handler="on_stopDownload_clicked_"/>
                           </widget>
                           <packing>
-                            <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" 
id="clearCompletedUploadsButton">
+                          <widget class="GtkButton" 
id="clearCompletedDownloadsButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Clear 
completed uploads from the list</property>
+                            <property name="tooltip" translatable="yes">Clear 
completed downloads from the list</property>
                             <property name="response_id">0</property>
-                            <signal name="clicked" 
handler="on_clearCompletedUploads_clicked_"/>
+                            <signal name="clicked" 
handler="on_clearCompletedDownloads_clicked_"/>
                             <child>
-                              <widget class="GtkAlignment" id="alignment4">
+                              <widget class="GtkAlignment" id="alignment3">
                                 <property name="visible">True</property>
                                 <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="xscale">0</property>
                                 <child>
-                                  <widget class="GtkHBox" id="hbox5">
+                                  <widget class="GtkHBox" id="hbox4">
                                     <property name="visible">True</property>
                                     <property name="spacing">2</property>
                                     <child>
-                                      <widget class="GtkImage" id="image4">
+                                      <widget class="GtkImage" id="image3">
                                         <property 
name="visible">True</property>
                                         <property 
name="stock">gtk-clear</property>
                                       </widget>
@@ -1132,7 +1110,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label2">
+                                      <widget class="GtkLabel" id="label5">
                                         <property 
name="visible">True</property>
                                         <property name="label" 
translatable="yes">_Clean</property>
                                         <property 
name="use_underline">True</property>
@@ -1149,20 +1127,43 @@
                             </child>
                           </widget>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">1</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="x_padding">5</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="scrolledwindow10">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property 
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property name="shadow_type">GTK_SHADOW_IN</property>
+                        <child>
+                          <widget class="GtkTreeView" id="activeDownloadsList">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="rules_hint">True</property>
+                            <signal name="button_press_event" 
handler="on_activeDownloadsList_button_press_"/>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
                   </widget>
                   <packing>
                     <property name="position">1</property>
@@ -1217,80 +1218,53 @@
                           <placeholder/>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="methodLabel">
+                          <widget class="GtkAlignment" id="alignment8">
                             <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
                             <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" 
translatable="yes">Method:</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">indexbutton</property>
+                            <property name="xscale">0</property>
+                            <child>
+                              <widget class="GtkSpinButton" 
id="contentPrioritySpinButton">
+                                <property name="width_request">94</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip" 
translatable="yes">How important is the file (used to prioritize data in the 
local datastore).</property>
+                                <property name="adjustment">950 0 100000000 50 
500 500</property>
+                                <property name="climb_rate">500</property>
+                                <property name="numeric">True</property>
+                              </widget>
+                            </child>
                           </widget>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkRadioButton" id="indexbutton">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" 
translatable="yes">Indexing will avoid copying the file into the GNUnet 
database.  Instead, GNUnet will try to add a symbolic link to the specified 
file.  If that fails, a copy of the file will be created.  Indexing should be 
used if the local machine is unlikely to ever be compromised by an adversary 
and if the uploaded file will not be modified or moved in the future.  Indexing 
is more efficient than insertion.</property>
-                            <property name="label" 
translatable="yes">Inde_x</property>
-                            <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                          <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkRadioButton" id="insertButton">
+                          <widget class="GtkAlignment" id="alignment7">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" 
translatable="yes">Inserting a file means that an encrypted copy will be added 
to the GNUnet database.  Without the proper key (which is not stored in 
plaintext anywhere) the file cannot be decrypted.  Use this option for small 
files, files that will be modified soon, files that maybe moved or if you are 
afraid that an adversary may detect the file in plaintext on your machine 
(after compromising your machine).</property>
-                            <property name="label" 
translatable="yes">I_nsert</property>
-                            <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">indexbutton</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="scopeLabel">
-                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
                             <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" 
translatable="yes">Scope:</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">scopeFileOnlyButton</property>
+                            <property name="xscale">0</property>
+                            <child>
+                              <widget class="GtkSpinButton" 
id="uploadAnonymityLevelSpinButton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip" 
translatable="yes">What level of sender-anonymity is desired when sharing this 
particular file?  0 allows direct connections (no anonymity).  Higher levels 
require increasing amounts of cover traffic per shared block, increasing your 
privacy at the expense of efficiency.</property>
+                                <property name="adjustment">1 0 10000 1 10 
10</property>
+                                <property name="climb_rate">1</property>
+                                <property name="numeric">True</property>
+                                <signal name="value_changed" 
handler="on_anonymity_spin_changed_"/>
+                              </widget>
+                            </child>
                           </widget>
                           <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="anonymityUploadLabel">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" 
translatable="yes">_Anonymity:</property>
-                            <property name="use_underline">True</property>
-                          </widget>
-                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
@@ -1298,43 +1272,24 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkRadioButton" 
id="scopeRecursiveButton">
+                          <widget class="GtkCheckButton" 
id="doExtractCheckButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" 
translatable="yes">Recursively publish an entire directory tree</property>
-                            <property name="label" 
translatable="yes">_Recursive (for entire directories)</property>
-                            <property name="use_underline">True</property>
+                            <property name="tooltip" 
translatable="yes">Controls if GNUnet should (automatically) extract metadata 
for files.  If unchecked, the default metadata for the upload will only contain 
the filename.  If checked, GNU libextractor will be used to provide additional 
metadata (such as thumbnails).  The option only applies when a directory is 
uploaded.  For individual files, GNU libextractor is always used (you will have 
a chance to edit the extracted metadata in a dialog).</property>
                             <property name="response_id">0</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkCheckButton" 
id="deepIndexCheckButton">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Should 
it be possible to directly find files in the directory?  If unchecked, it will 
only be possible for the directory itself to be found with a normal keyword 
search.  This option only really makes a difference for uploads of 
directories.</property>
-                            <property name="response_id">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                             <child>
-                              <widget class="GtkAlignment" id="alignment15">
+                              <widget class="GtkAlignment" id="alignment24">
                                 <property name="visible">True</property>
                                 <property name="xscale">0</property>
                                 <property name="yscale">0</property>
                                 <child>
-                                  <widget class="GtkHBox" id="hbox52">
+                                  <widget class="GtkHBox" id="hbox66">
                                     <property name="visible">True</property>
                                     <property name="spacing">2</property>
                                     <child>
-                                      <widget class="GtkImage" id="image40">
+                                      <widget class="GtkImage" id="image49">
                                         <property 
name="visible">True</property>
                                         <property 
name="stock">gtk-index</property>
                                       </widget>
@@ -1344,9 +1299,9 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label128">
+                                      <widget class="GtkLabel" id="label151">
                                         <property 
name="visible">True</property>
-                                        <property name="label" 
translatable="yes">Add keywords for files in directories</property>
+                                        <property name="label" 
translatable="yes">Use libextractor for files in directories</property>
                                         <property 
name="use_underline">True</property>
                                       </widget>
                                       <packing>
@@ -1363,28 +1318,48 @@
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="fsinsertuploadbutton">
+                          <widget class="GtkRadioButton" 
id="scopeFileOnlyButton">
                             <property name="visible">True</property>
-                            <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Share 
the specified file with the selected options (you will then be prompted to 
enter meta-data and keywords)</property>
+                            <property name="tooltip" translatable="yes">Only 
publish a single file</property>
+                            <property name="label" translatable="yes">File 
onl_y</property>
+                            <property name="use_underline">True</property>
                             <property name="response_id">0</property>
-                            <signal name="clicked" 
handler="on_fsinsertuploadbutton_clicked_"/>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property 
name="group">scopeRecursiveButton</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkButton" 
id="mainFileSharingInsertBrowseButton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Browse 
local computer for files (or directories) to publish</property>
+                            <property name="response_id">0</property>
+                            <signal name="clicked" 
handler="on_mainFileSharingInsertBrowseButton_clicked_" 
object="fsinsertfilenamecombo"/>
                             <child>
-                              <widget class="GtkHBox" id="hbox55">
+                              <widget class="GtkHBox" id="hbox60">
                                 <property name="visible">True</property>
                                 <property name="spacing">2</property>
                                 <child>
-                                  <widget class="GtkImage" id="image42">
+                                  <widget class="GtkImage" id="image46">
                                     <property name="visible">True</property>
-                                    <property name="stock">gtk-go-up</property>
+                                    <property name="stock">gtk-open</property>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1392,9 +1367,9 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label137">
+                                  <widget class="GtkLabel" id="label143">
                                     <property name="visible">True</property>
-                                    <property name="label" 
translatable="yes">Pub_lish</property>
+                                    <property name="label" 
translatable="yes">_Browse</property>
                                     <property 
name="use_underline">True</property>
                                   </widget>
                                   <packing>
@@ -1409,26 +1384,32 @@
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
-                            <property name="top_attach">5</property>
-                            <property name="bottom_attach">6</property>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="uploadFilenameLabel">
+                          <widget class="GtkAlignment" 
id="uploadFilenameAlignment">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" 
translatable="yes">_Filename:</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="justify">GTK_JUSTIFY_CENTER</property>
-                            <property 
name="mnemonic_widget">uploadFilenameComboBoxEntry</property>
+                            <child>
+                              <widget class="GtkComboBoxEntry" 
id="uploadFilenameComboBoxEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <signal name="changed" 
handler="on_uploadFilenameComboBoxEntry_changed_"/>
+                                <child internal-child="entry">
+                                  <widget class="GtkEntry" 
id="comboboxentry-entry3">
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
                           </widget>
                           <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
                             <property name="top_attach">4</property>
                             <property name="bottom_attach">5</property>
-                            <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
@@ -1448,43 +1429,38 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" 
id="uploadFilenameAlignment">
+                          <widget class="GtkLabel" id="uploadFilenameLabel">
                             <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkComboBoxEntry" 
id="uploadFilenameComboBoxEntry">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <signal name="changed" 
handler="on_uploadFilenameComboBoxEntry_changed_"/>
-                                <child internal-child="entry">
-                                  <widget class="GtkEntry" 
id="comboboxentry-entry3">
-                                  </widget>
-                                </child>
-                              </widget>
-                            </child>
+                            <property name="xalign">0</property>
+                            <property name="xpad">5</property>
+                            <property name="label" 
translatable="yes">_Filename:</property>
+                            <property name="use_underline">True</property>
+                            <property 
name="justify">GTK_JUSTIFY_CENTER</property>
+                            <property 
name="mnemonic_widget">uploadFilenameComboBoxEntry</property>
                           </widget>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">4</property>
                             <property name="bottom_attach">5</property>
+                            <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" 
id="mainFileSharingInsertBrowseButton">
+                          <widget class="GtkButton" id="fsinsertuploadbutton">
                             <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Browse 
local computer for files (or directories) to publish</property>
+                            <property name="tooltip" translatable="yes">Share 
the specified file with the selected options (you will then be prompted to 
enter meta-data and keywords)</property>
                             <property name="response_id">0</property>
-                            <signal name="clicked" 
handler="on_mainFileSharingInsertBrowseButton_clicked_" 
object="fsinsertfilenamecombo"/>
+                            <signal name="clicked" 
handler="on_fsinsertuploadbutton_clicked_"/>
                             <child>
-                              <widget class="GtkHBox" id="hbox60">
+                              <widget class="GtkHBox" id="hbox55">
                                 <property name="visible">True</property>
                                 <property name="spacing">2</property>
                                 <child>
-                                  <widget class="GtkImage" id="image46">
+                                  <widget class="GtkImage" id="image42">
                                     <property name="visible">True</property>
-                                    <property name="stock">gtk-open</property>
+                                    <property name="stock">gtk-go-up</property>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1492,9 +1468,9 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label143">
+                                  <widget class="GtkLabel" id="label137">
                                     <property name="visible">True</property>
-                                    <property name="label" 
translatable="yes">_Browse</property>
+                                    <property name="label" 
translatable="yes">Pub_lish</property>
                                     <property 
name="use_underline">True</property>
                                   </widget>
                                   <packing>
@@ -1509,52 +1485,31 @@
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
+                            <property name="top_attach">5</property>
+                            <property name="bottom_attach">6</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkRadioButton" 
id="scopeFileOnlyButton">
+                          <widget class="GtkCheckButton" 
id="deepIndexCheckButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Only 
publish a single file</property>
-                            <property name="label" translatable="yes">File 
onl_y</property>
-                            <property name="use_underline">True</property>
+                            <property name="tooltip" translatable="yes">Should 
it be possible to directly find files in the directory?  If unchecked, it will 
only be possible for the directory itself to be found with a normal keyword 
search.  This option only really makes a difference for uploads of 
directories.</property>
                             <property name="response_id">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                            <property 
name="group">scopeRecursiveButton</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkCheckButton" 
id="doExtractCheckButton">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" 
translatable="yes">Controls if GNUnet should (automatically) extract metadata 
for files.  If unchecked, the default metadata for the upload will only contain 
the filename.  If checked, GNU libextractor will be used to provide additional 
metadata (such as thumbnails).  The option only applies when a directory is 
uploaded.  For individual files, GNU libextractor is always used (you will have 
a chance to edit the extracted metadata in a dialog).</property>
-                            <property name="response_id">0</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
                             <child>
-                              <widget class="GtkAlignment" id="alignment24">
+                              <widget class="GtkAlignment" id="alignment15">
                                 <property name="visible">True</property>
                                 <property name="xscale">0</property>
                                 <property name="yscale">0</property>
                                 <child>
-                                  <widget class="GtkHBox" id="hbox66">
+                                  <widget class="GtkHBox" id="hbox52">
                                     <property name="visible">True</property>
                                     <property name="spacing">2</property>
                                     <child>
-                                      <widget class="GtkImage" id="image49">
+                                      <widget class="GtkImage" id="image40">
                                         <property 
name="visible">True</property>
                                         <property 
name="stock">gtk-index</property>
                                       </widget>
@@ -1564,9 +1519,9 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label151">
+                                      <widget class="GtkLabel" id="label128">
                                         <property 
name="visible">True</property>
-                                        <property name="label" 
translatable="yes">Use libextractor for files in directories</property>
+                                        <property name="label" 
translatable="yes">Add keywords for files in directories</property>
                                         <property 
name="use_underline">True</property>
                                       </widget>
                                       <packing>
@@ -1583,33 +1538,40 @@
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" id="alignment7">
+                          <widget class="GtkRadioButton" 
id="scopeRecursiveButton">
                             <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" 
translatable="yes">Recursively publish an entire directory tree</property>
+                            <property name="label" 
translatable="yes">_Recursive (for entire directories)</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="anonymityUploadLabel">
+                            <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="xscale">0</property>
-                            <child>
-                              <widget class="GtkSpinButton" 
id="uploadAnonymityLevelSpinButton">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip" 
translatable="yes">What level of sender-anonymity is desired when sharing this 
particular file?  0 allows direct connections (no anonymity).  Higher levels 
require increasing amounts of cover traffic per shared block, increasing your 
privacy at the expense of efficiency.</property>
-                                <property name="adjustment">1 0 10000 1 10 
10</property>
-                                <property name="climb_rate">1</property>
-                                <property name="numeric">True</property>
-                                <signal name="value_changed" 
handler="on_anonymity_spin_changed_"/>
-                              </widget>
-                            </child>
+                            <property name="xpad">5</property>
+                            <property name="label" 
translatable="yes">_Anonymity:</property>
+                            <property name="use_underline">True</property>
                           </widget>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
@@ -1617,32 +1579,71 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" id="alignment8">
+                          <widget class="GtkLabel" id="scopeLabel">
                             <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
                             <property name="xalign">0</property>
-                            <property name="xscale">0</property>
-                            <child>
-                              <widget class="GtkSpinButton" 
id="contentPrioritySpinButton">
-                                <property name="width_request">94</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip" 
translatable="yes">How important is the file (used to prioritize data in the 
local datastore).</property>
-                                <property name="adjustment">950 0 100000000 50 
500 500</property>
-                                <property name="climb_rate">500</property>
-                                <property name="numeric">True</property>
-                              </widget>
-                            </child>
+                            <property name="xpad">5</property>
+                            <property name="label" 
translatable="yes">Scope:</property>
+                            <property name="use_underline">True</property>
+                            <property 
name="mnemonic_widget">scopeFileOnlyButton</property>
                           </widget>
                           <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkRadioButton" id="insertButton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" 
translatable="yes">Inserting a file means that an encrypted copy will be added 
to the GNUnet database.  Without the proper key (which is not stored in 
plaintext anywhere) the file cannot be decrypted.  Use this option for small 
files, files that will be modified soon, files that maybe moved or if you are 
afraid that an adversary may detect the file in plaintext on your machine 
(after compromising your machine).</property>
+                            <property name="label" 
translatable="yes">I_nsert</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">indexbutton</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkRadioButton" id="indexbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" 
translatable="yes">Indexing will avoid copying the file into the GNUnet 
database.  Instead, GNUnet will try to add a symbolic link to the specified 
file.  If that fails, a copy of the file will be created.  Indexing should be 
used if the local machine is unlikely to ever be compromised by an adversary 
and if the uploaded file will not be modified or moved in the future.  Indexing 
is more efficient than insertion.</property>
+                            <property name="label" 
translatable="yes">Inde_x</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
+                        <child>
+                          <widget class="GtkLabel" id="methodLabel">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="xpad">5</property>
+                            <property name="label" 
translatable="yes">Method:</property>
+                            <property name="use_underline">True</property>
+                            <property 
name="mnemonic_widget">indexbutton</property>
+                          </widget>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
                       </widget>
                     </child>
                   </widget>
@@ -2009,6 +2010,51 @@
                       <placeholder/>
                     </child>
                     <child>
+                      <widget class="GtkLabel" id="label1">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">_Room 
Name</property>
+                        <property name="use_underline">True</property>
+                        <property 
name="mnemonic_widget">chatRoomNameEntry</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" 
translatable="yes">_Moniker</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkEntry" id="chatRoomNameEntry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkEntry" id="chatRoomMonikerEntry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
                       <widget class="GtkButton" id="on_chat_room_name_button">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -2055,51 +2101,6 @@
                         <property name="y_options"></property>
                       </packing>
                     </child>
-                    <child>
-                      <widget class="GtkEntry" id="chatRoomMonikerEntry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkEntry" id="chatRoomNameEntry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" 
translatable="yes">_Moniker</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label1">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Room 
Name</property>
-                        <property name="use_underline">True</property>
-                        <property 
name="mnemonic_widget">chatRoomNameEntry</property>
-                      </widget>
-                    </child>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -4811,9 +4812,9 @@
     <property name="modal">True</property>
     <property name="icon_name">gtk-save-as</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="do_overwrite_confirmation">True</property>
     <property name="show_hidden">True</property>
     <property name="action">GTK_FILE_CHOOSER_ACTION_SAVE</property>
-    <property name="do_overwrite_confirmation">True</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox7">
         <property name="visible">True</property>

Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c      2008-07-29 18:02:36 UTC (rev 7527)
+++ gnunet-gtk/src/plugins/fs/fs.c      2008-07-30 11:14:07 UTC (rev 7528)
@@ -343,6 +343,7 @@
   GtkTreeViewColumn *column;
   int col;
   GladeXML *contextMenuXML;
+  GtkTreeIter iter;
 
   /* keyword list setup */
   searchCB
@@ -365,6 +366,13 @@
                               G_TYPE_STRING,    /* GNUNET_EncName of namespace 
*/
                               G_TYPE_POINTER,   /* ECRS MetaData */
                               G_TYPE_INT);      /* Meta-data about namespace */
+  gtk_list_store_append (model, &iter);
+  gtk_list_store_set (model,
+                     &iter,
+                     NS_SEARCH_DESCRIPTION, _("globally"),
+                     NS_SEARCH_NAME, _("globally"),
+                     NS_SEARCH_METADATA, NULL,
+                     NS_SEARCH_RATING, 0, -1);
   gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model));
   gtk_combo_box_entry_set_text_column (searchCB, NS_SEARCH_DESCRIPTION);
 

Modified: gnunet-gtk/src/plugins/fs/namespace_search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_search.c        2008-07-29 18:02:36 UTC 
(rev 7527)
+++ gnunet-gtk/src/plugins/fs/namespace_search.c        2008-07-30 11:14:07 UTC 
(rev 7528)
@@ -71,9 +71,11 @@
                           NS_SEARCH_DESCRIPTION, &description,
                           NS_SEARCH_NAME, &nsName,
                           NS_SEARCH_RATING, &rating, -1);
-      if ((description != NULL) && (0 == strcmp (description, "")))
+      if ((description != NULL) && 
+         ( (0 == strcmp (description, "")) ||
+           (0 == strcmp (description, _("globally")))))
         {
-          /* just to be sure */
+         gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
           gtk_widget_set_sensitive (spin, FALSE);
         }
       else
@@ -100,8 +102,6 @@
     }
   else
     {
-      /* FIXME: if GNUNET_enc_to_hash succeeds, we may want to keep this
-         active */
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
       gtk_widget_set_sensitive (spin, FALSE);
     }
@@ -150,7 +150,9 @@
                           NS_SEARCH_DESCRIPTION, &descStr,
                           NS_SEARCH_NAME, &nsName,
                           NS_SEARCH_RATING, &rating, -1);
-      if ((descStr != NULL) && (0 == strcmp (descStr, "")))
+      if ((descStr != NULL) && 
+         ( (0 == strcmp (descStr, "")) ||
+           (0 == strcmp (descStr, _("globally"))) ) )
         {
           gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
           gtk_widget_set_sensitive (spin, FALSE);
@@ -184,8 +186,6 @@
     }
   else
     {
-      /* FIXME: may still be namespace selected --
-        where user manually entered NS name! */
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
       gtk_widget_set_sensitive (spin, FALSE);
     }

Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c  2008-07-29 18:02:36 UTC (rev 7527)
+++ gnunet-gtk/src/plugins/fs/search.c  2008-07-30 11:14:07 UTC (rev 7528)
@@ -1119,7 +1119,9 @@
                           NS_SEARCH_DESCRIPTION, &descStr, NS_SEARCH_NAME,
                           &nsName, -1);
 
-      if ((descStr != NULL) && (0 == strcmp (descStr, "")))
+      if ((descStr != NULL) &&
+         ( (0 == strcmp (descStr, "")) ||
+           (0 == strcmp (descStr, _("globally")))))
         {
           nsName = NULL;
         }





reply via email to

[Prev in Thread] Current Thread [Next in Thread]