sync

3 files changed, 28 insertions, 15 deletions

diff --git a/configure.ac b/configure.ac
index d9b4001a..727b42a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other contributing authors)
+# (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
 #
 # GNUnet is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
@@ -20,8 +20,8 @@
 # Process this file with autoconf to produce a configure script.
 #
 AC_PREREQ(2.57)
-AC_INIT([gnunet-gtk],[0.7.0b],[bug-gnunet@gnu.org])
-AM_INIT_AUTOMAKE([gnunet-gtk], [0.7.0b])
+AC_INIT([gnunet-gtk],[0.7.0c],[bug-gnunet@gnu.org])
+AM_INIT_AUTOMAKE([gnunet-gtk], [0.7.0c])
 AM_CONFIG_HEADER(config.h)
 
 AH_TOP([#define _GNU_SOURCE  1])
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 98ce75f0..f0e97dc0 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -20,6 +20,7 @@
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <signal name="delete_event" handler="gnunet_gtk_main_quit" after="yes" last_modification_time="Tue, 23 Aug 2005 07:30:53 GMT"/>
 
   <child>
@@ -85,7 +86,7 @@
                           <child>
                             <widget class="GtkLabel" id="titleLabel">
                               <property name="visible">True</property>
-                              <property name="label" translatable="yes">&lt;span size=&quot;x-large&quot;&gt;Welcome to gnunet-gtk 0.7.0b&lt;/span&gt;</property>
+                              <property name="label" translatable="yes">&lt;span size=&quot;x-large&quot;&gt;Welcome to gnunet-gtk 0.7.0c&lt;/span&gt;</property>
                               <property name="use_underline">False</property>
                               <property name="use_markup">True</property>
                               <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -121,19 +122,13 @@
                                                                        
 gnunet-gtk is the GTK+ user interface for GNUnet. It is intended to eventually provide a universal, pluggable interface for all GNUnet services.
 
-This is an alpha release. Many features are not working and others are missing. The GNUnet homepage offers information about new versions of gnunet-gtk.
+This is a beta release. Some advanced features are not working and others are missing. The GNUnet homepage offers information about new versions of gnunet-gtk.
 
-&lt;span size=&quot;x-large&quot;&gt;Important changes (compared to gnunet-gtk 0.6.6):&lt;/span&gt;
+&lt;span size=&quot;x-large&quot;&gt;Important changes (compared to gnunet-gtk 0.7.0b):&lt;/span&gt;
 
-The redesign of the GNUnet core has also affected gnunet-gtk. The new codebase is based on glade, which should make it easier to customize and extend gnunet-gtk.
+This release fixes downloads of files from directories.  The previous version had some issues with where to copy the completed downloads.  Now all downloads (pending and completed) are stored in the directory specified in the configuration file (by default, that directory is ~/gnunet-downloads).
 
-The new codebase is mostly a collection of GTK+ signal handlers that trigger the appropriate actions on GNUnet's FSUI and ECRS libraries.
-
-The code is still far from complete, missing features include:
-* support for starting and stopping gnunetd
-* support for file sharing (insert, search, download, pseudonyms, namespaces, directories, collections)
-* support for statistics (raw, graphical)
-* support for chat
+Advanced file-sharing features (in particular interactive assembly of directories and namespaces) still need work in this version.  If you find any bugs, please report them to our bugtracking system at https://gnunet.org/mantis/.
 
 We hope that you will enjoy gnunet-gtk (especially once it is ready).
 
@@ -1991,6 +1986,8 @@ Thank you,
                   <child>
                     <widget class="GtkMenuBar" id="advanced_fs_menubar">
                       <property name="visible">True</property>
+                      <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+                      <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
 
                       <child>
                         <widget class="GtkImageMenuItem" id="createNamespace">
@@ -2847,6 +2844,7 @@ Thank you,
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">True</property>
   <accessibility>
     <atkproperty name="AtkObject::accessible_name" translatable="yes">Edit File Information</atkproperty>
@@ -3350,6 +3348,7 @@ Press ENTER to add the data.</atkproperty>
               <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
               <property name="local_only">True</property>
               <property name="show_hidden">False</property>
+              <property name="do_overwrite_confirmation">False</property>
               <property name="width_chars">-1</property>
               <signal name="selection_changed" handler="on_selectAlternativePreviewButton_selection_changed" object="previewImage" last_modification_time="Tue, 20 Dec 2005 04:15:38 GMT"/>
             </widget>
@@ -3386,6 +3385,7 @@ Press ENTER to add the data.</atkproperty>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -3501,6 +3501,7 @@ Press ENTER to add the data.</atkproperty>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
 
   <child>
     <widget class="GtkScrolledWindow" id="searchPageScrolledWindow">
@@ -3748,6 +3749,7 @@ Press ENTER to add the data.</atkproperty>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
 
   <child>
     <widget class="GtkVBox" id="vbox12">
@@ -3914,6 +3916,7 @@ Press ENTER to add the data.</atkproperty>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
 
   <child>
     <widget class="GtkHBox" id="hbox17">
@@ -4413,6 +4416,7 @@ POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
 </property>
+  <property name="wrap_license">False</property>
   <property name="website">http://www.gnu.org/software/gnunet/</property>
   <property name="website_label" translatable="yes">GNUnet Website</property>
   <property name="authors">Juergen Appel &lt;jappel@linux01.gwdg.de&gt;
@@ -4472,6 +4476,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
   <property name="local_only">False</property>
   <property name="select_multiple">False</property>
   <property name="show_hidden">False</property>
+  <property name="do_overwrite_confirmation">False</property>
   <property name="title" translatable="yes">Select file to upload to GNUnet</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -4485,6 +4490,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox3">
@@ -4552,6 +4558,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -5175,6 +5182,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_SPLASHSCREEN</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <signal name="delete_event" handler="on_statusWindow_delete_event" object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:11:54 GMT"/>
   <signal name="delete_event" handler="gtk_widget_hide" object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:12:30 GMT"/>
   <signal name="destroy" handler="gtk_widget_hide" object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:12:43 GMT"/>
@@ -5258,6 +5266,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -5838,6 +5847,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -6295,6 +6305,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -6873,6 +6884,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
   <property name="local_only">True</property>
   <property name="select_multiple">False</property>
   <property name="show_hidden">False</property>
+  <property name="do_overwrite_confirmation">False</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
@@ -6884,6 +6896,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox6">
diff --git a/po/Makefile.in b/po/Makefile.in
index f5b816a9..31357b8c 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -11,7 +11,7 @@
 # Origin: gettext-0.13
 
 PACKAGE = gnunet-gtk
-VERSION = 0.7.0b
+VERSION = 0.7.0c
 
 SHELL = /bin/sh