[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19952 - gnunet-gtk/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19952 - gnunet-gtk/src/fs |
Date: |
Wed, 22 Feb 2012 19:43:44 +0100 |
Author: grothoff
Date: 2012-02-22 19:43:44 +0100 (Wed, 22 Feb 2012)
New Revision: 19952
Modified:
gnunet-gtk/src/fs/gnunet-fs-gtk.c
Log:
-save to correct configuration file (-c option), some code cleanup
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c 2012-02-22 18:37:01 UTC (rev 19951)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c 2012-02-22 18:43:44 UTC (rev 19952)
@@ -61,7 +61,7 @@
* @return configuration handle
*/
const struct GNUNET_CONFIGURATION_Handle *
-GNUNET_FS_GTK_get_configuration (void)
+GNUNET_FS_GTK_get_configuration ()
{
return GNUNET_GTK_main_loop_get_configuration (ml);
}
@@ -102,18 +102,16 @@
main_window_save_position (GtkWidget *main_window)
{
GdkWindow *main_window_gdk;
-
- gint window_x, window_y, window_width, window_height, maximized;
+ gint window_x;
+ gint window_y;
+ gint window_width;
+ gint window_height;
+ int maximized;
GdkWindowState window_state;
struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_CONFIGURATION_Handle *cfgDefault;
- cfgDefault = GNUNET_CONFIGURATION_create ();
- (void) GNUNET_CONFIGURATION_load (cfgDefault, NULL); /* load defaults only */
- /* FIXME: is it safe to discard const qualifier? */
- cfg = (struct GNUNET_CONFIGURATION_Handle *)
- GNUNET_GTK_main_loop_get_configuration (ml);
-
+ cfg = (struct GNUNET_CONFIGURATION_Handle *)
GNUNET_GTK_main_loop_get_configuration (ml);
main_window_gdk = gtk_widget_get_window (main_window);
maximized = GNUNET_YES;
if (NULL != main_window_gdk)
@@ -127,20 +125,25 @@
gtk_window_get_size (GTK_WINDOW (main_window), &window_width,
&window_height);
GNUNET_CONFIGURATION_set_value_number (cfg, "gnunet-gtk",
- "MAIN_WINDOW_X", window_x);
+ "MAIN_WINDOW_X", window_x);
GNUNET_CONFIGURATION_set_value_number (cfg, "gnunet-gtk",
- "MAIN_WINDOW_Y", window_y);
+ "MAIN_WINDOW_Y", window_y);
GNUNET_CONFIGURATION_set_value_number (cfg, "gnunet-gtk",
- "MAIN_WINDOW_WIDTH", window_width);
+ "MAIN_WINDOW_WIDTH", window_width);
GNUNET_CONFIGURATION_set_value_number (cfg, "gnunet-gtk",
- "MAIN_WINDOW_HEIGHT", window_height);
+ "MAIN_WINDOW_HEIGHT", window_height);
GNUNET_CONFIGURATION_set_value_string (cfg, "gnunet-gtk",
- "MAIN_WINDOW_MAXIMIZED", maximized == GNUNET_YES ? "YES" : "NO");
+ "MAIN_WINDOW_MAXIMIZED",
+ (maximized == GNUNET_YES) ? "YES" :
"NO");
- GNUNET_CONFIGURATION_write_diffs (cfgDefault, cfg, "~/.gnunet/gnunet.conf");
+ cfgDefault = GNUNET_CONFIGURATION_create ();
+ (void) GNUNET_CONFIGURATION_load (cfgDefault, NULL); /* load defaults only */
+ GNUNET_CONFIGURATION_write_diffs (cfgDefault, cfg,
+ GNUNET_GTK_main_loop_get_configuration_file
(ml));
GNUNET_CONFIGURATION_destroy (cfgDefault);
}
+
/**
* Task run on shutdown.
* FIXME-STYLE: does this need to be a separate task!?
@@ -208,33 +211,27 @@
cfg = GNUNET_GTK_main_loop_get_configuration (ml);
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
- "MAIN_WINDOW_X", &window_x))
- window_x = ULONG_MAX;
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
- "MAIN_WINDOW_Y", &window_y))
- window_y = ULONG_MAX;
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
- "MAIN_WINDOW_WIDTH", &window_width))
- window_width = ULONG_MAX;
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
- "MAIN_WINDOW_HEIGHT", &window_height))
- window_height = ULONG_MAX;
- if (GNUNET_SYSERR == (maximized = GNUNET_CONFIGURATION_get_value_yesno (cfg,
- "gnunet-gtk", "MAIN_WINDOW_MAXIMIZED")))
+ maximized = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ "gnunet-gtk",
"MAIN_WINDOW_MAXIMIZED");
+ if (GNUNET_SYSERR == maximized)
maximized = GNUNET_YES;
-
- if (window_x == ULONG_MAX || window_y == ULONG_MAX ||
- window_width == ULONG_MAX || window_height == ULONG_MAX ||
- maximized == GNUNET_YES)
+ if ( (GNUNET_NO == maximized) &&
+ (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
+ "MAIN_WINDOW_X",
&window_x)) &&
+ (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
+ "MAIN_WINDOW_Y",
&window_y)) &&
+ (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
+
"MAIN_WINDOW_WIDTH", &window_width)) &&
+ (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cfg, "gnunet-gtk",
+
"MAIN_WINDOW_HEIGHT", &window_height)) )
{
- /* If anything is wrong - play safe and show it maximized */
- gtk_window_maximize (GTK_WINDOW (main_window));
+ gtk_window_move (GTK_WINDOW (main_window), window_x, window_y);
+ gtk_window_resize (GTK_WINDOW (main_window), window_width, window_height);
}
else
{
- gtk_window_move (GTK_WINDOW (main_window), window_x, window_y);
- gtk_window_resize (GTK_WINDOW (main_window), window_width, window_height);
+ /* If anything is wrong - play safe and show it maximized */
+ gtk_window_maximize (GTK_WINDOW (main_window));
}
/* Allow multiple selection in metadata view; */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19952 - gnunet-gtk/src/fs,
gnunet <=