[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3756 - GNUnet/src/setup/gtk
From: |
grothoff |
Subject: |
[GNUnet-SVN] r3756 - GNUnet/src/setup/gtk |
Date: |
Mon, 13 Nov 2006 16:11:09 -0800 (PST) |
Author: grothoff
Date: 2006-11-13 16:11:07 -0800 (Mon, 13 Nov 2006)
New Revision: 3756
Modified:
GNUnet/src/setup/gtk/wizard_gtk.c
GNUnet/src/setup/gtk/wizard_gtk.h
Log:
fix
Modified: GNUnet/src/setup/gtk/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.c 2006-11-13 21:38:00 UTC (rev 3755)
+++ GNUnet/src/setup/gtk/wizard_gtk.c 2006-11-14 00:11:07 UTC (rev 3756)
@@ -19,7 +19,7 @@
*/
/**
- * @file conf/wizard_gtk.c
+ * @file setup/gtk/wizard_gtk.c
* @brief A easy-to-use configuration assistant
* @author Nils Durner
* @author Christian Grothoff
@@ -55,7 +55,7 @@
static struct GE_Context *err_ctx = NULL;
-static char *cfg_fn = NULL;
+static const char *cfg_fn = NULL;
/* 1 = terminate app on "assi_destroy" */
static int quit;
@@ -388,15 +388,12 @@
if (GC_write_configuration(editCfg, cfg_fn)) {
prefix = _("Unable to save configuration file `%s':");
- err = MALLOC(strlen(filename) + strlen(prefix) + 1);
- sprintf(err, prefix, filename);
+ err = MALLOC(strlen(cfg_fn) + strlen(prefix) + 1);
+ sprintf(err, prefix, cfg_fn);
showErr(err, STRERROR(errno));
FREE(err);
-
- FREE(filename);
return SYSERR;
}
- FREE(filename);
return OK;
}
@@ -592,13 +589,13 @@
}
int gtk_wizard_mainsetup_gtk(int argc,
- const char ** argv,
- struct PluginHandle * self,
- struct GE_Context * ectx,
- struct GC_Configuration * cfg,
- struct GNS_Context * gns,
- const char * filename,
- int is_daemon) {
+ char * const * argv,
+ struct PluginHandle * self,
+ struct GE_Context * ectx,
+ struct GC_Configuration * cfg,
+ struct GNS_Context * gns,
+ const char * filename,
+ int is_daemon) {
g_thread_init(NULL);
gtk_init(&argc, (char ***) &argv);
#ifdef ENABLE_NLS
Modified: GNUnet/src/setup/gtk/wizard_gtk.h
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.h 2006-11-13 21:38:00 UTC (rev 3755)
+++ GNUnet/src/setup/gtk/wizard_gtk.h 2006-11-14 00:11:07 UTC (rev 3756)
@@ -32,12 +32,12 @@
#include "wizard_util.h"
int gtk_wizard_mainsetup_gtk(int argc,
- const char ** argv,
- struct PluginHandle * self,
- struct GE_Context * ectx,
- struct GC_Configuration * cfg,
- struct GNS_Context * gns,
- const char * filename,
- int is_daemon);
+ char * const * argv,
+ struct PluginHandle * self,
+ struct GE_Context * ectx,
+ struct GC_Configuration * cfg,
+ struct GNS_Context * gns,
+ const char * filename,
+ int is_daemon);
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3756 - GNUnet/src/setup/gtk,
grothoff <=