1 files changed, 75 insertions, 31 deletions

diff --git a/contrib/gnunet_fs_gtk_publish_dialog.glade b/contrib/gnunet_fs_gtk_publish_dialog.glade
index 495df952..89c10207 100644
--- a/contrib/gnunet_fs_gtk_publish_dialog.glade
+++ b/contrib/gnunet_fs_gtk_publish_dialog.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.20"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkTreeStore" id="GNUNET_GTK_file_sharing_publishing_tree_store">
     <columns>
@@ -22,26 +22,11 @@
       <column type="guint"/>
     </columns>
   </object>
-  <object class="GtkTreeStore" id="GNUNET_GTK_indentifiers_treestore">
-    <columns>
-      <!-- column-name Identifier -->
-      <column type="gchararray"/>
-      <!-- column-name UpdateIdentifier -->
-      <column type="gchararray"/>
-      <!-- column-name Description -->
-      <column type="gchararray"/>
-      <!-- column-name PathToOriginal -->
-      <column type="gchararray"/>
-      <!-- column-name IdentifierMarkedUp -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkWindow" id="GNUNET_GTK_master_publish_dialog">
     <property name="height_request">500</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Publish content on GNUnet</property>
     <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
     <signal name="delete-event" handler="GNUNET_GTK_master_publish_dialog_delete_event_cb" swapped="no"/>
     <child>
       <object class="GtkVBox" id="GNUNET_GTK_master_publish_dialog_vbox">
@@ -339,6 +324,30 @@
                             <child>
                               <placeholder/>
                             </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -415,16 +424,18 @@ Disabling this is equivalent to pressing the "Remove all Keywords" button before
                           <object class="GtkCheckButton" id="GNUNET_GTK_master_publish_dialog_own_checkbox">
                             <property name="label" translatable="yes">Publish in your own namespace</property>
                             <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">Sign the publication with your private key (pseudonym), and give it an identifier, under which it will be found in your namespace.
-Other users will be able to browse anything you publish in your namespace (if you maintain a root element), or get separate files from your namespace by their identifiers, and be assured that these files come from the same (anonymous) publisher.
+                            <property name="tooltip_text" translatable="yes">Sign the publication with one of your pseudonyms, and give it an identifier, under which it will be found in your namespace.
 
-Unless specifically disabled in the configuration file, global namespace publications will also advertise your namespace, if you enable both global and private namespace publication.
+Using a pseudonym that you also use in a different context (i.e. GNS), may allow an adversary to link you to this publication, even if you selected anonymous pubishing. 
+Thus, you must keep your pseudonyms for anonymous publishing separate from all other alter egos you may use within GNUnet.
 
-Despite all that, private namespace publications are just as anonymous as global namespace publications.
+Once other users discover your namespace, they will be able to get files from your namespace by their identifiers, and be assured that these files all come from the same publisher.
 
-Publishing in both global and private namespaces will not double storage requirements for published files.</property>
+Publishing in both global and private namespaces will not double storage requirements for published files.
+</property>
                             <property name="draw_indicator">True</property>
                             <signal name="toggled" handler="GNUNET_GTK_master_publish_dialog_own_checkbox_toggled_cb" swapped="no"/>
                           </object>
@@ -435,13 +446,16 @@ Publishing in both global and private namespaces will not double storage require
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="GNUNET_GTK_master_publish_dialog_own_label">
+                          <object class="GtkComboBox" id="GNUNET_GTK_master_publish_dialog_ego_combobox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label">&lt;filled with the name of selected default namespace&gt;</property>
+                            <property name="model">GNUNET_GTK_master_publish_dialog_ego_liststore</property>
+                            <property name="has_entry">True</property>
+                            <property name="entry_text_column">0</property>
+                            <signal name="changed" handler="GNUNET_GTK_master_publish_dialog_ego_combobox_changed_cb" swapped="no"/>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
@@ -465,6 +479,7 @@ Publishing in both global and private namespaces will not double storage require
                               <object class="GtkLabel" id="GNUNET_GTK_master_publish_dialog_identifier_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="tooltip_text" translatable="yes">Name under which the publication will appear in your namespace. Equivalent to the keyword that is used when publishing in the global namespace.</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Identifier:</property>
                               </object>
@@ -477,6 +492,7 @@ Publishing in both global and private namespaces will not double storage require
                             <child>
                               <object class="GtkEntry" id="GNUNET_GTK_master_publish_dialog_identifier_entry">
                                 <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="tooltip_text" translatable="yes">Identifier under which this publication will be found in your namespace.
 Publications made in your namespace use only these identifiers, one per publication, instead of keywords.
@@ -505,6 +521,7 @@ Type in an identifier, or select one of the update identifiers (from previous up
                           <object class="GtkExpander" id="GNUNET_GTK_master_publish_dialog_previous_identifiers_expander">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="tooltip_text" translatable="yes">Here you can find a list of previous publications you made in this namespace. This may be convenient if you want to publish an update.</property>
                             <child>
                               <placeholder/>
                             </child>
@@ -532,7 +549,7 @@ Type in an identifier, or select one of the update identifiers (from previous up
                               <object class="GtkTreeView" id="GNUNET_GTK_master_publish_dialog_previous_identifiers_treeview">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="model">GNUNET_GTK_indentifiers_treestore</property>
+                                <property name="model">GNUNET_GTK_update_identifiers_treestore</property>
                                 <property name="headers_clickable">False</property>
                                 <property name="expander_column">GNUNET_GTK_master_publish_dialog_previous_identifiers_treeview_id_column</property>
                                 <property name="enable_search">False</property>
@@ -590,9 +607,12 @@ Type in an identifier, or select one of the update identifiers (from previous up
                               <object class="GtkCheckButton" id="GNUNET_GTK_master_publish_dialog_updateable_checkbox">
                                 <property name="label" translatable="yes">Make publication updateable</property>
                                 <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">Enable and specify an update identifier to make this publication updateable.</property>
+                                <property name="tooltip_text" translatable="yes">With the update mechanism, you can publish updates to a file that will be automatically located when a users searches for the original identifier.
+
+To enable updates, you must check this box and specify an update identifier.</property>
                                 <property name="draw_indicator">True</property>
                                 <signal name="toggled" handler="GNUNET_GTK_master_publish_dialog_updateable_checkbox_toggled_cb" swapped="no"/>
                               </object>
@@ -620,6 +640,7 @@ Type in an identifier, or select one of the update identifiers (from previous up
                               <object class="GtkLabel" id="GNUNET_GTK_master_publish_dialog_update_id_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="tooltip_text" translatable="yes">Identifier under which you "promise" to publish an update to this publication at a later time.</property>
                                 <property name="label" translatable="yes">Update identifier:</property>
                               </object>
                               <packing>
@@ -631,6 +652,7 @@ Type in an identifier, or select one of the update identifiers (from previous up
                             <child>
                               <object class="GtkEntry" id="GNUNET_GTK_master_publish_dialog_update_id_entry">
                                 <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="tooltip_text" translatable="yes">Identifier under which the updated version will be published later.
 GNUnet clients will use it to try to find updated version of this publication automatically.
@@ -746,6 +768,33 @@ Note that meta data is unaffected when using this function.</property>
       </object>
     </child>
   </object>
+  <object class="GtkListStore" id="GNUNET_GTK_master_publish_dialog_ego_liststore">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name ego -->
+      <column type="gpointer"/>
+    </columns>
+  </object>
+  <object class="GtkTreeStore" id="GNUNET_GTK_update_identifiers_treestore">
+    <columns>
+      <!-- column-name Identifier -->
+      <column type="gchararray"/>
+      <!-- column-name UpdateIdentifier -->
+      <column type="gchararray"/>
+      <!-- column-name Description -->
+      <column type="gchararray"/>
+      <!-- column-name PathToOriginal -->
+      <column type="gchararray"/>
+      <!-- column-name IdentifierMarkedUp -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkImage" id="left_stock_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-go-back</property>
+  </object>
   <object class="GtkImage" id="new_stock_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -756,11 +805,6 @@ Note that meta data is unaffected when using this function.</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-go-forward</property>
   </object>
-  <object class="GtkImage" id="left_stock_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-go-back</property>
-  </object>
   <object class="GtkSizeGroup" id="GNUNET_GTK_master_publish_dialog_labels_sizegroup">
     <widgets>
       <widget name="GNUNET_GTK_master_publish_dialog_identifier_label"/>