Revision: 4932 http://geany.svn.sourceforge.net/geany/?rev=4932&view=rev Author: statc Date: 2010-05-19 06:55:29 +0000 (Wed, 19 May 2010)
Log Message: ----------- Save configuration in main instance only.
Modified Paths: -------------- branches/sm/src/keyfile.c
Modified: branches/sm/src/keyfile.c =================================================================== --- branches/sm/src/keyfile.c 2010-05-19 06:55:07 UTC (rev 4931) +++ branches/sm/src/keyfile.c 2010-05-19 06:55:29 UTC (rev 4932) @@ -518,10 +518,16 @@
void configuration_save(void) { - GKeyFile *config = g_key_file_new(); - gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); + GKeyFile *config; + gchar *configfile; gchar *data;
+ if (cl_options.new_instance) + return; + + config = g_key_file_new(); + configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); + g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, NULL);
/* this signal can be used e.g. to prepare any settings before Stash code reads them below */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.