[GNUnet-SVN] r26273 - gnunet-gtk/src/fs

[gnunet]

Author: LRN
Date: 2013-03-04 02:18:39 +0100 (Mon, 04 Mar 2013)
New Revision: 26273

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk.c
   gnunet-gtk/src/fs/gnunet-fs-gtk.conf.in
   gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
Log:
Use gnunet-fs-gtk config section for fs-gtk-specific values

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c   2013-03-03 13:44:26 UTC (rev 26272)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c   2013-03-04 01:18:39 UTC (rev 26273)
@@ -435,17 +435,17 @@
 
   /* setup main window */
   maximized = GNUNET_CONFIGURATION_get_value_yesno (main_context.cfg,
-                                                   "gnunet-gtk", 
"MAIN_WINDOW_MAXIMIZED");
+                                                   "gnunet-fs-gtk", 
"MAIN_WINDOW_MAXIMIZED");
   if (GNUNET_SYSERR == maximized)
     maximized = GNUNET_YES;
   if ( (GNUNET_NO == maximized) &&
-       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (main_context.cfg, 
"gnunet-gtk",
+       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (main_context.cfg, 
"gnunet-fs-gtk",
                                                            "MAIN_WINDOW_X", 
&window_x)) &&
-       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (main_context.cfg, 
"gnunet-gtk",
+       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (main_context.cfg, 
"gnunet-fs-gtk",
                                                            "MAIN_WINDOW_Y", 
&window_y)) &&
-       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (main_context.cfg, 
"gnunet-gtk",
+       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (main_context.cfg, 
"gnunet-fs-gtk",
                                                            
"MAIN_WINDOW_WIDTH", &window_width)) &&
-       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (main_context.cfg, 
"gnunet-gtk",
+       (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (main_context.cfg, 
"gnunet-fs-gtk",
                                                            
"MAIN_WINDOW_HEIGHT", &window_height)) )
   {
     gtk_window_move (GTK_WINDOW (main_context.main_window), window_x, 
window_y);

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.conf.in
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.conf.in     2013-03-03 13:44:26 UTC (rev 
26272)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.conf.in     2013-03-04 01:18:39 UTC (rev 
26273)
@@ -3,6 +3,9 @@
 MAX_PARALLEL_REQUESTS = 100000
 @ENABLE_ON_W32@ DEFAULT_DOWNLOAD_DIRECTORY = "~/Documents/Downloads"
 @ENABLE_ON_UNIX@ DEFAULT_DOWNLOAD_DIRECTORY = "~/Downloads"
+MAKE_UPDATEABLE_PUBLICATIONS_BY_DEFAULT = YES
+MAKE_NAMESPACE_PUBLICATIONS_BY_DEFAULT = NO
+MAKE_GLOBAL_PUBLICATIONS_BY_DEFAULT = YES
 
 [uri]
 fs = gnunet-fs-gtk

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c    2013-03-03 13:44:26 UTC 
(rev 26272)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c    2013-03-04 01:18:39 UTC 
(rev 26273)
@@ -2658,15 +2658,15 @@
   }
 
   updateable_enabled = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-      "gnunet-gtk", "MAKE_UPDATEABLE_PUBLICATIONS_BY_DEFAULT");
+      "gnunet-fs-gtk", "MAKE_UPDATEABLE_PUBLICATIONS_BY_DEFAULT");
   if (GNUNET_SYSERR)
     updateable_enabled = GNUNET_YES;
   own_enabled = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-      "gnunet-gtk", "MAKE_NAMESPACE_PUBLICATIONS_BY_DEFAULT");
+      "gnunet-fs-gtk", "MAKE_NAMESPACE_PUBLICATIONS_BY_DEFAULT");
   if (GNUNET_SYSERR)
     own_enabled = GNUNET_NO;
   global_enabled = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-      "gnunet-gtk", "MAKE_GLOBAL_PUBLICATIONS_BY_DEFAULT");
+      "gnunet-fs-gtk", "MAKE_GLOBAL_PUBLICATIONS_BY_DEFAULT");
   if (GNUNET_SYSERR)
     global_enabled = GNUNET_YES;