[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5757 - in gnunet-gtk: . libltdl src/common src/core src/in
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r5757 - in gnunet-gtk: . libltdl src/common src/core src/include src/plugins/about src/plugins/daemon src/plugins/fs src/plugins/fs/extensions src/plugins/peers src/plugins/stats |
|
Date: |
Sun, 25 Nov 2007 05:05:41 -0700 (MST) |
Author: grothoff
Date: 2007-11-25 05:05:41 -0700 (Sun, 25 Nov 2007)
New Revision: 5757
Modified:
gnunet-gtk/gnunet-gtk.glade
gnunet-gtk/libltdl/ltdl.c
gnunet-gtk/src/common/helper.c
gnunet-gtk/src/common/iterators.c
gnunet-gtk/src/common/logging.c
gnunet-gtk/src/core/eggtrayicon.c
gnunet-gtk/src/core/main.c
gnunet-gtk/src/include/gnunetgtk_common.h
gnunet-gtk/src/include/plibc.h
gnunet-gtk/src/plugins/about/about.c
gnunet-gtk/src/plugins/daemon/daemon.c
gnunet-gtk/src/plugins/fs/collection.c
gnunet-gtk/src/plugins/fs/content_tracking.c
gnunet-gtk/src/plugins/fs/content_tracking.h
gnunet-gtk/src/plugins/fs/directory.c
gnunet-gtk/src/plugins/fs/download.c
gnunet-gtk/src/plugins/fs/download.h
gnunet-gtk/src/plugins/fs/extensions/musicinsert.c
gnunet-gtk/src/plugins/fs/fs.c
gnunet-gtk/src/plugins/fs/fs.h
gnunet-gtk/src/plugins/fs/helper.h
gnunet-gtk/src/plugins/fs/meta.c
gnunet-gtk/src/plugins/fs/meta.h
gnunet-gtk/src/plugins/fs/namespace.c
gnunet-gtk/src/plugins/fs/namespace.h
gnunet-gtk/src/plugins/fs/namespace_create.c
gnunet-gtk/src/plugins/fs/namespace_search.c
gnunet-gtk/src/plugins/fs/namespace_search.h
gnunet-gtk/src/plugins/fs/search.c
gnunet-gtk/src/plugins/fs/search.h
gnunet-gtk/src/plugins/fs/upload.c
gnunet-gtk/src/plugins/fs/upload.h
gnunet-gtk/src/plugins/peers/peers.c
gnunet-gtk/src/plugins/stats/functions.c
gnunet-gtk/src/plugins/stats/functions.h
gnunet-gtk/src/plugins/stats/statistics.c
Log:
2nd round of renaming
Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/gnunet-gtk.glade 2007-11-25 12:05:41 UTC (rev 5757)
@@ -21,7 +21,7 @@
<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"/>
+ <signal name="delete_event" handler="GNUNET_GTK_main_quit" after="yes"
last_modification_time="Tue, 23 Aug 2005 07:30:53 GMT"/>
<signal name="window_state_event" handler="saveMainWindowState" after="yes"
last_modification_time="Tue, 30 May 2006 20:04:10 GMT"/>
<child>
Modified: gnunet-gtk/libltdl/ltdl.c
===================================================================
--- gnunet-gtk/libltdl/ltdl.c 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/libltdl/ltdl.c 2007-11-25 12:05:41 UTC (rev 5757)
@@ -1614,32 +1614,32 @@
*symbolName) = 0;
static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic) (NSModule module) = 0;
-#ifndef NSADDIMAGE_OPTION_NONE
-#define NSADDIMAGE_OPTION_NONE 0x0
+#ifndef NSADDIMAGNUNET_GEOPTION_NONE
+#define NSADDIMAGNUNET_GEOPTION_NONE 0x0
#endif
-#ifndef NSADDIMAGE_OPTION_RETURN_ON_ERROR
-#define NSADDIMAGE_OPTION_RETURN_ON_ERROR 0x1
+#ifndef NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR
+#define NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR 0x1
#endif
-#ifndef NSADDIMAGE_OPTION_WITH_SEARCHING
-#define NSADDIMAGE_OPTION_WITH_SEARCHING 0x2
+#ifndef NSADDIMAGNUNET_GEOPTION_WITH_SEARCHING
+#define NSADDIMAGNUNET_GEOPTION_WITH_SEARCHING 0x2
#endif
-#ifndef NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
-#define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED 0x4
+#ifndef NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED
+#define NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED 0x4
#endif
-#ifndef NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME
-#define NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8
+#ifndef NSADDIMAGNUNET_GEOPTION_MATCH_FILENAME_BY_INSTALLNAME
+#define NSADDIMAGNUNET_GEOPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8
#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND 0x0
+#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND
+#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND 0x0
#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW 0x1
+#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW
+#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW 0x1
#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY 0x2
+#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_FULLY
+#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_FULLY 0x2
#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR 0x4
+#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR
+#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR 0x4
#endif
@@ -1686,7 +1686,7 @@
{
/* NSAddImage is also used to get the loaded image, but it only works if the
lib
is installed, for uninstalled libs we need to check the install_names
against
- each other. Note that this is still broken if DYLD_IMAGE_SUFFIX is set and a
+ each other. Note that this is still broken if DYLD_IMAGNUNET_GESUFFIX is
set and a
different lib was loaded as a result
*/
int j;
@@ -1761,17 +1761,17 @@
ltdl_NSAddImage ((char *) (((struct dylib_command *) lc)->
dylib.name.offset +
(unsigned long) lc),
- NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED +
- NSADDIMAGE_OPTION_WITH_SEARCHING +
- NSADDIMAGE_OPTION_RETURN_ON_ERROR);
+
NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED +
+ NSADDIMAGNUNET_GEOPTION_WITH_SEARCHING +
+ NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR);
}
if (mh1)
{
retSym = ltdl_NSLookupSymbolInImage (mh1,
symbol,
-
NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
+
NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW
|
-
NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
+
NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR);
if (retSym)
break;
}
@@ -1838,7 +1838,7 @@
{
module =
(lt_module) ltdl_NSAddImage (filename,
- NSADDIMAGE_OPTION_RETURN_ON_ERROR);
+
NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR);
break;
}
default:
@@ -1927,9 +1927,9 @@
nssym =
ltdl_NSLookupSymbolInImage ((struct mach_header *) module,
symbol,
-
NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
+
NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW
|
-
NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
+
NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR);
}
}
Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/common/helper.c 2007-11-25 12:05:41 UTC (rev 5757)
@@ -82,14 +82,14 @@
static void *shutdown_function;
-static struct GE_Context *ectx;
+static struct GNUNET_GEContext *ectx;
-static struct GC_Configuration *cfg;
+static struct GNUNET_GC_Configuration *cfg;
static struct GNUNET_CronManager *cron;
struct GNUNET_CronManager *
-gnunet_gtk_get_cron ()
+GNUNET_GTK_get_cron_manager ()
{
return cron;
}
@@ -113,7 +113,7 @@
break;
}
}
- GE_ASSERT (NULL, i != pscCount);
+ GNUNET_GEASSERT (NULL, i != pscCount);
GNUNET_array_grow (psc, pscCount, pscCount - 1);
GNUNET_mutex_unlock (sclock);
}
@@ -129,7 +129,7 @@
* all GTK operations have to be done in the main thread
*/
void *
-gtkSaveCall (GNUNET_ThreadMainFunction func, void *args)
+GNUNET_GTK_save_call (GNUNET_ThreadMainFunction func, void *args)
{
SaveCall call;
@@ -161,7 +161,7 @@
* Simple accessor method.
*/
const char *
-getGladeFileName ()
+GNUNET_GTK_get_glade_filename ()
{
return gladeFile;
}
@@ -170,7 +170,7 @@
* Simple accessor method.
*/
GladeXML *
-getMainXML ()
+GNUNET_GTK_get_main_glade_XML ()
{
return mainXML;
}
@@ -204,8 +204,8 @@
if ((module == NULL) ||
(TRUE != g_module_symbol (module, handler_name, &method)))
{
- GE_LOG (ectx,
- GE_WARNING | GE_DEVELOPER | GE_IMMEDIATE,
+ GNUNET_GELOG (ectx,
+ GNUNET_GEWARNING | GNUNET_GEDEVELOPER | GNUNET_GEIMMEDIATE,
_("Failed to find handler for `%s'\n"), handler_name);
g_module_close (module);
return;
@@ -216,13 +216,13 @@
}
void
-connectGladeWithPlugins (GladeXML * xml)
+GNUNET_GTK_connect_glade_with_plugins (GladeXML * xml)
{
glade_xml_signal_autoconnect_full (xml, &connector, xml);
}
-typedef void (*InitCall) (struct GE_Context * ectx,
- struct GC_Configuration * cfg);
+typedef void (*InitCall) (struct GNUNET_GEContext * ectx,
+ struct GNUNET_GC_Configuration * cfg);
typedef void (*PlainCall) (void);
@@ -298,8 +298,8 @@
}
void
-initGNUnetGTKCommon (struct GE_Context *e,
- struct GC_Configuration *c, void *callback)
+GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *e,
+ struct GNUNET_GC_Configuration *c, void *callback)
{
char *load;
char *path;
@@ -328,24 +328,24 @@
#endif
GNUNET_free (filename);
- mainXML = glade_xml_new (gladeFile, "mainWindow", PACKAGE_NAME);
+ mainXML = glade_xml_new (gladeFile, "mainWindow", PACKAGNUNET_GENAME);
if (mainXML == NULL)
- GE_DIE_STRERROR_FILE (ectx,
- GE_FATAL | GE_USER | GE_IMMEDIATE,
+ GNUNET_GEDIE_STRERROR_FILE (ectx,
+ GNUNET_GEFATAL | GNUNET_GEUSER | GNUNET_GEIMMEDIATE,
"glade_xml_new", gladeFile);
/* load the plugins */
- GC_get_configuration_value_string (cfg,
+ GNUNET_GC_get_configuration_value_string (cfg,
"GNUNET-GTK",
"PLUGINS",
"about daemon fs stats", &load);
loadPlugins (load);
GNUNET_free (load);
- connectGladeWithPlugins (mainXML);
+ GNUNET_GTK_connect_glade_with_plugins (mainXML);
GNUNET_cron_start (cron);
}
void
-shutdownPlugins ()
+GNUNET_GTK_shutdown_plugins ()
{
int i;
@@ -371,7 +371,7 @@
i = pscCount;
GNUNET_mutex_unlock (sclock);
/* wait until all PSC-jobs have left
- the gtkSaveCall method before destroying
+ the GNUNET_GTK_save_call method before destroying
the mutex! */
while (i != 0)
{
@@ -383,7 +383,7 @@
}
void
-doneGNUnetGTKCommon ()
+GNUNET_GTK_shutdown_common_library ()
{
GNUNET_cron_destroy (cron);
GNUNET_thread_release_self (mainThread);
@@ -410,7 +410,7 @@
}
void *
-run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg)
+GNUNET_GTK_run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg)
{
struct GNUNET_ThreadHandle *doneThread;
void *retval;
@@ -422,7 +422,7 @@
cls.arg = arg;
doneThread = GNUNET_thread_create (&shutdownCode, &cls, 64 * 1024);
if (doneThread == NULL)
- GE_DIE_STRERROR (ectx, GE_FATAL | GE_ADMIN | GE_BULK, "pthread_create");
+ GNUNET_GEDIE_STRERROR (ectx, GNUNET_GEFATAL | GNUNET_GEADMIN |
GNUNET_GEBULK, "pthread_create");
if (!GNUNET_thread_test_self (mainThread))
{
/* another thread will run the save calls */
@@ -460,7 +460,7 @@
*
*/
void
-gnunetgtk_notify (int type, const char *message, ...)
+GNUNET_GTK_notify (int type, const char *message, ...)
{
#ifdef WITH_LIBNOTIFY
static int once;
@@ -479,19 +479,19 @@
if (!notify_init ("gnunet-gtk"))
{
once = 1;
- GE_LOG (ectx,
- GE_WARNING | GE_BULK | GE_USER | GE_ADMIN,
+ GNUNET_GELOG (ectx,
+ GNUNET_GEWARNING | GNUNET_GEBULK | GNUNET_GEUSER |
GNUNET_GEADMIN,
_("Could not initialize libnotify\n"));
return;
}
}
- root = glade_xml_get_widget (getMainXML (), "mainWindow");
+ root = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
if (gtk_window_is_active (GTK_WINDOW (root)) == FALSE)
{
- if (type == NOTIFY_LOW)
+ if (type == GNUNET_GTK_NOTIFY_LEVEL_LOW)
libnotify_urgency = NOTIFY_URGENCY_LOW;
- else if (type == NOTIFY_NORMAL)
+ else if (type == GNUNET_GTK_NOTIFY_LEVEL_NORMAL)
libnotify_urgency = NOTIFY_URGENCY_NORMAL;
else
libnotify_urgency = NOTIFY_URGENCY_CRITICAL;
@@ -504,7 +504,7 @@
va_end (arg);
libnotify = notify_notification_new ("gnunet-gtk",
msg,
- PACKAGE_DATA
+ PACKAGNUNET_GEDATA
"/gnunet-gtk/gnunet-gtk-notify.png",
NULL);
GNUNET_free (msg);
@@ -513,8 +513,8 @@
if (!notify_notification_show (libnotify, NULL))
{
once = 1;
- GE_LOG (ectx,
- GE_WARNING | GE_USER | GE_ADMIN | GE_BULK,
+ GNUNET_GELOG (ectx,
+ GNUNET_GEWARNING | GNUNET_GEUSER | GNUNET_GEADMIN |
GNUNET_GEBULK,
_("Could not send notification via libnotify\n"));
}
g_object_unref (G_OBJECT (libnotify));
@@ -529,7 +529,7 @@
* Utf-8 string is returned.
*/
char *
-validate_utf8 (char *msg)
+GNUNET_GTK_validate_utf8 (char *msg)
{
const gchar *end;
char *ret;
@@ -546,7 +546,7 @@
GNUNET_free (msg);
msg = GNUNET_strdup (ret);
g_free (ret);
- GE_BREAK (NULL, TRUE == g_utf8_validate (msg, -1, &end));
+ GNUNET_GEBREAK (NULL, TRUE == g_utf8_validate (msg, -1, &end));
return msg;
}
@@ -554,7 +554,7 @@
* Gtk callback to save the main window state (tray icon use)
*/
void
-saveMainWindowState (GtkWidget * main_window,
+GNUNET_GTK_save_main_window_state (GtkWidget * main_window,
GdkEventWindowState * event, gpointer user_data)
{
main_window_state = (*event).new_window_state;
@@ -565,7 +565,7 @@
* Get the last main window state when restoring (tray icon use)
*/
GdkWindowState
-getMainWindowState ()
+GNUNET_GTK_get_main_window_state ()
{
return main_window_state;
}
@@ -574,7 +574,7 @@
* Start gnunet-setup, asking for a password if needed
*/
gboolean
-startGNUnetSetup (gboolean run_wizard)
+GNUNET_GTK_run_gnunet_setup (gboolean run_wizard)
{
GtkWidget *mainWindow;
GtkWidget *messageDialog;
@@ -616,11 +616,11 @@
("GKSu support is not enabled, impossible to get the needed
rights. You should build gnunet-gtk with the --enable-libgksu2 option, or get
the right binary package. Note you can still start the configuration tool
(gnunet-setup) manually."));
code = TRUE;
#endif
- mainWindow = glade_xml_get_widget (getMainXML (), "mainWindow");
+ mainWindow = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"mainWindow");
messageDialog = gtk_message_dialog_new (GTK_WINDOW (mainWindow),
GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING,
+ GTK_MESSAGNUNET_GEWARNING,
GTK_BUTTONS_CLOSE,
_
("Failed to run the configuration
tool (gnunet-setup): %s"),
Modified: gnunet-gtk/src/common/iterators.c
===================================================================
--- gnunet-gtk/src/common/iterators.c 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/common/iterators.c 2007-11-25 12:05:41 UTC (rev 5757)
@@ -34,7 +34,7 @@
* during the iteration are tolerated.
*/
void
-ggc_tree_selection_selected_foreach (GtkTreeSelection * selection,
+GNUNET_GTK_tree_selection_selected_foreach (GtkTreeSelection * selection,
GtkTreeSelectionForeachFunc func,
gpointer data)
{
@@ -94,7 +94,7 @@
* during the iteration are tolerated.
*/
void
-ggc_tree_model_foreach (GtkTreeModel * model,
+GNUNET_GTK_tree_model_foreach (GtkTreeModel * model,
GtkTreeSelectionForeachFunc func, gpointer data)
{
int i;
Modified: gnunet-gtk/src/common/logging.c
===================================================================
--- gnunet-gtk/src/common/logging.c 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/common/logging.c 2007-11-25 12:05:41 UTC (rev 5757)
@@ -44,12 +44,12 @@
if (statusXML != NULL)
return;
statusXML
- = glade_xml_new (getGladeFileName (), "statusWindow", PACKAGE_NAME);
+ = glade_xml_new (GNUNET_GTK_get_glade_filename (), "statusWindow",
PACKAGNUNET_GENAME);
infoWindow = glade_xml_get_widget (statusXML, "statusWindow");
infoWindowTextView
= glade_xml_get_widget (statusXML, "messageWindowTextView");
button = glade_xml_get_widget (statusXML, "messageWindowCloseButton");
- connectGladeWithPlugins (statusXML);
+ GNUNET_GTK_connect_glade_with_plugins (statusXML);
g_signal_connect_data (infoWindow,
"delete-event",
@@ -76,7 +76,7 @@
#define MAX_LINES 1000
/**
- * Callback for infoMessage()
+ * Callback for GNUNET_GTK_show_info_message()
*/
static void *
doInfoMessage (void *args)
@@ -107,7 +107,7 @@
* @param doPopup do we open the window, GNUNET_YES or GNUNET_NO
*/
void
-infoMessage (int doPopup, const char *format, ...)
+GNUNET_GTK_show_info_message (int doPopup, const char *format, ...)
{
va_list args;
InfoMessage info;
@@ -116,7 +116,7 @@
info.note = g_strdup_vprintf (format, args);
va_end (args);
info.doPopup = doPopup;
- gtkSaveCall (&doInfoMessage, &info);
+ GNUNET_GTK_save_call (&doInfoMessage, &info);
g_free (info.note);
}
@@ -132,7 +132,7 @@
if (once)
{
once = 0;
- s = glade_xml_get_widget (getMainXML (), "statusbar");
+ s = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statusbar");
id = gtk_statusbar_get_context_id (GTK_STATUSBAR (s), "LOG");
}
else
@@ -152,7 +152,7 @@
*
*/
void
-addLogEntry (const char *txt, ...)
+GNUNET_GTK_add_log_entry (const char *txt, ...)
{
va_list args;
gchar *note;
@@ -160,29 +160,29 @@
va_start (args, txt);
note = g_strdup_vprintf (txt, args);
va_end (args);
- infoMessage (GNUNET_NO, note);
- gtkSaveCall (&saveAddLogEntry, (void *) note);
+ GNUNET_GTK_show_info_message (GNUNET_NO, note);
+ GNUNET_GTK_save_call (&saveAddLogEntry, (void *) note);
g_free (note);
}
static void
ge_gtk_log_handler (void *ctx,
- GE_KIND kind, const char *date, const char *msg)
+ GNUNET_GEKIND kind, const char *date, const char *msg)
{
int popUp;
popUp = GNUNET_NO;
- if ((kind & (GE_FATAL | GE_ERROR | GE_WARNING)) > 0)
+ if ((kind & (GNUNET_GEFATAL | GNUNET_GEERROR | GNUNET_GEWARNING)) > 0)
popUp = GNUNET_YES;
- infoMessage (popUp, "%s: %s", date, msg);
+ GNUNET_GTK_show_info_message (popUp, "%s: %s", date, msg);
}
-struct GE_Context *
-createGtkLogger (GE_KIND mask)
+struct GNUNET_GEContext *
+GNUNET_GTK_create_gtk_logger (GNUNET_GEKIND mask)
{
- struct GE_Context *myLog;
+ struct GNUNET_GEContext *myLog;
- myLog = GE_create_context_callback (mask,
+ myLog = GNUNET_GEcreate_context_callback (mask,
&ge_gtk_log_handler, NULL, NULL, NULL);
return myLog;
}
Modified: gnunet-gtk/src/core/eggtrayicon.c
===================================================================
--- gnunet-gtk/src/core/eggtrayicon.c 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/core/eggtrayicon.c 2007-11-25 12:05:41 UTC (rev 5757)
@@ -200,7 +200,7 @@
icon->stamp = 1;
icon->orientation = GTK_ORIENTATION_HORIZONTAL;
- gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
+ gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGNUNET_GEMASK);
}
static void
@@ -544,7 +544,7 @@
ev.window = (Window) gtk_plug_get_id (GTK_PLUG (icon));
ev.format = 8;
ev.message_type = XInternAtom (xdisplay,
- "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
+ "_NET_SYSTEM_TRAY_MESSAGNUNET_GEDATA",
False);
if (len > 20)
{
memcpy (&ev.data, message, 20);
@@ -592,7 +592,7 @@
static gboolean
on_tray_quit_activate (GtkWidget * widget, GdkEvent * event, gpointer data)
{
- gnunet_gtk_main_quit ();
+ GNUNET_GTK_main_quit ();
return TRUE;
}
@@ -607,13 +607,13 @@
if (event_button->button == 1)
{
GtkWidget *root;
- root = glade_xml_get_widget (getMainXML (), "mainWindow");
+ root = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"mainWindow");
GdkWindowState main_window_state;
if (gtk_window_is_active (GTK_WINDOW (root)))
gtk_widget_hide (root);
else
gtk_window_present (GTK_WINDOW (root));
- main_window_state = getMainWindowState ();
+ main_window_state = GNUNET_GTK_get_main_window_state ();
if (main_window_state & GDK_WINDOW_STATE_MAXIMIZED)
gtk_window_maximize (GTK_WINDOW (root));
return TRUE;
@@ -645,7 +645,7 @@
char *iconPath;
trayContextMenuXML =
- glade_xml_new (getGladeFileName (), "trayContextMenu", PACKAGE_NAME);
+ glade_xml_new (GNUNET_GTK_get_glade_filename (), "trayContextMenu",
PACKAGNUNET_GENAME);
trayContextMenu =
glade_xml_get_widget (trayContextMenuXML, "trayContextMenu");
tray_quit = glade_xml_get_widget (trayContextMenuXML, "tray_quit");
Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/core/main.c 2007-11-25 12:05:41 UTC (rev 5757)
@@ -34,7 +34,7 @@
static int debug_mode = GNUNET_NO;
#endif
-static char *cfgFilename = DEFAULT_CLIENT_CONFIG_FILE;
+static char *cfgFilename = GNUNET_DEFAULT_CLIENT_CONFIG_FILE;
/**
* All gnunet-gtk command line options
@@ -57,15 +57,15 @@
static void *
shutdownCode (void *unused)
{
- shutdownPlugins ();
+ GNUNET_GTK_shutdown_plugins ();
return NULL;
}
void
-gnunet_gtk_main_quit ()
+GNUNET_GTK_main_quit ()
{
- GE_setDefaultContext (NULL);
- run_with_save_calls (&shutdownCode, NULL);
+ GNUNET_GEsetDefaultContext (NULL);
+ GNUNET_GTK_run_with_save_calls (&shutdownCode, NULL);
gtk_main_quit ();
}
@@ -73,7 +73,7 @@
static void
customLog (const char *msg)
{
- addLogEntry ("%s", msg);
+ GNUNET_GTK_add_log_entry ("%s", msg);
}
#endif
@@ -82,11 +82,11 @@
{
GtkWidget *root;
int i;
- struct GE_Context *ectx;
- struct GE_Context *my_ctx;
- struct GC_Configuration *cfg;
+ struct GNUNET_GEContext *ectx;
+ struct GNUNET_GEContext *my_ctx;
+ struct GNUNET_GC_Configuration *cfg;
char *log;
- GE_KIND mask;
+ GNUNET_GEKIND mask;
#if ENABLE_NLS
char *path;
#endif
@@ -119,21 +119,21 @@
bind_textdomain_codeset ("GNUnet", "UTF-8");
bind_textdomain_codeset ("gnunet-gtk", "UTF-8");
#endif
- initGNUnetGTKCommon (ectx, cfg, &gnunet_gtk_main_quit);
+ GNUNET_GTK_initialize_common_library (ectx, cfg, &GNUNET_GTK_main_quit);
/* configure GTK logging */
- GC_get_configuration_value_string (cfg,
+ GNUNET_GC_get_configuration_value_string (cfg,
"LOGGING",
"USER-LEVEL", "WARNING", &log);
- mask = GE_getKIND (log);
+ mask = GNUNET_GEgetKIND (log);
GNUNET_free (log);
mask |= mask - 1; /* set all bits... */
- mask |= GE_USER | GE_BULK | GE_IMMEDIATE;
- if (GNUNET_YES == GC_get_configuration_value_yesno (cfg,
+ mask |= GNUNET_GEUSER | GNUNET_GEBULK | GNUNET_GEIMMEDIATE;
+ if (GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg,
"LOGGING", "DEVELOPER",
GNUNET_NO))
- mask |= GE_DEVELOPER | GE_REQUEST;
- my_ctx = createGtkLogger (mask);
- GE_setDefaultContext (my_ctx);
- root = glade_xml_get_widget (getMainXML (), "mainWindow");
+ mask |= GNUNET_GEDEVELOPER | GNUNET_GEREQUEST;
+ my_ctx = GNUNET_GTK_create_gtk_logger (mask);
+ GNUNET_GEsetDefaultContext (my_ctx);
+ root = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
gtk_window_maximize (GTK_WINDOW (root));
#ifndef WINDOWS
initTrayIcon ();
@@ -149,9 +149,9 @@
gtk_main ();
gdk_threads_leave ();
- GE_setDefaultContext (ectx);
- GE_free_context (my_ctx);
- doneGNUnetGTKCommon ();
+ GNUNET_GEsetDefaultContext (ectx);
+ GNUNET_GEfree_context (my_ctx);
+ GNUNET_GTK_shutdown_common_library ();
GNUNET_fini (ectx, cfg);
return 0;
}
Modified: gnunet-gtk/src/include/gnunetgtk_common.h
===================================================================
--- gnunet-gtk/src/include/gnunetgtk_common.h 2007-11-25 12:05:27 UTC (rev
5756)
+++ gnunet-gtk/src/include/gnunetgtk_common.h 2007-11-25 12:05:41 UTC (rev
5757)
@@ -24,8 +24,8 @@
* @author Christian Grothoff
*/
-#ifndef GTKUI_HELPER_H
-#define GTKUI_HELPER_H
+#ifndef GNUNET_GTK_COMMON_H
+#define GNUNET_GTK_COMMON_H
#include <gtk/gtk.h>
#include <gtk/gtktext.h>
@@ -34,38 +34,38 @@
#define DEBUG_GTK 0
#if DEBUG_GTK
-#define DEBUG_BEGIN() fprintf(stderr, "BEGIN of %s\n", __FUNCTION__)
-#define DEBUG_MARK() fprintf(stderr, "AT %s:%d\n", __FILE__, __LINE__)
-#define DEBUG_END() fprintf(stderr, "END of %s\n", __FUNCTION__)
+#define GNUNET_GTK_DEBUG_BEGIN() fprintf(stderr, "BEGIN of %s\n", __FUNCTION__)
+#define GNUNET_GTK_DEBUG_MARK() fprintf(stderr, "AT %s:%d\n", __FILE__,
__LINE__)
+#define GNUNET_GTK_DEBUG_END() fprintf(stderr, "END of %s\n", __FUNCTION__)
#else
-#define DEBUG_BEGIN()
-#define DEBUG_MARK()
-#define DEBUG_END()
+#define GNUNET_GTK_DEBUG_BEGIN()
+#define GNUNET_GTK_DEBUG_MARK()
+#define GNUNET_GTK_DEBUG_END()
#endif
-void initGNUnetGTKCommon (struct GE_Context *ectx,
- struct GC_Configuration *cfg, void *callback);
+void GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *ectx,
+ struct GNUNET_GC_Configuration *cfg, void *callback);
-void shutdownPlugins (void);
+void GNUNET_GTK_shutdown_plugins (void);
-void doneGNUnetGTKCommon (void);
+void GNUNET_GTK_shutdown_common_library (void);
/**
* Get the name of the main glade file for gnunet-gtk.
*/
-const char *getGladeFileName (void);
+const char *GNUNET_GTK_get_glade_filename (void);
/**
* Get the GladeXML for the main window of gnunet-gtk.
*/
-GladeXML *getMainXML (void);
+GladeXML *GNUNET_GTK_get_main_glade_XML (void);
/**
* Appends a message to the info window
* @param doPopup if GNUNET_YES, the info window will
* be opened
*/
-void infoMessage (int doPopup, const char *format, ...);
+void GNUNET_GTK_show_info_message (int doPopup, const char *format, ...);
/**
* Appends a log entry to the info window
@@ -74,16 +74,25 @@
*
* @param txt the log entry
*/
-void addLogEntry (const char *txt, ...);
+void GNUNET_GTK_add_log_entry (const char *txt, ...);
-struct GE_Context *createGtkLogger (GE_KIND mask);
+struct GNUNET_GEContext *GNUNET_GTK_create_gtk_logger (GNUNET_GEKIND mask);
+#define GNUNET_GTK_NOTIFY_LEVEL_LOW 0
+#define GNUNET_GTK_NOTIFY_LEVEL_NORMAL 1
+#define GNUNET_GTK_NOTIFY_LEVEL_CRITICAL 2
+
/**
+ * Sends a message to libnotify
+ */
+void GNUNET_GTK_notify (int type, const char *message, ...);
+
+/**
* Call a callback function from the mainloop/main thread ("SaveCall").
* Since GTK doesn't work with multi-threaded applications under Windows,
* all GTK operations have to be done in the main thread
*/
-void *gtkSaveCall (GNUNET_ThreadMainFunction func, void *arg);
+void *GNUNET_GTK_save_call (GNUNET_ThreadMainFunction func, void *arg);
/**
* Run the given "cb" function and save calls
@@ -91,57 +100,48 @@
* keep save calls going while something else
* happens).
*/
-void *run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg);
+void *GNUNET_GTK_run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg);
/**
* Bind handlers defined by the various
* plugins to the signals defined by the
* Glade XML.
*/
-void connectGladeWithPlugins (GladeXML * xml);
+void GNUNET_GTK_connect_glade_with_plugins (GladeXML * xml);
-#define NOTIFY_LOW 0
-#define NOTIFY_NORMAL 1
-#define NOTIFY_CRITICAL 2
-
/**
- * Sends a message to libnotify
- */
-void gnunetgtk_notify (int type, const char *message, ...);
-
-/**
* Validate that a string is a Utf-8 string.
* If validation fails, msg is freed and a valid
* Utf-8 string is returned.
*/
-char *validate_utf8 (char *msg);
+char *GNUNET_GTK_validate_utf8 (char *msg);
/**
* Gtk callback to save the main window state (tray icon use)
*/
-void saveMainWindowState (GtkWidget * main_window,
+void GNUNET_GTK_save_main_window_state (GtkWidget * main_window,
GdkEventWindowState * event, gpointer user_data);
/**
* Get the last main window state when restoring (tray icon use)
*/
-GdkWindowState getMainWindowState (void);
+GdkWindowState GNUNET_GTK_get_main_window_state (void);
-void gnunet_gtk_main_quit (void);
+void GNUNET_GTK_main_quit (void);
/**
* Start gnunet-setup, asking for a password if needed
* @param run_wizard TRUE to run the wizard, FALSE to run the complete tool
* @returns FALSE if gnunet-setup was run, TRUE else
*/
-gboolean startGNUnetSetup (gboolean run_wizard);
+gboolean GNUNET_GTK_run_gnunet_setup (gboolean run_wizard);
/**
* Identical to "gtk_tree_selection_selected_foreach",
* except that modifications of the underlying model
* during the iteration are tolerated.
*/
-void ggc_tree_selection_selected_foreach (GtkTreeSelection * selection,
+void GNUNET_GTK_tree_selection_selected_foreach (GtkTreeSelection * selection,
GtkTreeSelectionForeachFunc func,
gpointer data);
@@ -150,10 +150,10 @@
* except that modifications of the underlying model
* during the iteration are tolerated.
*/
-void ggc_tree_model_foreach (GtkTreeModel * model,
+void GNUNET_GTK_tree_model_foreach (GtkTreeModel * model,
GtkTreeSelectionForeachFunc func, gpointer data);
-struct GNUNET_CronManager *gnunet_gtk_get_cron (void);
+struct GNUNET_CronManager *GNUNET_GTK_get_cron_manager (void);
#endif
Modified: gnunet-gtk/src/include/plibc.h
===================================================================
--- gnunet-gtk/src/include/plibc.h 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/include/plibc.h 2007-11-25 12:05:41 UTC (rev 5757)
@@ -58,7 +58,7 @@
/* Conflicts with our definitions */
#define __G_WIN32_H__
-/* Convert LARGE_INTEGER to double */
+/* Convert LARGNUNET_GEINTEGER to double */
#define Li2Double(x) ((double)((x).HighPart) * 4.294967296E9 + \
(double)((x).LowPart))
@@ -241,10 +241,10 @@
typedef struct
{
- LARGE_INTEGER IdleTime;
- LARGE_INTEGER KernelTime;
- LARGE_INTEGER UserTime;
- LARGE_INTEGER Reserved1[2];
+ LARGNUNET_GEINTEGER IdleTime;
+ LARGNUNET_GEINTEGER KernelTime;
+ LARGNUNET_GEINTEGER UserTime;
+ LARGNUNET_GEINTEGER Reserved1[2];
ULONG Reserved2;
} SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION;
Modified: gnunet-gtk/src/plugins/about/about.c
===================================================================
--- gnunet-gtk/src/plugins/about/about.c 2007-11-25 12:05:27 UTC (rev
5756)
+++ gnunet-gtk/src/plugins/about/about.c 2007-11-25 12:05:41 UTC (rev
5757)
@@ -38,7 +38,7 @@
GtkWidget *ad;
GladeXML *axml;
- axml = glade_xml_new (getGladeFileName (), "aboutDialog", PACKAGE_NAME);
+ axml = glade_xml_new (GNUNET_GTK_get_glade_filename (), "aboutDialog",
PACKAGNUNET_GENAME);
ad = glade_xml_get_widget (axml, "aboutDialog");
gtk_dialog_run (GTK_DIALOG (ad));
gtk_widget_destroy (ad);
@@ -50,7 +50,7 @@
{
GtkWidget *tab;
- tab = glade_xml_get_widget (getMainXML (), "aboutButton");
+ tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "aboutButton");
gtk_widget_show (tab);
}
Modified: gnunet-gtk/src/plugins/daemon/daemon.c
===================================================================
--- gnunet-gtk/src/plugins/daemon/daemon.c 2007-11-25 12:05:27 UTC (rev
5756)
+++ gnunet-gtk/src/plugins/daemon/daemon.c 2007-11-25 12:05:41 UTC (rev
5757)
@@ -33,9 +33,9 @@
static struct GNUNET_CronManager *cron;
-static struct GE_Context *ectx;
+static struct GNUNET_GEContext *ectx;
-static struct GC_Configuration *cfg;
+static struct GNUNET_GC_Configuration *cfg;
/**
* cron job that periodically updates the model for the
@@ -91,7 +91,7 @@
while (next != NULL);
GNUNET_free (apps);
}
- w = glade_xml_get_widget (getMainXML (), "applicationList");
+ w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"applicationList");
gtk_tree_view_set_model (GTK_TREE_VIEW (w), GTK_TREE_MODEL (model));
gtk_tree_selection_set_mode (gtk_tree_view_get_selection
(GTK_TREE_VIEW (w)), GTK_SELECTION_NONE);
@@ -103,7 +103,7 @@
static void
updateAppModel (void *dummy)
{
- gtkSaveCall (&updateAppModelSafe, NULL);
+ GNUNET_GTK_save_call (&updateAppModelSafe, NULL);
}
@@ -121,7 +121,7 @@
static int isLocal;
char *host;
int canStart;
- struct GC_Configuration *dcfg;
+ struct GNUNET_GC_Configuration *dcfg;
char *fn;
char *user;
struct passwd *pws;
@@ -129,16 +129,16 @@
if (once)
{
once = 0;
- killEntry = glade_xml_get_widget (getMainXML (), "stopDaemon");
- launchEntry = glade_xml_get_widget (getMainXML (), "startDaemon");
- statsEntryYes = glade_xml_get_widget (getMainXML (), "statusPixmapYes");
- statsEntryNo = glade_xml_get_widget (getMainXML (), "statusPixmapNo");
+ killEntry = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"stopDaemon");
+ launchEntry = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"startDaemon");
+ statsEntryYes = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"statusPixmapYes");
+ statsEntryNo = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"statusPixmapNo");
statsEntryError
- = glade_xml_get_widget (getMainXML (), "statusPixmapError");
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"statusPixmapError");
chooser
- = glade_xml_get_widget (getMainXML (),
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"gnunetdconfigFileChooserButton");
- GC_get_configuration_value_string (cfg,
+ GNUNET_GC_get_configuration_value_string (cfg,
"NETWORK",
"HOST", "localhost", &host);
if (strcmp (host, "localhost") == 0)
@@ -157,12 +157,12 @@
{
if (GNUNET_disk_file_test (ectx, fn) == GNUNET_YES)
{
- dcfg = GC_create ();
+ dcfg = GNUNET_GC_create ();
canStart = 1;
- if (0 != GC_parse_configuration (dcfg, fn))
+ if (0 != GNUNET_GC_parse_configuration (dcfg, fn))
canStart = 0;
user = NULL;
- GC_get_configuration_value_string (dcfg,
+ GNUNET_GC_get_configuration_value_string (dcfg,
"GNUNETD",
"USER", "", &user);
if (strlen (user) > 0)
@@ -184,7 +184,7 @@
#endif
}
GNUNET_free (user);
- GC_free (dcfg);
+ GNUNET_GC_free (dcfg);
}
g_free (fn);
}
@@ -223,7 +223,7 @@
ret = 1;
else
ret = 0;
- gtkSaveCall (&doUpdateMenus, &ret);
+ GNUNET_GTK_save_call (&doUpdateMenus, &ret);
}
@@ -237,7 +237,7 @@
GtkWidget *chooser;
char *fn;
- launchEntry = glade_xml_get_widget (getMainXML (), "startDaemon");
+ launchEntry = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"startDaemon");
gtk_widget_set_sensitive (launchEntry, FALSE);
if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
{
@@ -246,19 +246,19 @@
}
else
{
- addLogEntry (_("Launching gnunetd..."));
+ GNUNET_GTK_add_log_entry (_("Launching gnunetd..."));
chooser
- = glade_xml_get_widget (getMainXML (),
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"gnunetdconfigFileChooserButton");
fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
- GE_BREAK (ectx, fn != NULL);
+ GNUNET_GEBREAK (ectx, fn != NULL);
if (GNUNET_SYSERR != GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES))
{
- addLogEntry (_("Launched gnunetd"));
+ GNUNET_GTK_add_log_entry (_("Launched gnunetd"));
}
else
{
- addLogEntry (_("Launching gnunetd failed"));
+ GNUNET_GTK_add_log_entry (_("Launching gnunetd failed"));
}
if (fn != NULL)
g_free (fn);
@@ -274,7 +274,7 @@
GtkWidget *killEntry = NULL;
struct GNUNET_ClientServerConnection *sock;
- killEntry = glade_xml_get_widget (getMainXML (), "stopDaemon");
+ killEntry = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"stopDaemon");
gtk_widget_set_sensitive (killEntry, FALSE);
if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
@@ -287,14 +287,14 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGE_ERROR,
+ GTK_MESSAGNUNET_GEERROR,
GTK_BUTTONS_CLOSE, _("Error requesting shutdown of gnunetd."));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
else
{
- addLogEntry (_("Terminating gnunetd..."));
+ GNUNET_GTK_add_log_entry (_("Terminating gnunetd..."));
}
GNUNET_client_connection_destroy (sock);
}
@@ -302,7 +302,7 @@
}
void
-init_daemon (struct GE_Context *e, struct GC_Configuration *c)
+init_daemon (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
{
GtkWidget *tab;
GtkWidget *apps;
@@ -313,7 +313,7 @@
ectx = e;
cfg = c;
- apps = glade_xml_get_widget (getMainXML (), "applicationList");
+ apps = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"applicationList");
model = gtk_list_store_new (1, G_TYPE_STRING);
gtk_tree_view_set_model (GTK_TREE_VIEW (apps), GTK_TREE_MODEL (model));
renderer = gtk_cell_renderer_text_new ();
@@ -333,31 +333,31 @@
gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
(GTK_TREE_VIEW (apps), col - 1), TRUE);
- tab = glade_xml_get_widget (getMainXML (), "daemonScrolledWindow");
+ tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"daemonScrolledWindow");
gtk_widget_show (tab);
daemon_config = NULL;
- GC_get_configuration_value_filename (cfg,
+ GNUNET_GC_get_configuration_value_filename (cfg,
"DAEMON",
"CONFIGFILE",
- DEFAULT_DAEMON_CONFIG_FILE,
+ GNUNET_DEFAULT_DAEMON_CONFIG_FILE,
&daemon_config);
if (GNUNET_YES == GNUNET_disk_file_test (NULL, daemon_config))
{
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER
(glade_xml_get_widget
- (getMainXML (),
+ (GNUNET_GTK_get_main_glade_XML (),
"gnunetdconfigFileChooserButton")),
daemon_config);
}
else
{
- addLogEntry (_
+ GNUNET_GTK_add_log_entry (_
("Configuration file for GNUnet daemon `%s' does not exist!
Run `gnunet-setup -d'."),
daemon_config);
}
GNUNET_free (daemon_config);
- cron = gnunet_gtk_get_cron ();
+ cron = GNUNET_GTK_get_cron_manager ();
GNUNET_cron_add_job (cron, &cronCheckDaemon, 0, 15 * GNUNET_CRON_SECONDS,
NULL);
GNUNET_cron_add_job (cron,
&updateAppModel, 5 * GNUNET_CRON_MINUTES, 5 *
GNUNET_CRON_MINUTES, NULL);
@@ -370,7 +370,7 @@
GNUNET_cron_del_job (cron, &cronCheckDaemon, 15 * GNUNET_CRON_SECONDS, NULL);
GNUNET_cron_del_job (cron, &updateAppModel, 5 * GNUNET_CRON_MINUTES, NULL);
- w = glade_xml_get_widget (getMainXML (), "applicationList");
+ w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"applicationList");
gtk_tree_view_set_model (GTK_TREE_VIEW (w), NULL);
}
@@ -381,7 +381,7 @@
void
on_startDaemonConfWizard_clicked_daemon (GtkWidget * widget, gpointer data)
{
- startGNUnetSetup (TRUE);
+ GNUNET_GTK_run_gnunet_setup (TRUE);
}
/**
@@ -390,7 +390,7 @@
void
on_startDaemonConfTool_clicked_daemon (GtkWidget * widget, gpointer data)
{
- startGNUnetSetup (FALSE);
+ GNUNET_GTK_run_gnunet_setup (FALSE);
}
/* end of daemon.c */
Modified: gnunet-gtk/src/plugins/fs/collection.c
===================================================================
--- gnunet-gtk/src/plugins/fs/collection.c 2007-11-25 12:05:27 UTC (rev
5756)
+++ gnunet-gtk/src/plugins/fs/collection.c 2007-11-25 12:05:41 UTC (rev
5757)
@@ -55,14 +55,14 @@
GtkWidget *nameLine;
GtkWidget *dialog;
GtkWidget *spin;
- struct ECRS_MetaData *meta;
- struct ECRS_URI *root;
+ struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_ECRS_URI *root;
GNUNET_Int32Time updateInterval;
metaXML
- = glade_xml_new (getGladeFileName (),
- "createCollectionDialog", PACKAGE_NAME);
- connectGladeWithPlugins (metaXML);
+ = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+ "createCollectionDialog", PACKAGNUNET_GENAME);
+ GNUNET_GTK_connect_glade_with_plugins (metaXML);
dialog = glade_xml_get_widget (metaXML, "createCollectionDialog");
createMetaDataListTreeView (metaXML,
"collectionMetaDataTreeView", NULL, NULL);
@@ -74,9 +74,9 @@
= getEntryLineValue (metaXML,
"collectionUpdateIntervalComboBoxEntry");
if (0 == strcmp (_("--sporadic update--"), updateIntervalString))
- updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC;
+ updateInterval = GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC;
else if (0 == strcmp (_("--no update--"), updateIntervalString))
- updateInterval = ECRS_SBLOCK_UPDATE_NONE;
+ updateInterval = GNUNET_ECRS_SBLOCK_UPDATE_NONE;
else if (GNUNET_OK != parseTime (updateIntervalString, &updateInterval))
{
gtk_widget_destroy (dialog);
@@ -85,7 +85,7 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGE_ERROR,
+ GTK_MESSAGNUNET_GEERROR,
GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -97,12 +97,12 @@
nameLine = glade_xml_get_widget (metaXML, "collectionIdentifierEntry");
collectionName = gtk_entry_get_text (GTK_ENTRY (nameLine));
root = NULL;
- if (GNUNET_OK == CO_startCollection (gtk_spin_button_get_value_as_int
(GTK_SPIN_BUTTON (spin)), 1000, /* priority */
+ if (GNUNET_OK == GNUNET_CO_collection_start
(gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)), 1000, /*
priority */
updateInterval, collectionName, meta))
{
- w = glade_xml_get_widget (getMainXML (), "createCollection");
+ w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"createCollection");
gtk_widget_set_sensitive (w, FALSE);
- w = glade_xml_get_widget (getMainXML (), "deleteCollection");
+ w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"deleteCollection");
gtk_widget_set_sensitive (w, TRUE);
}
else
@@ -112,14 +112,14 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGE_ERROR,
+ GTK_MESSAGNUNET_GEERROR,
GTK_BUTTONS_CLOSE,
_("Failed to start collection `%s' (consult logs)."),
collectionName);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
- ECRS_freeMetaData (meta);
+ GNUNET_ECRS_meta_data_destroy (meta);
}
gtk_widget_destroy (dialog);
UNREF (metaXML);
@@ -131,17 +131,17 @@
{
GtkWidget *w;
- if (GNUNET_OK == CO_stopCollection ())
+ if (GNUNET_OK == GNUNET_CO_collection_stop ())
{
- w = glade_xml_get_widget (getMainXML (), "createCollection");
+ w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"createCollection");
gtk_widget_set_sensitive (w, TRUE);
- w = glade_xml_get_widget (getMainXML (), "deleteCollection");
+ w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"deleteCollection");
gtk_widget_set_sensitive (w, FALSE);
- infoMessage (GNUNET_NO, _("Collection stopped.\n"));
+ GNUNET_GTK_show_info_message (GNUNET_NO, _("Collection stopped.\n"));
}
else
{
- infoMessage (GNUNET_YES, _("Failed to stop collection (consult
logs).\n"));
+ GNUNET_GTK_show_info_message (GNUNET_YES, _("Failed to stop collection
(consult logs).\n"));
}
}
@@ -151,14 +151,14 @@
GtkWidget *w;
char *h;
- h = CO_getCollection ();
+ h = GNUNET_CO_collection_get_name ();
if (NULL != h)
{
- w = glade_xml_get_widget (getMainXML (), "createCollection");
+ w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"createCollection");
GNUNET_free (h);
}
else
- w = glade_xml_get_widget (getMainXML (), "deleteCollection");
+ w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"deleteCollection");
gtk_widget_set_sensitive (w, FALSE);
}
Modified: gnunet-gtk/src/plugins/fs/content_tracking.c
===================================================================
--- gnunet-gtk/src/plugins/fs/content_tracking.c 2007-11-25 12:05:27 UTC
(rev 5756)
+++ gnunet-gtk/src/plugins/fs/content_tracking.c 2007-11-25 12:05:41 UTC
(rev 5757)
@@ -41,8 +41,8 @@
clearContentList (void *mdl)
{
GtkTreeModel *model = GTK_TREE_MODEL (mdl);
- struct ECRS_URI *uri;
- struct ECRS_MetaData *meta;
+ struct GNUNET_ECRS_URI *uri;
+ struct GNUNET_ECRS_MetaData *meta;
GtkTreeIter iter;
DEBUG_BEGIN ();
@@ -53,8 +53,8 @@
gtk_tree_model_get (model,
&iter,
NAMESPACE_URI, &uri, NAMESPACE_META, &meta, -1);
- ECRS_freeUri (uri);
- ECRS_freeMetaData (meta);
+ GNUNET_ECRS_uri_destroy (uri);
+ GNUNET_ECRS_meta_data_destroy (meta);
gtk_list_store_set (GTK_LIST_STORE (model),
&iter,
NAMESPACE_URI, NULL, NAMESPACE_META, NULL, -1);
@@ -74,10 +74,10 @@
GtkTreeModel *model;
DEBUG_BEGIN ();
- contentList = glade_xml_get_widget (getMainXML (), "availableContentList");
+ contentList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"availableContentList");
model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList));
- URITRACK_clearTrackedURIS (ectx, cfg);
- gtkSaveCall (&clearContentList, model);
+ GNUNET_URITRACK_clear (ectx, cfg);
+ GNUNET_GTK_save_call (&clearContentList, model);
DEBUG_END ();
}
@@ -87,8 +87,8 @@
GtkWidget *trackCheckButton;
trackCheckButton
- = glade_xml_get_widget (getMainXML (), "trackingCheckButton");
- URITRACK_trackURIS (ectx,
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"trackingCheckButton");
+ GNUNET_URITRACK_toggle_tracking (ectx,
cfg,
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(trackCheckButton)) ==
@@ -105,7 +105,7 @@
static void *
updateView (void *cls)
{
- const ECRS_FileInfo *fi = cls;
+ const GNUNET_ECRS_FileInfo *fi = cls;
GtkTreeIter iter;
char *filename;
char *uriString;
@@ -114,9 +114,9 @@
GtkWidget *contentList;
GtkTreeModel *model;
- contentList = glade_xml_get_widget (getMainXML (), "availableContentList");
+ contentList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"availableContentList");
model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList));
- filename = ECRS_getFirstFromMetaData (fi->meta,
+ filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
EXTRACTOR_FILENAME,
EXTRACTOR_TITLE,
EXTRACTOR_DESCRIPTION,
@@ -137,14 +137,14 @@
while (NULL != (dotdot = strstr (filename, "..")))
dotdot[0] = dotdot[1] = '_';
- filename = validate_utf8 (filename);
+ filename = GNUNET_GTK_validate_utf8 (filename);
}
- if (ECRS_isFileUri (fi->uri))
- size = ECRS_fileSize (fi->uri);
+ if (GNUNET_ECRS_uri_test_chk (fi->uri))
+ size = GNUNET_ECRS_uri_get_file_siz (fi->uri);
else
size = 0;
- uriString = ECRS_uriToString (fi->uri);
+ uriString = GNUNET_ECRS_uri_to_string (fi->uri);
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
size_h = GNUNET_get_byte_size_as_fancy_string (size);
gtk_list_store_set (GTK_LIST_STORE (model),
@@ -153,8 +153,8 @@
NAMESPACE_SIZE, size,
NAMESPACE_HSIZE, size_h,
NAMESPACE_URISTRING, uriString,
- NAMESPACE_URI, ECRS_dupUri (fi->uri),
- NAMESPACE_META, ECRS_dupMetaData (fi->meta), -1);
+ NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri),
+ NAMESPACE_META, GNUNET_ECRS_meta_data_duplicate
(fi->meta), -1);
GNUNET_free (size_h);
GNUNET_free (filename);
GNUNET_free (uriString);
@@ -167,9 +167,9 @@
* present!
*/
int
-updateViewSave (const ECRS_FileInfo * fi,
+updateViewSave (const GNUNET_ECRS_FileInfo * fi,
const GNUNET_HashCode * key, int isRoot, void *closure)
{
- gtkSaveCall (&updateView, (void *) fi);
+ GNUNET_GTK_save_call (&updateView, (void *) fi);
return GNUNET_OK;
}
Modified: gnunet-gtk/src/plugins/fs/content_tracking.h
===================================================================
--- gnunet-gtk/src/plugins/fs/content_tracking.h 2007-11-25 12:05:27 UTC
(rev 5756)
+++ gnunet-gtk/src/plugins/fs/content_tracking.h 2007-11-25 12:05:41 UTC
(rev 5757)
@@ -34,7 +34,7 @@
* content model. Check that it is not already
* present!
*/
-int updateViewSave (const ECRS_FileInfo * fi,
+int updateViewSave (const GNUNET_ECRS_FileInfo * fi,
const GNUNET_HashCode * key, int isRoot, void *closure);
#endif
Modified: gnunet-gtk/src/plugins/fs/directory.c
===================================================================
--- gnunet-gtk/src/plugins/fs/directory.c 2007-11-25 12:05:27 UTC (rev
5756)
+++ gnunet-gtk/src/plugins/fs/directory.c 2007-11-25 12:05:41 UTC (rev
5757)
@@ -44,9 +44,9 @@
char *ret;
uploadXML
- = glade_xml_new (getGladeFileName (),
- "openDirectoryFileDialog", PACKAGE_NAME);
- connectGladeWithPlugins (uploadXML);
+ = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+ "openDirectoryFileDialog", PACKAGNUNET_GENAME);
+ GNUNET_GTK_connect_glade_with_plugins (uploadXML);
dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
"openDirectoryFileDialog"));
if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_CANCEL)
@@ -67,7 +67,7 @@
#endif /* MINGW */
static int
-spcb (const ECRS_FileInfo * fi,
+spcb (const GNUNET_ECRS_FileInfo * fi,
const GNUNET_HashCode * key, int isRoot, void *closure)
{
SearchList *list = closure;
@@ -83,10 +83,10 @@
char *directory_data;
unsigned long long directory_data_len;
size_t dlen;
- struct ECRS_MetaData *md;
+ struct GNUNET_ECRS_MetaData *md;
int fd;
SearchList *list;
- struct ECRS_URI *uri;
+ struct GNUNET_ECRS_URI *uri;
const char *kws[2];
GtkNotebook *notebook;
@@ -97,14 +97,14 @@
dn)) ||
(GNUNET_OK != GNUNET_disk_file_size (NULL, dn, &directory_data_len,
GNUNET_YES)))
{
- addLogEntry (_("Error accessing file `%s'."), dn);
+ GNUNET_GTK_add_log_entry (_("Error accessing file `%s'."), dn);
GNUNET_free (dn);
return;
}
fd = GNUNET_disk_file_open (NULL, dn, O_LARGEFILE | O_RDONLY);
if (fd == -1)
{
- addLogEntry (_("Error opening file `%s'."), dn);
+ GNUNET_GTK_add_log_entry (_("Error opening file `%s'."), dn);
GNUNET_free (dn);
return;
}
@@ -112,38 +112,38 @@
directory_data = MMAP (NULL, dlen, PROT_READ, MAP_SHARED, fd, 0);
if (directory_data == MAP_FAILED)
{
- addLogEntry (_("Error mapping file `%s' into memory."), dn);
+ GNUNET_GTK_add_log_entry (_("Error mapping file `%s' into memory."), dn);
CLOSE (fd);
GNUNET_free (dn);
return;
}
kws[0] = dn;
kws[1] = NULL;
- uri = ECRS_keywordsToUri (kws);
+ uri = GNUNET_ECRS_keyword_string_to_uri (kws);
md = NULL;
- list = fs_search_started (NULL, uri, 0, 0, NULL, FSUI_COMPLETED);
- ECRS_freeUri (uri);
- ECRS_listDirectory (NULL,
+ list = fs_search_started (NULL, uri, 0, 0, NULL, GNUNET_FSUI_COMPLETED);
+ GNUNET_ECRS_uri_destroy (uri);
+ GNUNET_ECRS_directory_list_contents (NULL,
directory_data, directory_data_len, &md, &spcb, list);
if (md != NULL)
- ECRS_freeMetaData (md);
+ GNUNET_ECRS_meta_data_destroy (md);
MUNMAP (directory_data, dlen);
CLOSE (fd);
GNUNET_free (dn);
/* switch view -- select directory */
notebook
- = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "downloadNotebook"));
+ = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"downloadNotebook"));
gtk_notebook_set_current_page (notebook,
gtk_notebook_page_num (notebook,
list->searchpage));
notebook
- = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "fsnotebook"));
+ = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"fsnotebook"));
gtk_notebook_set_current_page (notebook,
gtk_notebook_page_num (notebook,
glade_xml_get_widget
- (getMainXML (),
+
(GNUNET_GTK_get_main_glade_XML (),
"fsdownloadvbox")));
}
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2007-11-25 12:05:27 UTC (rev
5756)
+++ gnunet-gtk/src/plugins/fs/download.c 2007-11-25 12:05:41 UTC (rev
5757)
@@ -39,7 +39,7 @@
* by the download list.
*/
static int
-addFilesToDirectory (const ECRS_FileInfo * fi,
+addFilesToDirectory (const GNUNET_ECRS_FileInfo * fi,
const GNUNET_HashCode * key, int isRoot, void *closure)
{
DownloadList *list = closure;
@@ -57,7 +57,7 @@
path = gtk_tree_row_reference_get_path (list->searchViewRowReference);
if (path == NULL)
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
return GNUNET_SYSERR;
}
gtk_tree_model_get_iter (model, &iter, path);
@@ -68,10 +68,10 @@
{
if (TRUE == gtk_tree_model_iter_nth_child (model, &child, &iter, i))
{
- struct ECRS_URI *uri;
+ struct GNUNET_ECRS_URI *uri;
uri = NULL;
gtk_tree_model_get (model, &child, SEARCH_URI, &uri, -1);
- if ((uri != NULL) && (ECRS_equalsUri (uri, fi->uri)))
+ if ((uri != NULL) && (GNUNET_ECRS_uri_test_equal (uri, fi->uri)))
return GNUNET_OK;
}
}
@@ -87,7 +87,7 @@
char *data;
int fd;
char *fn;
- struct ECRS_MetaData *meta;
+ struct GNUNET_ECRS_MetaData *meta;
struct stat buf;
const char *f;
@@ -134,18 +134,18 @@
data = MMAP (NULL, size, PROT_READ, MAP_SHARED, fd, 0);
if ((data == MAP_FAILED) || (data == NULL))
{
- GE_LOG_STRERROR_FILE (ectx, GE_ERROR | GE_ADMIN | GE_BULK, "mmap", f);
+ GNUNET_GELOG_STRERROR_FILE (ectx, GNUNET_GEERROR | GNUNET_GEADMIN |
GNUNET_GEBULK, "mmap", f);
CLOSE (fd);
GNUNET_free_non_null (fn);
return;
}
GNUNET_free_non_null (fn);
meta = NULL;
- ECRS_listDirectory (ectx, data, size, &meta, &addFilesToDirectory, list);
+ GNUNET_ECRS_directory_list_contents (ectx, data, size, &meta,
&addFilesToDirectory, list);
MUNMAP (data, size);
CLOSE (fd);
if (meta != NULL)
- ECRS_freeMetaData (meta);
+ GNUNET_ECRS_meta_data_destroy (meta);
}
/**
@@ -154,15 +154,15 @@
* the download summary.
*/
DownloadList *
-fs_download_started (struct FSUI_DownloadList *fsui_dl,
+fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
DownloadList * dl_parent,
SearchList * sl_parent,
unsigned long long total,
unsigned int anonymityLevel,
- const ECRS_FileInfo * fi,
+ const GNUNET_ECRS_FileInfo * fi,
const char *filename,
unsigned long long completed,
- GNUNET_CronTime eta, FSUI_State state)
+ GNUNET_CronTime eta, GNUNET_FSUI_State state)
{
DownloadList *list;
GtkTreeIter iter;
@@ -174,13 +174,13 @@
int progress;
char *uri_name;
gboolean valid;
- struct ECRS_URI *u;
+ struct GNUNET_ECRS_URI *u;
GtkTreeModel *model;
/* setup visualization */
list = GNUNET_malloc (sizeof (DownloadList));
memset (list, 0, sizeof (DownloadList));
- list->uri = ECRS_dupUri (fi->uri);
+ list->uri = GNUNET_ECRS_uri_duplicate (fi->uri);
list->filename = GNUNET_strdup (filename);
if ((dl_parent != NULL) &&
(NULL !=
@@ -204,7 +204,7 @@
{
gtk_tree_store_append (download_summary, &iter, NULL);
}
- size = ECRS_fileSize (fi->uri);
+ size = GNUNET_ECRS_uri_get_file_siz (fi->uri);
size_h = GNUNET_get_byte_size_as_fancy_string (size);
sname = &filename[strlen (filename) - 1];
while ((sname > filename) && (sname[-1] != '/') && (sname[-1] != '\\'))
@@ -213,7 +213,7 @@
progress = completed * 100 / size;
else
progress = 100;
- uri_name = ECRS_uriToString (fi->uri);
+ uri_name = GNUNET_ECRS_uri_to_string (fi->uri);
gtk_tree_store_set (download_summary,
&iter,
DOWNLOAD_FILENAME, filename,
@@ -241,7 +241,7 @@
/* FIXME: this requires GTK 2.8. Since it doesn't support Win9x, the
quick
solution is to #ifndef it */
#ifndef MINGW
- GE_BREAK (ectx,
+ GNUNET_GEBREAK (ectx,
gtk_tree_row_reference_get_model (dl_parent->
searchViewRowReference)
== model);
@@ -252,16 +252,16 @@
if (path != NULL)
{
valid = gtk_tree_model_get_iter (model, &piter, path);
- GE_BREAK (ectx, valid == TRUE);
+ GNUNET_GEBREAK (ectx, valid == TRUE);
if (valid == TRUE)
{
valid = gtk_tree_model_iter_children (model, &iter, &piter);
- GE_BREAK (ectx, valid == TRUE);
+ GNUNET_GEBREAK (ectx, valid == TRUE);
}
}
else
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
valid = FALSE;
}
}
@@ -269,13 +269,13 @@
{
/* no download-parent, must be top-level entry in search */
valid = gtk_tree_model_get_iter_first (model, &iter);
- GE_BREAK (ectx, valid == TRUE);
+ GNUNET_GEBREAK (ectx, valid == TRUE);
}
while (valid == TRUE)
{
/* find matching entry */
gtk_tree_model_get (model, &iter, SEARCH_URI, &u, -1);
- if (ECRS_equalsUri (u, fi->uri))
+ if (GNUNET_ECRS_uri_test_equal (u, fi->uri))
{
path = gtk_tree_model_get_path (model, &iter);
list->searchViewRowReference
@@ -284,7 +284,7 @@
gtk_tree_store_set (sl_parent->tree,
&iter,
SEARCH_CELL_BG_COLOR,
- getColorCode (URITRACK_DOWNLOAD_STARTED),
+ getColorCode
(GNUNET_URITRACK_DOWNLOAD_STARTED),
-1);
break;
}
@@ -294,14 +294,14 @@
{
/* did not find matching entry in search list -- bug! Continue
without adding to to search list! */
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
list->searchList = NULL;
}
}
list->fsui_list = fsui_dl;
list->total = total;
- list->is_directory = ECRS_isDirectory (fi->meta);
- list->has_terminated = ((state != FSUI_ACTIVE) && (state != FSUI_PENDING));
+ list->is_directory = GNUNET_ECRS_meta_data_test_for_directory (fi->meta);
+ list->has_terminated = ((state != GNUNET_FSUI_ACTIVE) && (state !=
GNUNET_FSUI_PENDING));
list->next = download_head;
download_head = list;
if ((list->is_directory == GNUNET_YES) && (completed != 0))
@@ -322,12 +322,12 @@
GtkTreeIter iter;
GtkTreePath *path;
unsigned int val;
- struct ECRS_MetaData *meta;
+ struct GNUNET_ECRS_MetaData *meta;
path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
if (path == NULL)
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
return;
}
gtk_tree_model_get_iter (GTK_TREE_MODEL (download_summary), &iter, path);
@@ -341,10 +341,10 @@
(list->searchList != NULL) && (list->searchViewRowReference != NULL))
{
meta = NULL;
- ECRS_listDirectory (ectx,
+ GNUNET_ECRS_directory_list_contents (ectx,
data, size, &meta, &addFilesToDirectory, list);
if (meta != NULL)
- ECRS_freeMetaData (meta);
+ GNUNET_ECRS_meta_data_destroy (meta);
}
}
@@ -370,7 +370,7 @@
gtk_tree_store_set (downloadContext->searchList->tree,
&iter,
SEARCH_CELL_BG_COLOR,
- getColorCode (URITRACK_DOWNLOAD_COMPLETED), -1);
+ getColorCode (GNUNET_URITRACK_DOWNLOAD_COMPLETED),
-1);
}
downloadContext->has_terminated = GNUNET_YES;
refreshDirectoryViewFromDisk (downloadContext);
@@ -398,7 +398,7 @@
gtk_tree_store_set (downloadContext->searchList->tree,
&iter,
SEARCH_CELL_BG_COLOR,
- getColorCode (URITRACK_DOWNLOAD_ABORTED), -1);
+ getColorCode (GNUNET_URITRACK_DOWNLOAD_ABORTED), -1);
}
downloadContext->has_terminated = GNUNET_YES;
refreshDirectoryViewFromDisk (downloadContext);
@@ -421,7 +421,7 @@
path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
if (path == NULL)
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
}
else
{
@@ -433,7 +433,7 @@
gtk_tree_store_remove (download_summary, &iter);
}
GNUNET_free (list->filename);
- ECRS_freeUri (list->uri);
+ GNUNET_ECRS_uri_destroy (list->uri);
/* if we have child-results in view, remove them! */
if (list->searchList != NULL)
@@ -441,7 +441,7 @@
path = gtk_tree_row_reference_get_path (list->searchViewRowReference);
if (path == NULL)
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
}
else
{
@@ -471,7 +471,7 @@
if (prev != NULL)
prev->next = list->next;
else
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
}
GNUNET_free (list);
}
@@ -517,8 +517,8 @@
typedef struct
{
char *uri_name;
- struct ECRS_URI *idc_uri;
- struct ECRS_MetaData *idc_meta;
+ struct GNUNET_ECRS_URI *idc_uri;
+ struct GNUNET_ECRS_MetaData *idc_meta;
char *idc_final_download_destination;
SearchList *searchContext;
DownloadList *parentContext;
@@ -531,7 +531,7 @@
{
SDC *sdc = cls;
- FSUI_startDownload (ctx,
+ GNUNET_FSUI_download_start (ctx,
sdc->anonymity,
sdc->recursive,
sdc->idc_uri,
@@ -579,19 +579,19 @@
SEARCH_INTERNAL, &sdc.searchContext,
SEARCH_INTERNAL_PARENT, &sdc.parentContext, -1);
if ((sdc.idc_uri == NULL) ||
- (!(ECRS_isFileUri (sdc.idc_uri) || ECRS_isLocationUri (sdc.idc_uri))))
+ (!(GNUNET_ECRS_uri_test_chk (sdc.idc_uri) || GNUNET_ECRS_uri_test_loc
(sdc.idc_uri))))
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
GNUNET_free_non_null (idc_name);
GNUNET_free_non_null (idc_mime);
return;
}
- sdc.uri_name = ECRS_uriToString (sdc.idc_uri);
+ sdc.uri_name = GNUNET_ECRS_uri_to_string (sdc.idc_uri);
if ((sdc.uri_name == NULL) ||
(strlen (sdc.uri_name) <
- strlen (ECRS_URI_PREFIX) + strlen (ECRS_FILE_INFIX)))
+ strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_FILE_INFIX)))
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
GNUNET_free_non_null (sdc.uri_name);
GNUNET_free_non_null (idc_name);
GNUNET_free_non_null (idc_mime);
@@ -611,26 +611,26 @@
#ifdef WINDOWS
char *filehash;
- GE_ASSERT (NULL,
+ GNUNET_GEASSERT (NULL,
strlen (sdc.uri_name) >
- strlen (ECRS_URI_PREFIX) + strlen (ECRS_FILE_INFIX));
+ strlen (GNUNET_ECRS_URI_PREFIX) + strlen
(GNUNET_ECRS_FILE_INFIX));
GNUNET_free_non_null (idc_name);
filehash =
GNUNET_strdup (&sdc.
- uri_name[strlen (ECRS_URI_PREFIX) +
- strlen (ECRS_FILE_INFIX)]);
+ uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
+ strlen (GNUNET_ECRS_FILE_INFIX)]);
filehash[16] = 0;
idc_name = GNUNET_strdup (filehash);
GNUNET_free_non_null (filehash);
#else
- GE_ASSERT (NULL,
+ GNUNET_GEASSERT (NULL,
strlen (sdc.uri_name) >
- strlen (ECRS_URI_PREFIX) + strlen (ECRS_FILE_INFIX));
+ strlen (GNUNET_ECRS_URI_PREFIX) + strlen
(GNUNET_ECRS_FILE_INFIX));
GNUNET_free_non_null (idc_name);
idc_name =
GNUNET_strdup (&sdc.
- uri_name[strlen (ECRS_URI_PREFIX) +
- strlen (ECRS_FILE_INFIX)]);
+ uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
+ strlen (GNUNET_ECRS_FILE_INFIX)]);
#endif
}
@@ -654,7 +654,7 @@
}
cname = NULL;
- GC_get_configuration_value_filename (cfg,
+ GNUNET_GC_get_configuration_value_filename (cfg,
"FS",
"INCOMINGDIR",
"$HOME/gnunet-downloads/",
@@ -720,12 +720,12 @@
"downloadRecursiveCheckButton");
if (GNUNET_OK == check_pending (idc_name, NULL))
{
- addLogEntry (_("Downloading `%s'\n"), idc_name);
- run_with_save_calls (&init_download_helper, &sdc);
+ GNUNET_GTK_add_log_entry (_("Downloading `%s'\n"), idc_name);
+ GNUNET_GTK_run_with_save_calls (&init_download_helper, &sdc);
}
else
{
- addLogEntry (_("ERROR: already downloading `%s'"), idc_name);
+ GNUNET_GTK_add_log_entry (_("ERROR: already downloading `%s'"),
idc_name);
}
GNUNET_free (sdc.uri_name);
GNUNET_free (dirPath);
@@ -746,7 +746,7 @@
GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
- ggc_tree_selection_selected_foreach (selection, &initiateDownload, NULL);
+ GNUNET_GTK_tree_selection_selected_foreach (selection, &initiateDownload,
NULL);
}
@@ -771,36 +771,36 @@
uris = gtk_entry_get_text (GTK_ENTRY (entry));
urid = GNUNET_strdup (uris);
- gtk_entry_set_text (GTK_ENTRY (entry), ECRS_URI_PREFIX);
- sdc.idc_uri = ECRS_stringToUri (ectx, urid);
+ gtk_entry_set_text (GTK_ENTRY (entry), GNUNET_ECRS_URI_PREFIX);
+ sdc.idc_uri = GNUNET_ECRS_string_to_uri (ectx, urid);
if (sdc.idc_uri == NULL)
{
- addLogEntry (_("Invalid URI `%s'"), urid);
+ GNUNET_GTK_add_log_entry (_("Invalid URI `%s'"), urid);
GNUNET_free (urid);
return;
}
- if (ECRS_isKeywordUri (sdc.idc_uri))
+ if (GNUNET_ECRS_uri_test_ksk (sdc.idc_uri))
{
- addLogEntry (_
+ GNUNET_GTK_add_log_entry (_
("Please use the search function for keyword (KSK) URIs!"));
GNUNET_free (urid);
- ECRS_freeUri (sdc.idc_uri);
+ GNUNET_ECRS_uri_destroy (sdc.idc_uri);
return;
}
- else if (ECRS_isLocationUri (sdc.idc_uri))
+ else if (GNUNET_ECRS_uri_test_loc (sdc.idc_uri))
{
- addLogEntry (_("Location URIs are not yet supported"));
+ GNUNET_GTK_add_log_entry (_("Location URIs are not yet supported"));
GNUNET_free (urid);
- ECRS_freeUri (sdc.idc_uri);
+ GNUNET_ECRS_uri_destroy (sdc.idc_uri);
return;
}
- GC_get_configuration_value_filename (cfg,
+ GNUNET_GC_get_configuration_value_filename (cfg,
"FS",
"INCOMINGDIR",
"$HOME/gnunet-downloads/",
&final_download_dir);
GNUNET_disk_directory_create (ectx, final_download_dir);
- dname = &uris[strlen (ECRS_URI_PREFIX) + strlen (ECRS_FILE_INFIX)];
+ dname = &uris[strlen (GNUNET_ECRS_URI_PREFIX) + strlen
(GNUNET_ECRS_FILE_INFIX)];
sdc.idc_final_download_destination =
GNUNET_malloc (strlen (final_download_dir) + strlen (dname) + 2);
strcpy (sdc.idc_final_download_destination, final_download_dir);
@@ -812,22 +812,22 @@
strcat (sdc.idc_final_download_destination, DIR_SEPARATOR_STR);
strcat (sdc.idc_final_download_destination, dname);
- addLogEntry (_("Downloading `%s'\n"), uris);
- sdc.idc_meta = ECRS_createMetaData ();
- sdc.anonymity = getSpinButtonValue (getMainXML (), "fsstatusAnonymitySpin");
+ GNUNET_GTK_add_log_entry (_("Downloading `%s'\n"), uris);
+ sdc.idc_meta = GNUNET_ECRS_meta_data_create ();
+ sdc.anonymity = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
"fsstatusAnonymitySpin");
sdc.recursive = GNUNET_NO;
sdc.searchContext = NULL;
sdc.parentContext = NULL;
- run_with_save_calls (&init_download_helper, &sdc);
- ECRS_freeMetaData (sdc.idc_meta);
+ GNUNET_GTK_run_with_save_calls (&init_download_helper, &sdc);
+ GNUNET_ECRS_meta_data_destroy (sdc.idc_meta);
GNUNET_free (sdc.idc_final_download_destination);
GNUNET_free (urid);
}
struct FCBC
{
- int (*method) (struct FSUI_Context * ctx, struct FSUI_DownloadList * list);
- struct FSUI_DownloadList *argument;
+ int (*method) (struct GNUNET_FSUI_Context * ctx, struct
GNUNET_FSUI_DownloadList * list);
+ struct GNUNET_FSUI_DownloadList *argument;
};
static void *
@@ -846,14 +846,14 @@
DownloadList *dl;
struct FCBC fcbc;
- GE_ASSERT (ectx, model == GTK_TREE_MODEL (download_summary));
+ GNUNET_GEASSERT (ectx, model == GTK_TREE_MODEL (download_summary));
gtk_tree_model_get (model, iter, DOWNLOAD_INTERNAL, &dl, -1);
if ((FALSE == gtk_tree_model_iter_has_child (model,
iter)) && (dl->has_terminated))
{
- fcbc.method = &FSUI_stopDownload;
+ fcbc.method = &GNUNET_FSUI_download_stop;
fcbc.argument = dl->fsui_list;
- run_with_save_calls (&fsui_callback, &fcbc);
+ GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
}
}
@@ -861,7 +861,7 @@
on_clearCompletedDownloadsButton_clicked_fs (void *unused,
GtkWidget * clearButton)
{
- ggc_tree_model_foreach (GTK_TREE_MODEL (download_summary),
+ GNUNET_GTK_tree_model_foreach (GTK_TREE_MODEL (download_summary),
&clearCompletedDownloadCallback, NULL);
}
@@ -873,11 +873,11 @@
DownloadList *dl;
struct FCBC fcbc;
- GE_ASSERT (ectx, model == GTK_TREE_MODEL (download_summary));
+ GNUNET_GEASSERT (ectx, model == GTK_TREE_MODEL (download_summary));
gtk_tree_model_get (model, iter, DOWNLOAD_INTERNAL, &dl, -1);
fcbc.method = fsui_call;
fcbc.argument = dl->fsui_list;
- run_with_save_calls (&fsui_callback, &fcbc);
+ GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
}
void
@@ -886,10 +886,10 @@
GtkTreeSelection *selection;
GtkWidget *downloadList;
- downloadList = glade_xml_get_widget (getMainXML (), "activeDownloadsList");
+ downloadList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"activeDownloadsList");
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (downloadList));
- ggc_tree_selection_selected_foreach
- (selection, &fsuiCallDownloadCallback, &FSUI_abortDownload);
+ GNUNET_GTK_tree_selection_selected_foreach
+ (selection, &fsuiCallDownloadCallback, &GNUNET_FSUI_download_abort);
}
void
@@ -898,12 +898,12 @@
GtkTreeSelection *selection;
GtkWidget *downloadList;
- downloadList = glade_xml_get_widget (getMainXML (), "activeDownloadsList");
+ downloadList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"activeDownloadsList");
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (downloadList));
- ggc_tree_selection_selected_foreach
- (selection, &fsuiCallDownloadCallback, &FSUI_abortDownload);
- ggc_tree_selection_selected_foreach
- (selection, &fsuiCallDownloadCallback, &FSUI_stopDownload);
+ GNUNET_GTK_tree_selection_selected_foreach
+ (selection, &fsuiCallDownloadCallback, &GNUNET_FSUI_download_abort);
+ GNUNET_GTK_tree_selection_selected_foreach
+ (selection, &fsuiCallDownloadCallback, &GNUNET_FSUI_download_stop);
}
/* end of download.c */
Modified: gnunet-gtk/src/plugins/fs/download.h
===================================================================
--- gnunet-gtk/src/plugins/fs/download.h 2007-11-25 12:05:27 UTC (rev
5756)
+++ gnunet-gtk/src/plugins/fs/download.h 2007-11-25 12:05:41 UTC (rev
5757)
@@ -31,15 +31,15 @@
#include <GNUnet/gnunet_fsui_lib.h>
#include "fs.h"
-DownloadList *fs_download_started (struct FSUI_DownloadList *fsui_dl,
+DownloadList *fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
DownloadList * dl_parent,
SearchList * sl_parent,
unsigned long long total,
unsigned int anonymityLevel,
- const ECRS_FileInfo * fi,
+ const GNUNET_ECRS_FileInfo * fi,
const char *filename,
unsigned long long completed,
- GNUNET_CronTime eta, FSUI_State state);
+ GNUNET_CronTime eta, GNUNET_FSUI_State
state);
void fs_download_update (DownloadList * downloadContext,
unsigned long long completed,
Modified: gnunet-gtk/src/plugins/fs/extensions/musicinsert.c
===================================================================
--- gnunet-gtk/src/plugins/fs/extensions/musicinsert.c 2007-11-25 12:05:27 UTC
(rev 5756)
+++ gnunet-gtk/src/plugins/fs/extensions/musicinsert.c 2007-11-25 12:05:41 UTC
(rev 5757)
@@ -78,7 +78,7 @@
show_musicinsertdialog ()
{
musicinsertXML =
- glade_xml_new (MUSICINSERTXMLFILE, "musicinsertdialog", PACKAGE_NAME);
+ glade_xml_new (MUSICINSERTXMLFILE, "musicinsertdialog",
PACKAGNUNET_GENAME);
glade_xml_signal_autoconnect (musicinsertXML);
/* libglade*/
@@ -458,8 +458,8 @@
gboolean
insertfiles ()
{
- struct ECRS_MetaData *dirmetadata;
- struct ECRS_MetaData *tempmetadata;
+ struct GNUNET_ECRS_MetaData *dirmetadata;
+ struct GNUNET_ECRS_MetaData *tempmetadata;
GArray *filesmetadatas, *files;
gchar *temptext;
gchar **dirkeywords;
@@ -485,7 +485,7 @@
GtkWidget *message_dialog =
gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
+ GTK_MESSAGNUNET_GEERROR,
GTK_BUTTONS_CLOSE,
"%s", error_message);
gtk_dialog_run (GTK_DIALOG (message_dialog));
@@ -497,16 +497,16 @@
/* Manage album metadatas */
- dirmetadata = ECRS_createMetaData ();
+ dirmetadata = GNUNET_ECRS_meta_data_create ();
dirmetas[0] =
gtk_combo_box_get_active_text (GTK_COMBO_BOX (artistcombobox));
if (dirmetas[0])
- ECRS_addToMetaData (dirmetadata, EXTRACTOR_ARTIST, dirmetas[0]);
+ GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_ARTIST, dirmetas[0]);
dirmetas[1] = gtk_combo_box_get_active_text (GTK_COMBO_BOX (albumcombobox));
if (dirmetas[1])
- ECRS_addToMetaData (dirmetadata, EXTRACTOR_ALBUM, dirmetas[1]);
+ GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_ALBUM, dirmetas[1]);
keywordsentry = glade_xml_get_widget (musicinsertXML, "keywordsentry");
temptext = (gchar *) gtk_entry_get_text (GTK_ENTRY (keywordsentry));
@@ -516,12 +516,12 @@
n = 0;
while (dirkeywords[n])
{
- ECRS_addToMetaData (dirmetadata, EXTRACTOR_KEYWORDS, dirkeywords[n]);
+ GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_KEYWORDS,
dirkeywords[n]);
n++;
}
/* Add a standard keyword to allow finding all available music albums
* on AFS in one search */
- ECRS_addToMetaData (dirmetadata, EXTRACTOR_KEYWORDS, "music album");
+ GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_KEYWORDS, "music album");
/* Manage files metadatas */
@@ -545,12 +545,12 @@
useforallflags = gtk_toggle_button_get_active (commentstogglebutton) << 3;
filesmetadatas =
- g_array_sized_new (FALSE, FALSE, sizeof (struct ECRS_MetaData *), 20);
+ g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_ECRS_MetaData *),
20);
files = g_array_sized_new (FALSE, FALSE, sizeof (gchar *), 20);
i = 0;
do
{
- tempmetadata = ECRS_createMetaData ();
+ tempmetadata = GNUNET_ECRS_meta_data_create ();
tempmetas = malloc (sizeof (gchar *) * 8);
g_array_append_val (filesmetadatas, tempmetadata);
gtk_tree_model_get (GTK_TREE_MODEL (filelist_store),
@@ -567,28 +567,28 @@
if (tempmetas[1])
- ECRS_addToMetaData (tempmetadata, EXTRACTOR_FILENAME, tempmetas[1]);
+ GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME,
tempmetas[1]);
if ((useforallflags & 0x1) && dirmetas[0])
- ECRS_addToMetaData (tempmetadata, EXTRACTOR_FILENAME, dirmetas[0]);
+ GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME,
dirmetas[0]);
else if (!(useforallflags & 0x1) && tempmetas[2])
- ECRS_addToMetaData (tempmetadata, EXTRACTOR_TITLE, tempmetas[2]);
+ GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_TITLE,
tempmetas[2]);
if ((useforallflags & 0x2) && dirmetas[1])
- ECRS_addToMetaData (tempmetadata, EXTRACTOR_ARTIST, dirmetas[1]);
+ GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_ARTIST,
dirmetas[1]);
else if (!(useforallflags & 0x2) && tempmetas[3])
- ECRS_addToMetaData (tempmetadata, EXTRACTOR_FILENAME, tempmetas[3]);
+ GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME,
tempmetas[3]);
if (tempmetas[4])
- ECRS_addToMetaData (tempmetadata, EXTRACTOR_ALBUM, tempmetas[4]);
+ GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_ALBUM,
tempmetas[4]);
if (tempmetas[5])
- ECRS_addToMetaData (tempmetadata, EXTRACTOR_MIMETYPE, tempmetas[5]);
+ GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_MIMETYPE,
tempmetas[5]);
if (tempmetas[6])
- ECRS_addToMetaData (tempmetadata, EXTRACTOR_FORMAT, tempmetas[6]);
+ GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FORMAT,
tempmetas[6]);
if (!(useforallflags & 0x1))
{
n = 0;
while (dirkeywords[n])
{
- ECRS_addToMetaData (tempmetadata, EXTRACTOR_KEYWORDS,
+ GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_KEYWORDS,
dirkeywords[n]);
n++;
}
@@ -599,14 +599,14 @@
n = 0;
while (tempkeywords[n])
{
- ECRS_addToMetaData (tempmetadata,
+ GNUNET_ECRS_meta_data_inser (tempmetadata,
EXTRACTOR_KEYWORDS, tempkeywords[n]);
n++;
}
g_strfreev (tempkeywords);
/* Add a standard keyword to allow finding all available music files
* on AFS in one search */
- ECRS_addToMetaData (tempmetadata, EXTRACTOR_KEYWORDS, "music");
+ GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_KEYWORDS,
"music");
}
GNUNET_free (tempmetas);
@@ -624,7 +624,7 @@
* Artist: Song (Album) - Type and Format # for files
* Artist: Album - Type and number of the files # or album
*
- * TODO : really call FSUI_upload() to insert these files */
+ * TODO : really call GNUNET_FSUI_upload() to insert these files */
return TRUE;
}
@@ -737,7 +737,7 @@
GtkWidget *file_error_dialog =
gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
+ GTK_MESSAGNUNET_GEERROR,
GTK_BUTTONS_CLOSE,
file_error_message->str);
gtk_dialog_run (GTK_DIALOG (file_error_dialog));
@@ -752,7 +752,7 @@
GtkWidget *message_dialog =
gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
+ GTK_MESSAGNUNET_GEERROR,
GTK_BUTTONS_CLOSE,
"%s%s", error_message,
dir_opening_error->message);
@@ -824,7 +824,7 @@
GtkWidget *file_error_dialog =
gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
+ GTK_MESSAGNUNET_GEERROR,
GTK_BUTTONS_CLOSE,
file_error_message->str);
gtk_dialog_run (GTK_DIALOG (file_error_dialog));
Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/plugins/fs/fs.c 2007-11-25 12:05:41 UTC (rev 5757)
@@ -35,11 +35,11 @@
#include "collection.h"
#include "namespace.h"
-struct FSUI_Context *ctx;
+struct GNUNET_FSUI_Context *ctx;
-struct GE_Context *ectx;
+struct GNUNET_GEContext *ectx;
-struct GC_Configuration *cfg;
+struct GNUNET_GC_Configuration *cfg;
SearchList *search_head;
@@ -99,7 +99,7 @@
spin = GTK_SPIN_BUTTON (w);
if (spin == NULL)
{
- GE_BREAK (NULL, 0);
+ GNUNET_GEBREAK (NULL, 0);
return;
}
val = gtk_spin_button_get_value_as_int (spin);
@@ -120,38 +120,38 @@
static void *
saveEventProcessor (void *cls)
{
- const FSUI_Event *event = cls;
+ const GNUNET_FSUI_Event *event = cls;
void *ret;
ret = NULL;
switch (event->type)
{
/* search events */
- case FSUI_search_started:
+ case GNUNET_FSUI_search_started:
ret = fs_search_started (event->data.SearchStarted.sc.pos,
event->data.SearchStarted.searchURI,
event->data.SearchStarted.anonymityLevel,
- 0, NULL, FSUI_ACTIVE);
+ 0, NULL, GNUNET_FSUI_ACTIVE);
break;
- case FSUI_search_result:
+ case GNUNET_FSUI_search_result:
fs_search_result_received (event->data.SearchResult.sc.cctx,
&event->data.SearchResult.fi,
event->data.SearchResult.searchURI);
break;
- case FSUI_search_error:
+ case GNUNET_FSUI_search_error:
fs_search_aborted (event->data.SearchError.sc.cctx);
break;
- case FSUI_search_aborted:
+ case GNUNET_FSUI_search_aborted:
fs_search_aborted (event->data.SearchAborted.sc.cctx);
break;
- case FSUI_search_completed:
+ case GNUNET_FSUI_search_completed:
// FIXME...
fs_search_aborted (event->data.SearchCompleted.sc.cctx);
break;
- case FSUI_search_suspended:
+ case GNUNET_FSUI_search_suspended:
fs_search_aborted (event->data.SearchSuspended.sc.cctx);
break;
- case FSUI_search_resumed:
+ case GNUNET_FSUI_search_resumed:
ret = fs_search_started (event->data.SearchResumed.sc.pos,
event->data.SearchResumed.searchURI,
event->data.SearchResumed.anonymityLevel,
@@ -159,33 +159,33 @@
event->data.SearchResumed.fis,
event->data.SearchResumed.state);
break;
- case FSUI_search_stopped:
+ case GNUNET_FSUI_search_stopped:
fs_search_stopped (event->data.SearchStopped.sc.cctx);
break;
/* download events */
- case FSUI_download_aborted:
+ case GNUNET_FSUI_download_aborted:
fs_download_aborted (event->data.DownloadAborted.dc.cctx);
break;
- case FSUI_download_error:
+ case GNUNET_FSUI_download_error:
fs_download_aborted (event->data.DownloadError.dc.cctx);
break;
- case FSUI_download_suspended:
+ case GNUNET_FSUI_download_suspended:
fs_download_stopped (event->data.DownloadSuspended.dc.cctx);
break;
- case FSUI_download_progress:
+ case GNUNET_FSUI_download_progress:
fs_download_update (event->data.DownloadProgress.dc.cctx,
event->data.DownloadProgress.completed,
event->data.DownloadProgress.last_block,
event->data.DownloadProgress.last_size);
break;
- case FSUI_download_completed:
+ case GNUNET_FSUI_download_completed:
fs_download_completed (event->data.DownloadCompleted.dc.cctx);
break;
- case FSUI_download_stopped:
+ case GNUNET_FSUI_download_stopped:
fs_download_stopped (event->data.DownloadStopped.dc.cctx);
break;
- case FSUI_download_started:
+ case GNUNET_FSUI_download_started:
ret = fs_download_started (event->data.DownloadStarted.dc.pos,
event->data.DownloadStarted.dc.pcctx,
event->data.DownloadStarted.dc.sctx,
@@ -193,9 +193,9 @@
event->data.DownloadStarted.anonymityLevel,
&event->data.DownloadStarted.fi,
event->data.DownloadStarted.filename,
- 0, GNUNET_get_time (), FSUI_ACTIVE);
+ 0, GNUNET_get_time (), GNUNET_FSUI_ACTIVE);
break;
- case FSUI_download_resumed:
+ case GNUNET_FSUI_download_resumed:
ret = fs_download_started (event->data.DownloadResumed.dc.pos,
event->data.DownloadResumed.dc.pcctx,
event->data.DownloadResumed.dc.sctx,
@@ -209,36 +209,36 @@
break;
/* upload events */
- case FSUI_upload_progress:
+ case GNUNET_FSUI_upload_progress:
fs_upload_update (event->data.UploadProgress.uc.cctx,
event->data.UploadProgress.completed,
event->data.UploadProgress.total);
break;
- case FSUI_upload_completed:
+ case GNUNET_FSUI_upload_completed:
fs_upload_complete (event->data.UploadCompleted.uc.cctx,
event->data.UploadCompleted.uri);
break;
- case FSUI_upload_error:
+ case GNUNET_FSUI_upload_error:
fs_upload_error (event->data.UploadError.uc.cctx);
break;
- case FSUI_upload_aborted:
+ case GNUNET_FSUI_upload_aborted:
fs_upload_error (event->data.UploadAborted.uc.cctx);
break;
- case FSUI_upload_stopped:
+ case GNUNET_FSUI_upload_stopped:
fs_upload_stopped (event->data.UploadStopped.uc.cctx);
break;
- case FSUI_upload_suspended:
+ case GNUNET_FSUI_upload_suspended:
fs_upload_stopped (event->data.UploadSuspended.uc.cctx);
break;
- case FSUI_upload_started:
+ case GNUNET_FSUI_upload_started:
ret = fs_upload_started (event->data.UploadStarted.uc.pos,
event->data.UploadStarted.uc.pcctx,
event->data.UploadStarted.filename,
NULL,
event->data.UploadStarted.total,
- 0, FSUI_ACTIVE);
+ 0, GNUNET_FSUI_ACTIVE);
break;
- case FSUI_upload_resumed:
+ case GNUNET_FSUI_upload_resumed:
ret = fs_upload_started (event->data.UploadResumed.uc.pos,
event->data.UploadResumed.uc.pcctx,
event->data.UploadResumed.filename,
@@ -249,9 +249,9 @@
break;
/* TODO: unindex events */
default:
- GE_BREAK (ectx, 0);
- GE_LOG (ectx,
- GE_ERROR,
+ GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GELOG (ectx,
+ GNUNET_GEERROR,
_("Unhandled (unknown) FSUI event: %u.\n"), event->type);
break;
}
@@ -259,9 +259,9 @@
}
static void *
-eventProcessor (void *unused, const FSUI_Event * event)
+eventProcessor (void *unused, const GNUNET_FSUI_Event * event)
{
- return gtkSaveCall (&saveEventProcessor, (void *) event);
+ return GNUNET_GTK_save_call (&saveEventProcessor, (void *) event);
}
/**
@@ -277,12 +277,12 @@
selection =
gtk_tree_view_get_selection (GTK_TREE_VIEW
(glade_xml_get_widget
- (getMainXML (), "activeUploadsList")));
- button = glade_xml_get_widget (getMainXML (), "cancelUploadButton");
+ (GNUNET_GTK_get_main_glade_XML (),
"activeUploadsList")));
+ button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"cancelUploadButton");
gtk_widget_set_sensitive (button,
gtk_tree_selection_count_selected_rows (selection)
> 0);
- button = glade_xml_get_widget (getMainXML (), "stopUploadButton");
+ button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"stopUploadButton");
gtk_widget_set_sensitive (button,
gtk_tree_selection_count_selected_rows (selection)
> 0);
@@ -301,12 +301,12 @@
selection =
gtk_tree_view_get_selection (GTK_TREE_VIEW
(glade_xml_get_widget
- (getMainXML (), "activeDownloadsList")));
- button = glade_xml_get_widget (getMainXML (), "abortDownloadButton");
+ (GNUNET_GTK_get_main_glade_XML (),
"activeDownloadsList")));
+ button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"abortDownloadButton");
gtk_widget_set_sensitive (button,
gtk_tree_selection_count_selected_rows (selection)
> 0);
- button = glade_xml_get_widget (getMainXML (), "stopDownloadButton");
+ button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"stopDownloadButton");
gtk_widget_set_sensitive (button,
gtk_tree_selection_count_selected_rows (selection)
> 0);
@@ -325,12 +325,12 @@
selection =
gtk_tree_view_get_selection (GTK_TREE_VIEW
(glade_xml_get_widget
- (getMainXML (), "activeSearchesSummary")));
- button = glade_xml_get_widget (getMainXML (), "cancelSearchButton");
+ (GNUNET_GTK_get_main_glade_XML (),
"activeSearchesSummary")));
+ button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"cancelSearchButton");
gtk_widget_set_sensitive (button,
gtk_tree_selection_count_selected_rows (selection)
> 0);
- button = glade_xml_get_widget (getMainXML (), "stopSearchButton");
+ button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"stopSearchButton");
gtk_widget_set_sensitive (button,
gtk_tree_selection_count_selected_rows (selection)
> 0);
@@ -342,7 +342,7 @@
GtkTreeView *uploadList = cls;
GtkTreePath *path;
GtkTreeIter iter;
- struct ECRS_URI *uri;
+ struct GNUNET_ECRS_URI *uri;
char *str;
GtkClipboard *clip;
@@ -352,13 +352,13 @@
last_y,
&path, NULL, NULL, NULL))
{
- GE_BREAK (NULL, 0);
+ GNUNET_GEBREAK (NULL, 0);
return FALSE;
}
if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary),
&iter, path))
{
- GE_BREAK (NULL, 0);
+ GNUNET_GEBREAK (NULL, 0);
gtk_tree_path_free (path);
return FALSE;
}
@@ -423,7 +423,7 @@
/* keyword list setup */
searchCB
- = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (getMainXML (),
+ = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML
(),
"fssearchKeywordComboBoxEntry"));
model = gtk_list_store_new (1, G_TYPE_STRING /* search string */ );
gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model));
@@ -431,7 +431,7 @@
/* search namespace selection setup */
searchCB
- = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (getMainXML (),
+ = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML
(),
"searchNamespaceComboBoxEntry"));
model = gtk_list_store_new (NS_SEARCH_NUM, G_TYPE_STRING, /* what we
show */
@@ -442,7 +442,7 @@
gtk_combo_box_entry_set_text_column (searchCB, NS_SEARCH_DESCRIPTION);
/* search summary setup */
- searchList = GTK_TREE_VIEW (glade_xml_get_widget (getMainXML (),
+ searchList = GTK_TREE_VIEW (glade_xml_get_widget
(GNUNET_GTK_get_main_glade_XML (),
"activeSearchesSummary"));
search_summary = gtk_list_store_new (SEARCH_SUMMARY_NUM, G_TYPE_STRING,
/* name */
G_TYPE_INT, /* # results */
@@ -486,7 +486,7 @@
gtk_tree_view_column_set_resizable (column, TRUE);
/* download summary setup */
- downloadList = GTK_TREE_VIEW (glade_xml_get_widget (getMainXML (),
+ downloadList = GTK_TREE_VIEW (glade_xml_get_widget
(GNUNET_GTK_get_main_glade_XML (),
"activeDownloadsList"));
download_summary = gtk_tree_store_new (DOWNLOAD_NUM, G_TYPE_STRING, /*
name (full-path file name) */
G_TYPE_STRING, /* name (user-friendly
name) */
@@ -553,7 +553,7 @@
gtk_tree_view_column_set_resizable (column, TRUE);
/* upload summary setup */
- uploadList = GTK_TREE_VIEW (glade_xml_get_widget (getMainXML (),
+ uploadList = GTK_TREE_VIEW (glade_xml_get_widget
(GNUNET_GTK_get_main_glade_XML (),
"activeUploadsList"));
g_signal_connect_swapped (uploadList,
"button-press-event",
@@ -594,7 +594,7 @@
TRUE);
/* upload entry setup */
uploadEntry
- = glade_xml_get_widget (getMainXML (), "uploadFilenameComboBoxEntry");
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"uploadFilenameComboBoxEntry");
model = gtk_list_store_new (1, G_TYPE_STRING);
gtk_combo_box_set_model (GTK_COMBO_BOX (uploadEntry),
@@ -608,13 +608,13 @@
static void
fs_summary_stop ()
{
- struct ECRS_MetaData *meta;
+ struct GNUNET_ECRS_MetaData *meta;
GtkComboBox *searchCB;
GtkTreeModel *model;
GtkTreeIter iter;
searchCB
- = GTK_COMBO_BOX (glade_xml_get_widget (getMainXML (),
+ = GTK_COMBO_BOX (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"searchNamespaceComboBoxEntry"));
model = gtk_combo_box_get_model (searchCB);
if (gtk_tree_model_get_iter_first (model, &iter))
@@ -625,7 +625,7 @@
gtk_list_store_set (GTK_LIST_STORE (model),
&iter, NS_SEARCH_METADATA, NULL, -1);
if (meta != NULL)
- ECRS_freeMetaData (meta);
+ GNUNET_ECRS_meta_data_destroy (meta);
}
while (gtk_list_store_remove (GTK_LIST_STORE (model), &iter));
}
@@ -633,7 +633,7 @@
}
void
-init_fs (struct GE_Context *e, struct GC_Configuration *c)
+init_fs (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
{
GtkWidget *tab;
GtkWidget *book;
@@ -641,17 +641,17 @@
ectx = e;
cfg = c;
- CO_init (ectx, cfg);
- tab = glade_xml_get_widget (getMainXML (), "fsnotebook");
+ GNUNET_CO_init (ectx, cfg);
+ tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook");
gtk_widget_show (tab);
- book = glade_xml_get_widget (getMainXML (), "mainnotebook");
+ book = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"mainnotebook");
num = gtk_notebook_get_current_page (GTK_NOTEBOOK (book));
gtk_notebook_set_current_page (GTK_NOTEBOOK (book), 1);
gtk_notebook_set_current_page (GTK_NOTEBOOK (book), num);
fs_summary_start ();
fs_collection_start ();
fs_namespace_start ();
- ctx = FSUI_start (ectx, cfg, "gnunet-gtk", 8, /* FIXME: allow user to
configure download parallelism */
+ ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk", 8, /* FIXME: allow user to
configure download parallelism */
GNUNET_YES, &eventProcessor, NULL);
}
@@ -660,7 +660,7 @@
{
GtkWidget *tab;
- tab = glade_xml_get_widget (getMainXML (), "fsnotebook");
+ tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook");
gtk_widget_hide (tab);
return NULL;
}
@@ -676,29 +676,29 @@
void
done_fs ()
{
- gtkSaveCall (&hide_save_call, NULL);
- FSUI_stop (ctx);
- gtkSaveCall (&cleanup_save_call, NULL);
- CO_done ();
+ GNUNET_GTK_save_call (&hide_save_call, NULL);
+ GNUNET_FSUI_stop (ctx);
+ GNUNET_GTK_save_call (&cleanup_save_call, NULL);
+ GNUNET_CO_done ();
}
const char *
-getColorCode (enum URITRACK_STATE state)
+getColorCode (enum GNUNET_URITRACK_STATE state)
{
- if (state & (URITRACK_DIRECTORY_ADDED))
+ if (state & (GNUNET_URITRACK_DIRECTORY_ADDED))
return "blue";
- if (state & (URITRACK_INSERTED || URITRACK_INDEXED))
+ if (state & (GNUNET_URITRACK_INSERTED || GNUNET_URITRACK_INDEXED))
return "cyan";
- if ((state & URITRACK_DOWNLOAD_STARTED) &&
+ if ((state & GNUNET_URITRACK_DOWNLOAD_STARTED) &&
(0 == (state &
- (URITRACK_DOWNLOAD_COMPLETED | URITRACK_DOWNLOAD_ABORTED))))
+ (GNUNET_URITRACK_DOWNLOAD_COMPLETED |
GNUNET_URITRACK_DOWNLOAD_ABORTED))))
return "yellow";
- if (state & URITRACK_DOWNLOAD_COMPLETED)
+ if (state & GNUNET_URITRACK_DOWNLOAD_COMPLETED)
return "springgreen";
- if (state & URITRACK_DOWNLOAD_ABORTED)
+ if (state & GNUNET_URITRACK_DOWNLOAD_ABORTED)
return "red";
- if (state & (URITRACK_SEARCH_RESULT | URITRACK_DIRECTORY_FOUND))
+ if (state & (GNUNET_URITRACK_SEARCH_RESULT |
GNUNET_URITRACK_DIRECTORY_FOUND))
return "gray";
return "white";
}
Modified: gnunet-gtk/src/plugins/fs/fs.h
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.h 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/plugins/fs/fs.h 2007-11-25 12:05:41 UTC (rev 5757)
@@ -197,7 +197,7 @@
/**
* URI for this search.
*/
- struct ECRS_URI *uri;
+ struct GNUNET_ECRS_URI *uri;
/**
* String describing the search.
@@ -207,7 +207,7 @@
/**
* FSUI search handle.
*/
- struct FSUI_SearchList *fsui_list;
+ struct GNUNET_FSUI_SearchList *fsui_list;
/**
* Number of results received so far.
@@ -234,7 +234,7 @@
/**
* URI of the download.
*/
- struct ECRS_URI *uri;
+ struct GNUNET_ECRS_URI *uri;
/**
* Where is the download being saved to?
@@ -263,7 +263,7 @@
/**
* FSUI reference for the download.
*/
- struct FSUI_DownloadList *fsui_list;
+ struct GNUNET_FSUI_DownloadList *fsui_list;
/**
* Total size of the download.
@@ -293,12 +293,12 @@
*/
GtkTreeRowReference *summaryViewRowReference;
- struct FSUI_UploadList *fsui_list;
+ struct GNUNET_FSUI_UploadList *fsui_list;
/**
* Set to final URI upon successful completion.
*/
- struct ECRS_URI *uri;
+ struct GNUNET_ECRS_URI *uri;
/**
* Total size of the upload.
@@ -311,11 +311,11 @@
} UploadList;
-extern struct FSUI_Context *ctx;
+extern struct GNUNET_FSUI_Context *ctx;
-extern struct GE_Context *ectx;
+extern struct GNUNET_GEContext *ectx;
-extern struct GC_Configuration *cfg;
+extern struct GNUNET_GC_Configuration *cfg;
extern SearchList *search_head;
@@ -329,7 +329,7 @@
extern GtkTreeStore *upload_summary;
-const char *getColorCode (enum URITRACK_STATE state);
+const char *getColorCode (enum GNUNET_URITRACK_STATE state);
#endif
Modified: gnunet-gtk/src/plugins/fs/helper.h
===================================================================
--- gnunet-gtk/src/plugins/fs/helper.h 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/plugins/fs/helper.h 2007-11-25 12:05:41 UTC (rev 5757)
@@ -38,7 +38,7 @@
GtkWidget *buildSearchTabLabel (GtkWidget * searchPage, const char *title);
-GtkWidget *makeSearchResultFrame (struct GC_Configuration *cfg,
+GtkWidget *makeSearchResultFrame (struct GNUNET_GC_Configuration *cfg,
GtkWidget ** treeview,
GtkWidget ** anonSpin);
Modified: gnunet-gtk/src/plugins/fs/meta.c
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.c 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/plugins/fs/meta.c 2007-11-25 12:05:41 UTC (rev 5757)
@@ -53,7 +53,7 @@
createMetaDataListTreeView (GladeXML * xml,
const char *name,
const char *previewName,
- const struct ECRS_MetaData *init)
+ const struct GNUNET_ECRS_MetaData *init)
{
GtkTreeView *metaList;
GtkListStore *metamodel;
@@ -99,13 +99,13 @@
gtk_tree_view_set_model (metaList, GTK_TREE_MODEL (metamodel));
if (init != NULL)
- ECRS_getMetaData (init, &publishMetaData, metamodel);
+ GNUNET_ECRS_meta_data_get_contents (init, &publishMetaData, metamodel);
if ((previewName == NULL) || (init == NULL))
return;
preview = glade_xml_get_widget (xml, previewName);
thumb = NULL;
- ts = ECRS_getThumbnailFromMetaData (init, &thumb);
+ ts = GNUNET_ECRS_meta_data_get_thumbnail (init, &thumb);
preview = glade_xml_get_widget (xml, previewName);
if (ts != 0)
{
@@ -139,7 +139,7 @@
void
createKeywordListTreeView (GladeXML * xml,
- const char *name, const struct ECRS_URI *init)
+ const char *name, const struct GNUNET_ECRS_URI
*init)
{
GtkTreeView *keywordList;
GtkListStore *keymodel;
@@ -163,7 +163,7 @@
gtk_tree_view_column_set_sort_column_id (column, 0);
gtk_tree_view_set_model (keywordList, GTK_TREE_MODEL (keymodel));
if (init != NULL)
- ECRS_getKeywordsFromUri (init, &publishKeyword, keymodel);
+ GNUNET_ECRS_uri_get_keywords_from_ksk (init, &publishKeyword, keymodel);
DEBUG_END ();
}
@@ -277,14 +277,14 @@
GtkWidget *list;
list = glade_xml_get_widget (xml, listName);
- ggc_tree_selection_selected_foreach
+ GNUNET_GTK_tree_selection_selected_foreach
(gtk_tree_view_get_selection (GTK_TREE_VIEW (list)), &removeRow, NULL);
}
#define THUMBSIZE 128
-struct ECRS_MetaData *
+struct GNUNET_ECRS_MetaData *
getMetaDataFromList (GladeXML * xml,
const char *name, const char *previewName)
{
@@ -292,7 +292,7 @@
GtkWidget *preview;
GtkTreeModel *metamodel;
GtkTreeIter iter;
- struct ECRS_MetaData *meta;
+ struct GNUNET_ECRS_MetaData *meta;
EXTRACTOR_KeywordType type;
GdkPixbuf *pixbuf;
GdkPixbuf *out;
@@ -304,7 +304,7 @@
metaList = glade_xml_get_widget (xml, name);
metamodel = gtk_tree_view_get_model (GTK_TREE_VIEW (metaList));
- meta = ECRS_createMetaData ();
+ meta = GNUNET_ECRS_meta_data_create ();
if (gtk_tree_model_get_iter_first (metamodel, &iter))
{
do
@@ -312,7 +312,7 @@
gtk_tree_model_get (metamodel,
&iter,
META_TYPE, &type, META_VALUE, &mvalue, -1);
- ECRS_addToMetaData (meta, type, mvalue);
+ GNUNET_ECRS_meta_data_inser (meta, type, mvalue);
GNUNET_free_non_null (mvalue);
}
while (gtk_tree_model_iter_next (metamodel, &iter));
@@ -322,7 +322,7 @@
preview = glade_xml_get_widget (xml, previewName);
- if (GTK_IMAGE_PIXBUF == gtk_image_get_storage_type (GTK_IMAGE (preview)))
+ if (GTK_IMAGNUNET_GEPIXBUF == gtk_image_get_storage_type (GTK_IMAGE
(preview)))
{
pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (preview));
if (pixbuf == NULL)
@@ -357,7 +357,7 @@
binary = EXTRACTOR_binaryEncode ((const unsigned char *) thumb,
length);
free (thumb);
- ECRS_addToMetaData (meta, EXTRACTOR_THUMBNAIL_DATA, binary);
+ GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_THUMBNAIL_DATA,
binary);
GNUNET_free (binary);
}
}
@@ -365,13 +365,13 @@
return meta;
}
-struct ECRS_URI *
+struct GNUNET_ECRS_URI *
getKeywordURIFromList (GladeXML * xml, const char *name)
{
GtkTreeModel *keymodel;
GtkTreeView *keyList;
GtkTreeIter iter;
- struct ECRS_URI *keywordURI;
+ struct GNUNET_ECRS_URI *keywordURI;
char *mvalue;
char **keywords;
unsigned int kpos;
@@ -398,7 +398,7 @@
}
keywords[kpos] = NULL;
- keywordURI = ECRS_keywordsToUri ((const char **) keywords);
+ keywordURI = GNUNET_ECRS_keyword_string_to_uri ((const char **) keywords);
while (kpos > 0)
GNUNET_free (keywords[--kpos]);
GNUNET_array_grow (keywords, ksize, 0);
@@ -409,9 +409,9 @@
char *
updateIntervalToString (GNUNET_Int32Time interval)
{
- if (interval == ECRS_SBLOCK_UPDATE_SPORADIC)
+ if (interval == GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC)
return strdup (_("--sporadic update--"));
- if (interval == ECRS_SBLOCK_UPDATE_NONE)
+ if (interval == GNUNET_ECRS_SBLOCK_UPDATE_NONE)
return strdup (_("--no update--"));
return GNUNET_get_time_interval_as_fancy_string (interval *
GNUNET_CRON_SECONDS);
}
@@ -422,9 +422,9 @@
if (timeSpec == NULL)
return GNUNET_SYSERR;
if (0 == strcmp (_("--sporadic update--"), timeSpec))
- *interval = ECRS_SBLOCK_UPDATE_SPORADIC;
+ *interval = GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC;
else if (0 == strcmp (_("--no update--"), timeSpec))
- *interval = ECRS_SBLOCK_UPDATE_NONE;
+ *interval = GNUNET_ECRS_SBLOCK_UPDATE_NONE;
else
return parseTime (timeSpec, interval);
return GNUNET_OK;
@@ -451,22 +451,22 @@
char *
-getMimeTypeFromMetaData (const struct ECRS_MetaData *meta)
+getMimeTypeFromMetaData (const struct GNUNET_ECRS_MetaData *meta)
{
char *mime;
- mime = ECRS_getFromMetaData (meta, EXTRACTOR_MIMETYPE);
+ mime = GNUNET_ECRS_meta_data_get_by_type (meta, EXTRACTOR_MIMETYPE);
if (mime == NULL)
mime = GNUNET_strdup (_("unknown"));
- return validate_utf8 (mime);
+ return GNUNET_GTK_validate_utf8 (mime);
}
char *
-getFileNameFromMetaData (const struct ECRS_MetaData *meta)
+getFileNameFromMetaData (const struct GNUNET_ECRS_MetaData *meta)
{
char *name;
- name = ECRS_getFirstFromMetaData (meta,
+ name = GNUNET_ECRS_meta_data_get_first_by_types (meta,
EXTRACTOR_FILENAME,
EXTRACTOR_TITLE,
EXTRACTOR_ARTIST,
@@ -486,15 +486,15 @@
while (NULL != (dotdot = strstr (name, "..")))
dotdot[0] = dotdot[1] = '_';
}
- return validate_utf8 (name);
+ return GNUNET_GTK_validate_utf8 (name);
}
char *
-getDescriptionFromMetaData (const struct ECRS_MetaData *meta)
+getDescriptionFromMetaData (const struct GNUNET_ECRS_MetaData *meta)
{
char *desc;
- desc = ECRS_getFirstFromMetaData (meta,
+ desc = GNUNET_ECRS_meta_data_get_first_by_types (meta,
EXTRACTOR_DESCRIPTION,
EXTRACTOR_GENRE,
EXTRACTOR_ALBUM,
@@ -504,11 +504,11 @@
EXTRACTOR_SIZE, EXTRACTOR_KEYWORDS, -1);
if (desc == NULL)
desc = GNUNET_strdup ("");
- return validate_utf8 (desc);
+ return GNUNET_GTK_validate_utf8 (desc);
}
GdkPixbuf *
-getThumbnailFromMetaData (const struct ECRS_MetaData * meta)
+getThumbnailFromMetaData (const struct GNUNET_ECRS_MetaData * meta)
{
GdkPixbuf *pixbuf;
GdkPixbufLoader *loader;
@@ -516,7 +516,7 @@
unsigned char *thumb;
thumb = NULL;
- ts = ECRS_getThumbnailFromMetaData (meta, &thumb);
+ ts = GNUNET_ECRS_meta_data_get_thumbnail (meta, &thumb);
if (ts != 0)
{
loader = gdk_pixbuf_loader_new ();
Modified: gnunet-gtk/src/plugins/fs/meta.h
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.h 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/plugins/fs/meta.h 2007-11-25 12:05:41 UTC (rev 5757)
@@ -33,11 +33,11 @@
void createMetaDataListTreeView (GladeXML * xml,
const char *name,
const char *previewName,
- const struct ECRS_MetaData *init);
+ const struct GNUNET_ECRS_MetaData *init);
void createKeywordListTreeView (GladeXML * xml,
const char *name,
- const struct ECRS_URI *init);
+ const struct GNUNET_ECRS_URI *init);
void createMetaTypeComboBox (GladeXML * xml, const char *name);
@@ -52,11 +52,11 @@
void handleListRemove (GladeXML * xml, const char *listName);
-struct ECRS_MetaData *getMetaDataFromList (GladeXML * xml,
+struct GNUNET_ECRS_MetaData *getMetaDataFromList (GladeXML * xml,
const char *name,
const char *preview);
-struct ECRS_URI *getKeywordURIFromList (GladeXML * xml, const char *name);
+struct GNUNET_ECRS_URI *getKeywordURIFromList (GladeXML * xml, const char
*name);
char *updateIntervalToString (GNUNET_Int32Time interval);
@@ -66,11 +66,11 @@
int parseTimeInterval (const char *frequency, GNUNET_Int32Time * interval);
-char *getMimeTypeFromMetaData (const struct ECRS_MetaData *meta);
+char *getMimeTypeFromMetaData (const struct GNUNET_ECRS_MetaData *meta);
-char *getFileNameFromMetaData (const struct ECRS_MetaData *meta);
+char *getFileNameFromMetaData (const struct GNUNET_ECRS_MetaData *meta);
-char *getDescriptionFromMetaData (const struct ECRS_MetaData *meta);
+char *getDescriptionFromMetaData (const struct GNUNET_ECRS_MetaData *meta);
unsigned int getSpinButtonValue (GladeXML * xml, const char *spinButtonName);
@@ -78,7 +78,7 @@
const char *getEntryLineValue (GladeXML * xml, const char *widgetName);
-GdkPixbuf *getThumbnailFromMetaData (const struct ECRS_MetaData *meta);
+GdkPixbuf *getThumbnailFromMetaData (const struct GNUNET_ECRS_MetaData *meta);
GtkWidget *extractMainWidgetFromWindow (GladeXML * xml,
const char *windowName);
Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c 2007-11-25 12:05:27 UTC (rev
5756)
+++ gnunet-gtk/src/plugins/fs/namespace.c 2007-11-25 12:05:41 UTC (rev
5757)
@@ -50,7 +50,7 @@
GtkTreeModel *model;
char *name;
GNUNET_HashCode id;
- struct ECRS_MetaData *meta;
+ struct GNUNET_ECRS_MetaData *meta;
} NamespaceList;
/**
@@ -116,9 +116,9 @@
DEBUG_BEGIN ();
namespaceXML
- = glade_xml_new (getGladeFileName (),
- "namespaceContentFrame", PACKAGE_NAME);
- connectGladeWithPlugins (namespaceXML);
+ = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+ "namespaceContentFrame", PACKAGNUNET_GENAME);
+ GNUNET_GTK_connect_glade_with_plugins (namespaceXML);
child = extractMainWidgetFromWindow (namespaceXML, "namespaceContentFrame");
resultList = glade_xml_get_widget (namespaceXML,
"namespaceContentFrameTreeView");
@@ -299,7 +299,7 @@
*/
static int
addNamespaceContentToModel (void *cls,
- const ECRS_FileInfo * fi,
+ const GNUNET_ECRS_FileInfo * fi,
const GNUNET_HashCode * lastId,
const GNUNET_HashCode * nextId,
GNUNET_Int32Time publicationFrequency,
@@ -319,7 +319,7 @@
char *size_h;
DEBUG_BEGIN ();
- filename = ECRS_getFirstFromMetaData (fi->meta,
+ filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
EXTRACTOR_FILENAME,
EXTRACTOR_TITLE,
EXTRACTOR_ARTIST,
@@ -337,7 +337,7 @@
while (NULL != (dotdot = strstr (filename, "..")))
dotdot[0] = dotdot[1] = '_';
}
- desc = ECRS_getFirstFromMetaData (fi->meta,
+ desc = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
EXTRACTOR_DESCRIPTION,
EXTRACTOR_GENRE,
EXTRACTOR_ALBUM,
@@ -347,22 +347,22 @@
EXTRACTOR_SIZE, EXTRACTOR_KEYWORDS, -1);
if (desc == NULL)
desc = GNUNET_strdup ("");
- mime = ECRS_getFromMetaData (fi->meta, EXTRACTOR_MIMETYPE);
+ mime = GNUNET_ECRS_meta_data_get_by_type (fi->meta, EXTRACTOR_MIMETYPE);
if (mime == NULL)
mime = GNUNET_strdup (_("unknown"));
- if (ECRS_isFileUri (fi->uri))
- size = ECRS_fileSize (fi->uri);
+ if (GNUNET_ECRS_uri_test_chk (fi->uri))
+ size = GNUNET_ECRS_uri_get_file_siz (fi->uri);
else
size = 0;
- uriString = ECRS_uriToString (fi->uri);
+ uriString = GNUNET_ECRS_uri_to_string (fi->uri);
GNUNET_hash_to_enc (lastId, &last);
if (nextId != NULL)
GNUNET_hash_to_enc (nextId, &next);
else
memset (&next, 0, sizeof (GNUNET_EncName));
- if (publicationFrequency == ECRS_SBLOCK_UPDATE_SPORADIC)
+ if (publicationFrequency == GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC)
date = GNUNET_strdup (_("unspecified"));
- else if (publicationFrequency == ECRS_SBLOCK_UPDATE_NONE)
+ else if (publicationFrequency == GNUNET_ECRS_SBLOCK_UPDATE_NONE)
date = GNUNET_strdup (_("never"));
else
date = GNUNET_int32_time_to_string (&nextPublicationTime);
@@ -383,8 +383,8 @@
IN_NAMESPACE_NEXT_STRING, &next,
IN_NAMESPACE_PUB_FREQ_STRING, freq,
IN_NAMESPACE_PUB_DATE_STRING, date,
- IN_NAMESPACE_URI, ECRS_dupUri (fi->uri),
- IN_NAMESPACE_META, ECRS_dupMetaData (fi->meta), -1);
+ IN_NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri),
+ IN_NAMESPACE_META, GNUNET_ECRS_meta_data_duplicate
(fi->meta), -1);
GNUNET_free (size_h);
GNUNET_free (filename);
GNUNET_free (uriString);
@@ -402,36 +402,36 @@
addTabForNamespace (void *unused,
const char *namespaceName,
const GNUNET_HashCode * namespaceId,
- const struct ECRS_MetaData *md, int rating)
+ const struct GNUNET_ECRS_MetaData *md, int rating)
{
NamespaceList *list;
GtkWidget *label;
GtkWidget *notebook;
GtkWidget *del_menu;
- if (GNUNET_OK != ECRS_testNamespaceExists (NULL, cfg, namespaceName,
namespaceId))
+ if (GNUNET_OK != GNUNET_ECRS_namespace_test_exists (NULL, cfg,
namespaceName, namespaceId))
return GNUNET_OK;
DEBUG_BEGIN ();
label = gtk_label_new (namespaceName);
list = GNUNET_malloc (sizeof (NamespaceList));
list->name = GNUNET_strdup (namespaceName);
list->id = *namespaceId;
- list->meta = ECRS_dupMetaData (md);
+ list->meta = GNUNET_ECRS_meta_data_duplicate (md);
makeNamespaceFrame (list);
list->next = head;
head = list;
/* update sensitivity of add button */
on_namespaceContentSelectionChanged (NULL, NULL);
- notebook = glade_xml_get_widget (getMainXML (), "localNamespacesNotebook");
+ notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"localNamespacesNotebook");
gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
list->namespacepage, label);
gtk_widget_show (notebook);
- NS_listNamespaceContent
+ GNUNET_NS_namespace_list_contents
(ectx, cfg, namespaceName, &addNamespaceContentToModel, list->model);
DEBUG_END ();
/* enable "delete" menu entry */
- del_menu = glade_xml_get_widget (getMainXML (), "namespaceDelete");
+ del_menu = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"namespaceDelete");
gtk_widget_set_sensitive (del_menu, TRUE);
return GNUNET_OK;
}
@@ -441,8 +441,8 @@
frame_destroy (GtkWidget * tree)
{
GtkTreeIter iter;
- struct ECRS_URI *u;
- struct ECRS_MetaData *m;
+ struct GNUNET_ECRS_URI *u;
+ struct GNUNET_ECRS_MetaData *m;
NamespaceList *prev;
NamespaceList *pos;
NamespaceList *next;
@@ -460,7 +460,7 @@
}
if (pos == NULL)
{
- GE_BREAK (NULL, 0);
+ GNUNET_GEBREAK (NULL, 0);
return;
}
if (prev == NULL)
@@ -468,7 +468,7 @@
else
prev->next = pos->next;
GNUNET_free (pos->name);
- ECRS_freeMetaData (pos->meta);
+ GNUNET_ECRS_meta_data_destroy (pos->meta);
if (gtk_tree_model_get_iter_first (pos->model, &iter))
{
do
@@ -482,14 +482,14 @@
IN_NAMESPACE_URI, NULL,
IN_NAMESPACE_META, NULL, -1);
if (u != NULL)
- ECRS_freeUri (u);
+ GNUNET_ECRS_uri_destroy (u);
if (m != NULL)
- ECRS_freeMetaData (m);
+ GNUNET_ECRS_meta_data_destroy (m);
}
while (gtk_tree_model_iter_next (pos->model, &iter));
}
GNUNET_free (pos);
- del_menu = glade_xml_get_widget (getMainXML (), "namespaceDelete");
+ del_menu = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"namespaceDelete");
gtk_widget_set_sensitive (del_menu, head != NULL);
}
@@ -507,7 +507,7 @@
gint ret;
DEBUG_BEGIN ();
- notebook = glade_xml_get_widget (getMainXML (), "localNamespacesNotebook");
+ notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"localNamespacesNotebook");
num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
if (num == -1)
{
@@ -516,7 +516,7 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGE_ERROR,
+ GTK_MESSAGNUNET_GEERROR,
GTK_BUTTONS_CLOSE,
_("No local namespaces available that could be deleted!"));
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -533,7 +533,7 @@
}
if (list == NULL)
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
return;
}
/* open window to ask for confirmation,
@@ -542,7 +542,7 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGE_ERROR,
+ GTK_MESSAGNUNET_GEERROR,
GTK_BUTTONS_YES_NO,
_("Should the namespace `%s' really be deleted?"), list->name);
ret = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -550,7 +550,7 @@
if (GTK_RESPONSE_YES != ret)
return;
gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), num);
- NS_deleteNamespace (ectx, cfg, list->name);
+ GNUNET_NS_namespace_delete (ectx, cfg, list->name);
frame_destroy (list->treeview);
DEBUG_END ();
}
@@ -574,11 +574,11 @@
GtkTreePath * path, GtkTreeIter * iter, gpointer data)
{
IUC *cls = data;
- struct ECRS_URI *resultURI;
- struct ECRS_URI *dst;
- struct ECRS_MetaData *meta;
+ struct GNUNET_ECRS_URI *resultURI;
+ struct GNUNET_ECRS_URI *dst;
+ struct GNUNET_ECRS_MetaData *meta;
NamespaceList *list;
- ECRS_FileInfo fi;
+ GNUNET_ECRS_FileInfo fi;
DEBUG_BEGIN ();
dst = NULL;
@@ -586,10 +586,10 @@
iter, NAMESPACE_URI, &dst, NAMESPACE_META, &meta, -1);
if (dst == NULL)
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
return;
}
- resultURI = NS_addToNamespace (ectx, cfg, cls->anonymityLevel, 1000, /*
FIXME: priority */
+ resultURI = GNUNET_NS_add_to_namespace (ectx, cfg, cls->anonymityLevel,
1000, /* FIXME: priority */
GNUNET_get_time () + 2 * GNUNET_CRON_YEARS,
/* FIXME: expiration */
cls->namespaceName,
cls->updateInterval,
@@ -602,7 +602,7 @@
list = list->next;
if (list == NULL)
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
}
else
{
@@ -616,11 +616,11 @@
cls->updateInterval,
cls->updateInterval +
GNUNET_get_time_int32 (NULL));
}
- ECRS_freeUri (resultURI);
+ GNUNET_ECRS_uri_destroy (resultURI);
}
else
{
- infoMessage (GNUNET_YES,
+ GNUNET_GTK_show_info_message (GNUNET_YES,
_("Failed to insert content into namespace "
"(consult logs).\n"));
}
@@ -658,24 +658,24 @@
IUC cls;
gint num;
- notebook = glade_xml_get_widget (getMainXML (), "localNamespacesNotebook");
+ notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"localNamespacesNotebook");
num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
- GE_ASSERT (ectx, num != -1);
+ GNUNET_GEASSERT (ectx, num != -1);
page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), num);
list = head;
while ((list != NULL) && (list->namespacepage != page))
list = list->next;
if (list == NULL)
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
return;
}
cls.namespaceName = list->name;
metaXML
- = glade_xml_new (getGladeFileName (),
- "namespaceInsertDialog", PACKAGE_NAME);
- connectGladeWithPlugins (metaXML);
+ = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+ "namespaceInsertDialog", PACKAGNUNET_GENAME);
+ GNUNET_GTK_connect_glade_with_plugins (metaXML);
dialog = glade_xml_get_widget (metaXML, "namespaceInsertDialog");
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -698,7 +698,7 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGE_ERROR,
+ GTK_MESSAGNUNET_GEERROR,
GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -725,7 +725,7 @@
GNUNET_hash (identifierName, strlen (identifierName), &nextId);
cls.nextId = &nextId;
}
- ggc_tree_selection_selected_foreach
+ GNUNET_GTK_tree_selection_selected_foreach
(content_selection, &addToNamespaceCB, &cls);
}
gtk_widget_destroy (dialog);
@@ -764,16 +764,16 @@
DEBUG_BEGIN ();
/* find out which namespace this is about */
- notebook = glade_xml_get_widget (getMainXML (), "localNamespacesNotebook");
+ notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"localNamespacesNotebook");
num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
- GE_ASSERT (ectx, num != -1);
+ GNUNET_GEASSERT (ectx, num != -1);
page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), num);
list = head;
while ((list != NULL) && (list->namespacepage != page))
list = list->next;
if (list == NULL)
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
return;
}
cls.namespaceName = list->name;
@@ -782,7 +782,7 @@
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list->treeview));
if (TRUE != gtk_tree_selection_get_selected (selection, NULL, &iter))
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
return;
}
gtk_tree_model_get (list->model,
@@ -792,20 +792,20 @@
IN_NAMESPACE_PUB_FREQ_STRING, &freq, -1);
if ((last == NULL) || (next == NULL) || (freq == NULL))
{
- GE_BREAK (NULL, 0);
+ GNUNET_GEBREAK (NULL, 0);
return;
}
if (GNUNET_OK != parseTimeInterval (freq, &cls.updateInterval))
{
- GE_BREAK (ectx, 0);
- cls.updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC;
+ GNUNET_GEBREAK (ectx, 0);
+ cls.updateInterval = GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC;
}
/* create update dialog */
metaXML
- = glade_xml_new (getGladeFileName (),
- "namespaceUpdateDialog", PACKAGE_NAME);
- connectGladeWithPlugins (metaXML);
+ = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+ "namespaceUpdateDialog", PACKAGNUNET_GENAME);
+ GNUNET_GTK_connect_glade_with_plugins (metaXML);
dialog = glade_xml_get_widget (metaXML, "namespaceUpdateDialog");
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
identifierLabel = glade_xml_get_widget (metaXML, "identifierLabel");
@@ -815,8 +815,8 @@
GNUNET_enc_to_hash (next, &cls.thisId);
nextEntryLine = glade_xml_get_widget (metaXML, "nextIdentifierEntry");
- if ((cls.updateInterval != ECRS_SBLOCK_UPDATE_SPORADIC) &&
- (GNUNET_OK == NS_computeNextId (NULL,
+ if ((cls.updateInterval != GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC) &&
+ (GNUNET_OK == GNUNET_NS_compute_next_identifier (NULL,
cfg,
cls.namespaceName,
&lastId,
@@ -856,7 +856,7 @@
mdialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGE_ERROR,
+ GTK_MESSAGNUNET_GEERROR,
GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
gtk_dialog_run (GTK_DIALOG (mdialog));
gtk_widget_destroy (mdialog);
@@ -866,7 +866,7 @@
= getSpinButtonValue (metaXML, "namespaceUpdateAnonymitySpinButton");
/* run actual update */
- ggc_tree_selection_selected_foreach
+ GNUNET_GTK_tree_selection_selected_foreach
(content_selection, &addToNamespaceCB, &cls);
CLEANUP:
gtk_widget_destroy (dialog);
@@ -892,13 +892,13 @@
DEBUG_BEGIN ();
trackCheckButton
- = glade_xml_get_widget (getMainXML (), "trackingCheckButton");
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"trackingCheckButton");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (trackCheckButton),
- URITRACK_trackStatus (ectx,
+ GNUNET_URITRACK_get_tracking_status (ectx,
cfg) ==
GNUNET_YES ? TRUE : FALSE);
- contentList = glade_xml_get_widget (getMainXML (), "availableContentList");
+ contentList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"availableContentList");
model = gtk_list_store_new (NAMESPACE_NUM, G_TYPE_STRING, /* name */
G_TYPE_UINT64, /* size */
@@ -961,9 +961,9 @@
gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
(GTK_TREE_VIEW (contentList), col - 1),
TRUE);
- URITRACK_registerTrackCallback (ectx, cfg, &updateViewSave, NULL);
- NS_listNamespaces (ectx, cfg, &addTabForNamespace, NULL);
- NS_registerDiscoveryCallback (ectx, cfg, &namespace_discovered_cb, NULL);
+ GNUNET_URITRACK_register_track_callback (ectx, cfg, &updateViewSave, NULL);
+ GNUNET_NS_namespace_list_all (ectx, cfg, &addTabForNamespace, NULL);
+ GNUNET_NS_register_discovery_callback (ectx, cfg, &namespace_discovered_cb,
NULL);
DEBUG_END ();
}
@@ -971,10 +971,10 @@
void
fs_namespace_stop ()
{
- NS_unregisterDiscoveryCallback (&namespace_discovered_cb, NULL);
+ GNUNET_NS_unregister_discovery_callback (&namespace_discovered_cb, NULL);
while (head != NULL)
frame_destroy (head->treeview);
- URITRACK_unregisterTrackCallback (&updateViewSave, NULL);
+ GNUNET_URITRACK_unregister_track_callback (&updateViewSave, NULL);
}
/* end of namespace.c */
Modified: gnunet-gtk/src/plugins/fs/namespace.h
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.h 2007-11-25 12:05:27 UTC (rev
5756)
+++ gnunet-gtk/src/plugins/fs/namespace.h 2007-11-25 12:05:41 UTC (rev
5757)
@@ -33,7 +33,7 @@
int addTabForNamespace (void *unused,
const char *namespaceName,
const GNUNET_HashCode * namespaceId,
- const struct ECRS_MetaData *md, int rating);
+ const struct GNUNET_ECRS_MetaData *md, int rating);
void fs_namespace_start (void);
Modified: gnunet-gtk/src/plugins/fs/namespace_create.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_create.c 2007-11-25 12:05:27 UTC
(rev 5756)
+++ gnunet-gtk/src/plugins/fs/namespace_create.c 2007-11-25 12:05:41 UTC
(rev 5757)
@@ -167,17 +167,17 @@
GtkWidget *nameLine;
GtkWidget *dialog;
GtkWidget *spin;
- struct ECRS_MetaData *meta;
- struct ECRS_URI *keywordURI;
- struct ECRS_URI *root;
+ struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_ECRS_URI *keywordURI;
+ struct GNUNET_ECRS_URI *root;
GNUNET_HashCode namespaceId;
GNUNET_HashCode rootEntry;
DEBUG_BEGIN ();
metaXML
- = glade_xml_new (getGladeFileName (),
- "namespaceMetaDataDialog", PACKAGE_NAME);
- connectGladeWithPlugins (metaXML);
+ = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+ "namespaceMetaDataDialog", PACKAGNUNET_GENAME);
+ GNUNET_GTK_connect_glade_with_plugins (metaXML);
dialog = glade_xml_get_widget (metaXML, "namespaceMetaDataDialog");
createMetaDataListTreeView (metaXML,
"namespaceMetaDataDialogMetaDataList",
@@ -217,14 +217,14 @@
GNUNET_hash (namespaceName, strlen (namespaceName), &rootEntry);
nameLine = glade_xml_get_widget (metaXML, "namespaceNameEntry");
namespaceName = gtk_entry_get_text (GTK_ENTRY (nameLine));
- root = NS_createNamespace (ectx, cfg, gtk_spin_button_get_value_as_int
(GTK_SPIN_BUTTON (spin)), 1000, /* FIXME: priority */
+ root = GNUNET_NS_namespace_create (ectx, cfg,
gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)), 1000, /* FIXME:
priority */
GNUNET_get_time () + 2 * GNUNET_CRON_YEARS,
/* FIXME: expiration */
namespaceName, meta, keywordURI, &rootEntry);
if (root != NULL)
{
- ECRS_getNamespaceId (root, &namespaceId);
+ GNUNET_ECRS_uri_get_namespace_from_sks (root, &namespaceId);
addTabForNamespace (NULL, namespaceName, &namespaceId, meta, 0);
- ECRS_freeUri (root);
+ GNUNET_ECRS_uri_destroy (root);
}
else
{
@@ -237,7 +237,7 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGE_ERROR,
+ GTK_MESSAGNUNET_GEERROR,
GTK_BUTTONS_CLOSE,
_("Failed to create namespace `%s'."
"Consult logs, most likely error is"
@@ -246,8 +246,8 @@
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
- ECRS_freeMetaData (meta);
- ECRS_freeUri (keywordURI);
+ GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_ECRS_uri_destroy (keywordURI);
}
gtk_widget_destroy (dialog);
UNREF (metaXML);
Modified: gnunet-gtk/src/plugins/fs/namespace_search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_search.c 2007-11-25 12:05:27 UTC
(rev 5756)
+++ gnunet-gtk/src/plugins/fs/namespace_search.c 2007-11-25 12:05:41 UTC
(rev 5757)
@@ -53,8 +53,8 @@
int newrating;
DEBUG_BEGIN ();
- spin = glade_xml_get_widget (getMainXML (), "namespaceRatingSpinButton");
- ncbe = glade_xml_get_widget (getMainXML (), "searchNamespaceComboBoxEntry");
+ spin = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"namespaceRatingSpinButton");
+ ncbe = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"searchNamespaceComboBoxEntry");
model = gtk_combo_box_get_model (GTK_COMBO_BOX (ncbe));
description = NULL;
encStr = NULL;
@@ -75,13 +75,13 @@
if (encStr != NULL)
{
newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
- rating = NS_rankNamespace (ectx,
+ rating = GNUNET_NS_namespace_rank (ectx,
cfg, encStr, newrating - rating);
if (rating != newrating)
{
/* concurrent modification? */
gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), rating);
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
}
gtk_list_store_set (GTK_LIST_STORE (model),
&iter, NS_SEARCH_RATING, rating, -1);
@@ -125,8 +125,8 @@
GNUNET_EncName enc;
DEBUG_BEGIN ();
- spin = glade_xml_get_widget (getMainXML (), "namespaceRatingSpinButton");
- ncbe = glade_xml_get_widget (getMainXML (), "searchNamespaceComboBoxEntry");
+ spin = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"namespaceRatingSpinButton");
+ ncbe = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"searchNamespaceComboBoxEntry");
model = gtk_combo_box_get_model (GTK_COMBO_BOX (ncbe));
descStr = NULL;
encStr = NULL;
@@ -148,9 +148,9 @@
gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), rating);
gtk_widget_set_sensitive (spin, TRUE);
keyword
- = glade_xml_get_widget (getMainXML (),
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"fssearchKeywordComboBoxEntry");
- if (GNUNET_OK == NS_getNamespaceRoot (ectx, cfg, encStr, &root))
+ if (GNUNET_OK == GNUNET_NS_namespace_get_root (ectx, cfg, encStr,
&root))
{
GNUNET_hash_to_enc (&root, &enc);
gtk_entry_set_text (GTK_ENTRY
@@ -181,7 +181,7 @@
{
const char *namespaceName;
const GNUNET_HashCode *namespaceId;
- const struct ECRS_MetaData *md;
+ const struct GNUNET_ECRS_MetaData *md;
int rating;
};
@@ -194,7 +194,7 @@
GtkTreeIter iter;
GNUNET_EncName enc;
char *name;
- struct ECRS_MetaData *dmd;
+ struct GNUNET_ECRS_MetaData *dmd;
GtkWidget *ncbe;
char *desc;
size_t n;
@@ -202,7 +202,7 @@
char *encName;
DEBUG_BEGIN ();
- ncbe = glade_xml_get_widget (getMainXML (), "searchNamespaceComboBoxEntry");
+ ncbe = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"searchNamespaceComboBoxEntry");
model = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (ncbe)));
GNUNET_hash_to_enc (nni->namespaceId, &enc);
if (nni->md == NULL)
@@ -212,8 +212,8 @@
}
else
{
- dmd = ECRS_dupMetaData (nni->md);
- desc = ECRS_getFirstFromMetaData (dmd,
+ dmd = GNUNET_ECRS_meta_data_duplicate (nni->md);
+ desc = GNUNET_ECRS_meta_data_get_first_by_types (dmd,
EXTRACTOR_DESCRIPTION,
EXTRACTOR_TITLE,
EXTRACTOR_AUTHOR,
@@ -250,7 +250,7 @@
}
if (found == GNUNET_NO)
{
- infoMessage (GNUNET_YES, _("Namespace found: %s - %.*s\n"), desc, 20,
&enc);
+ GNUNET_GTK_show_info_message (GNUNET_YES, _("Namespace found: %s -
%.*s\n"), desc, 20, &enc);
gtk_list_store_append (model, &iter);
gtk_list_store_set (model,
&iter,
@@ -281,13 +281,13 @@
namespace_discovered_cb (void *cls,
const char *namespaceName,
const GNUNET_HashCode * namespaceId,
- const struct ECRS_MetaData *md, int rating)
+ const struct GNUNET_ECRS_MetaData *md, int rating)
{
struct NewNamespaceInfo nni;
nni.namespaceName = namespaceName;
nni.namespaceId = namespaceId;
nni.md = md;
nni.rating = rating;
- gtkSaveCall (&saveDiscovery, &nni);
+ GNUNET_GTK_save_call (&saveDiscovery, &nni);
return GNUNET_OK;
}
Modified: gnunet-gtk/src/plugins/fs/namespace_search.h
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_search.h 2007-11-25 12:05:27 UTC
(rev 5756)
+++ gnunet-gtk/src/plugins/fs/namespace_search.h 2007-11-25 12:05:41 UTC
(rev 5757)
@@ -39,7 +39,7 @@
int namespace_discovered_cb (void *cls,
const char *namespaceName,
const GNUNET_HashCode * namespaceId,
- const struct ECRS_MetaData *md, int rating);
+ const struct GNUNET_ECRS_MetaData *md, int
rating);
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/plugins/fs/search.c 2007-11-25 12:05:41 UTC (rev 5757)
@@ -73,7 +73,7 @@
if (TRUE !=
gtk_tree_model_get_iter (GTK_TREE_MODEL (search_summary), &iter, path))
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
return;
}
gtk_tree_path_free (path);
@@ -104,7 +104,7 @@
void
addEntryToSearchTree (SearchList * searchContext,
DownloadList * downloadParent,
- const ECRS_FileInfo * info, GtkTreeIter * iter)
+ const GNUNET_ECRS_FileInfo * info, GtkTreeIter * iter)
{
char *name;
char *mime;
@@ -114,12 +114,12 @@
GdkPixbuf *pixbuf;
enum URITRACK_STATE state;
- state = URITRACK_getState (ectx, cfg, info->uri);
+ state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri);
mime = getMimeTypeFromMetaData (info->meta);
desc = getDescriptionFromMetaData (info->meta);
name = getFileNameFromMetaData (info->meta);
- size = ECRS_isFileUri (info->uri)
- || ECRS_isLocationUri (info->uri) ? ECRS_fileSize (info->uri) : 0;
+ size = GNUNET_ECRS_uri_test_chk (info->uri)
+ || GNUNET_ECRS_uri_test_loc (info->uri) ? GNUNET_ECRS_uri_get_file_siz
(info->uri) : 0;
pixbuf = getThumbnailFromMetaData (info->meta);
size_h = GNUNET_get_byte_size_as_fancy_string (size);
gtk_tree_store_set (searchContext->tree,
@@ -130,8 +130,8 @@
SEARCH_MIME, mime,
SEARCH_DESC, desc,
SEARCH_PIXBUF, pixbuf,
- SEARCH_URI, ECRS_dupUri (info->uri),
- SEARCH_META, ECRS_dupMetaData (info->meta),
+ SEARCH_URI, GNUNET_ECRS_uri_duplicate (info->uri),
+ SEARCH_META, GNUNET_ECRS_meta_data_duplicate
(info->meta),
SEARCH_CELL_BG_COLOR, getColorCode (state),
SEARCH_CELL_FG_COLOR, "black",
SEARCH_INTERNAL, searchContext,
@@ -154,17 +154,17 @@
*/
void
fs_search_result_received (SearchList * searchContext,
- const ECRS_FileInfo * info,
- const struct ECRS_URI *uri)
+ const GNUNET_ECRS_FileInfo * info,
+ const struct GNUNET_ECRS_URI *uri)
{
GtkTreeStore *model;
GtkTreeIter iter;
enum URITRACK_STATE state;
- state = URITRACK_getState (ectx, cfg, info->uri);
- if ((state & (URITRACK_INSERTED |
- URITRACK_INDEXED)) &&
- (GNUNET_YES == GC_get_configuration_value_yesno (cfg,
+ state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri);
+ if ((state & (GNUNET_URITRACK_INSERTED |
+ GNUNET_URITRACK_INDEXED)) &&
+ (GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg,
"GNUNET-GTK",
"DISABLE-OWN", GNUNET_YES)))
return;
@@ -181,7 +181,7 @@
SearchList *list = cls;
GtkTreePath *path;
GtkTreeIter iter;
- struct ECRS_URI *uri;
+ struct GNUNET_ECRS_URI *uri;
char *str;
GtkClipboard *clip;
@@ -191,13 +191,13 @@
list->last_y,
&path, NULL, NULL, NULL))
{
- GE_BREAK (NULL, 0);
+ GNUNET_GEBREAK (NULL, 0);
return FALSE;
}
if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (list->tree),
&iter, path))
{
- GE_BREAK (NULL, 0);
+ GNUNET_GEBREAK (NULL, 0);
gtk_tree_path_free (path);
return FALSE;
}
@@ -205,7 +205,7 @@
uri = NULL;
gtk_tree_model_get (GTK_TREE_MODEL (list->tree),
&iter, SEARCH_URI, &uri, -1);
- str = ECRS_uriToString (uri);
+ str = GNUNET_ECRS_uri_to_string (uri);
clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
gtk_clipboard_set_text (clip, str, strlen (str));
GNUNET_free (str);
@@ -222,9 +222,9 @@
char *ret;
uploadXML
- = glade_xml_new (getGladeFileName (),
- "directorySaveDialog", PACKAGE_NAME);
- connectGladeWithPlugins (uploadXML);
+ = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+ "directorySaveDialog", PACKAGNUNET_GENAME);
+ GNUNET_GTK_connect_glade_with_plugins (uploadXML);
dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
"directorySaveDialog"));
if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_CANCEL)
@@ -256,8 +256,8 @@
char *directory;
unsigned long long dir_len;
unsigned int fis_size;
- ECRS_FileInfo *fis;
- struct ECRS_MetaData *meta;
+ GNUNET_ECRS_FileInfo *fis;
+ struct GNUNET_ECRS_MetaData *meta;
GtkTreeModel *model;
GtkTreeIter iter;
unsigned int pos;
@@ -265,7 +265,7 @@
model = gtk_tree_view_get_model (list->treeview);
if (TRUE != gtk_tree_model_get_iter_first (model, &iter))
{
- addLogEntry (_("No search results yet, cannot save!"));
+ GNUNET_GTK_add_log_entry (_("No search results yet, cannot save!"));
return FALSE;
}
@@ -287,25 +287,25 @@
pos++;
}
while (gtk_tree_model_iter_next (model, &iter));
- meta = ECRS_createMetaData ();
- ECRS_addToMetaData (meta, EXTRACTOR_KEYWORDS, list->searchString);
- ECRS_addToMetaData (meta, EXTRACTOR_DESCRIPTION, _("Saved search results"));
- ECRS_addToMetaData (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
- if (GNUNET_OK != ECRS_createDirectory (NULL,
+ meta = GNUNET_ECRS_meta_data_create ();
+ GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_KEYWORDS, list->searchString);
+ GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_DESCRIPTION, _("Saved search
results"));
+ GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
+ if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL,
&directory, &dir_len, fis_size, fis, meta))
{
- addLogEntry (_("Internal error."));
- GE_BREAK (NULL, 0);
- ECRS_freeMetaData (meta);
+ GNUNET_GTK_add_log_entry (_("Internal error."));
+ GNUNET_GEBREAK (NULL, 0);
+ GNUNET_ECRS_meta_data_destroy (meta);
GNUNET_array_grow (fis, fis_size, 0);
GNUNET_free (name);
return FALSE;
}
- ECRS_freeMetaData (meta);
+ GNUNET_ECRS_meta_data_destroy (meta);
GNUNET_array_grow (fis, fis_size, 0);
if (GNUNET_OK != GNUNET_disk_file_write (NULL, name, directory, dir_len,
"644"))
{
- addLogEntry (_("Error writing file `%s'."), name);
+ GNUNET_GTK_add_log_entry (_("Error writing file `%s'."), name);
}
GNUNET_free (directory);
GNUNET_free (name);
@@ -357,11 +357,11 @@
* tab and add an entry to the summary.
*/
SearchList *
-fs_search_started (struct FSUI_SearchList * fsui_list,
- const struct ECRS_URI * uri,
+fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
+ const struct GNUNET_ECRS_URI * uri,
unsigned int anonymityLevel,
unsigned int resultCount,
- const ECRS_FileInfo * results, FSUI_State state)
+ const GNUNET_ECRS_FileInfo * results, GNUNET_FSUI_State
state)
{
SearchList *list;
gint pages;
@@ -375,29 +375,29 @@
int col;
int i;
- description = ECRS_uriToString (uri);
+ description = GNUNET_ECRS_uri_to_string (uri);
if (description == NULL)
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
return NULL;
}
- GE_ASSERT (ectx, strlen (description) >= strlen (ECRS_URI_PREFIX));
- dhead = &description[strlen (ECRS_URI_PREFIX)];
- if (0 == strncmp (dhead, ECRS_SEARCH_INFIX, strlen (ECRS_SEARCH_INFIX)))
- dhead = &dhead[strlen (ECRS_SEARCH_INFIX)];
+ GNUNET_GEASSERT (ectx, strlen (description) >= strlen
(GNUNET_ECRS_URI_PREFIX));
+ dhead = &description[strlen (GNUNET_ECRS_URI_PREFIX)];
+ if (0 == strncmp (dhead, GNUNET_ECRS_SEARCH_INFIX, strlen
(GNUNET_ECRS_SEARCH_INFIX)))
+ dhead = &dhead[strlen (GNUNET_ECRS_SEARCH_INFIX)];
else if (0 == strncmp (dhead,
- ECRS_SUBSPACE_INFIX, strlen (ECRS_SUBSPACE_INFIX)))
- dhead = &dhead[strlen (ECRS_SUBSPACE_INFIX)];
+ GNUNET_ECRS_SUBSPACE_INFIX, strlen
(GNUNET_ECRS_SUBSPACE_INFIX)))
+ dhead = &dhead[strlen (GNUNET_ECRS_SUBSPACE_INFIX)];
list = GNUNET_malloc (sizeof (SearchList));
memset (list, 0, sizeof (SearchList));
list->searchString = GNUNET_strdup (dhead);
- list->uri = ECRS_dupUri (uri);
+ list->uri = GNUNET_ECRS_uri_duplicate (uri);
list->fsui_list = fsui_list;
list->next = search_head;
search_head = list;
list->searchXML
- = glade_xml_new (getGladeFileName (), "searchResultsFrame", PACKAGE_NAME);
- connectGladeWithPlugins (list->searchXML);
+ = glade_xml_new (GNUNET_GTK_get_glade_filename (), "searchResultsFrame",
PACKAGNUNET_GENAME);
+ GNUNET_GTK_connect_glade_with_plugins (list->searchXML);
list->searchpage
= extractMainWidgetFromWindow (list->searchXML, "searchResultsFrame");
/* setup tree view and renderers */
@@ -477,7 +477,7 @@
gtk_tree_view_column_set_reorderable (column, TRUE);
gtk_tree_view_column_set_sort_column_id (column, SEARCH_MIME);
- if (GNUNET_YES != GC_get_configuration_value_yesno (cfg,
+ if (GNUNET_YES != GNUNET_GC_get_configuration_value_yesno (cfg,
"GNUNET-GTK",
"DISABLE-PREVIEWS", GNUNET_NO))
{
@@ -528,9 +528,9 @@
/* load label */
list->labelXML
- = glade_xml_new (getGladeFileName (),
- "searchTabLabelWindow", PACKAGE_NAME);
- connectGladeWithPlugins (list->labelXML);
+ = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+ "searchTabLabelWindow", PACKAGNUNET_GENAME);
+ GNUNET_GTK_connect_glade_with_plugins (list->labelXML);
list->tab_label
= extractMainWidgetFromWindow (list->labelXML, "searchTabLabelWindow");
/* process existing results */
@@ -541,7 +541,7 @@
/* insert new page into search notebook */
notebook
- = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "downloadNotebook"));
+ = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"downloadNotebook"));
pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook));
gtk_notebook_append_page (notebook, list->searchpage, list->tab_label);
gtk_notebook_set_current_page (notebook, pages);
@@ -558,8 +558,8 @@
freeIterSubtree (GtkTreeModel * tree, GtkTreeIter * iter)
{
GtkTreeIter child;
- struct ECRS_URI *uri;
- struct ECRS_MetaData *meta;
+ struct GNUNET_ECRS_URI *uri;
+ struct GNUNET_ECRS_MetaData *meta;
do
{
@@ -568,9 +568,9 @@
gtk_tree_model_get (tree,
iter, SEARCH_URI, &uri, SEARCH_META, &meta, -1);
if (uri != NULL)
- ECRS_freeUri (uri);
+ GNUNET_ECRS_uri_destroy (uri);
if (meta != NULL)
- ECRS_freeMetaData (meta);
+ GNUNET_ECRS_meta_data_destroy (meta);
gtk_tree_store_set (GTK_TREE_STORE (tree),
iter, SEARCH_URI, NULL, SEARCH_META, NULL, -1);
if (gtk_tree_model_iter_children (tree, &child, iter))
@@ -632,12 +632,12 @@
/* remove page from notebook */
notebook
- = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "downloadNotebook"));
+ = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"downloadNotebook"));
index = -1;
for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
if (list->searchpage == gtk_notebook_get_nth_page (notebook, i))
index = i;
- GE_BREAK (ectx, index != -1);
+ GNUNET_GEBREAK (ectx, index != -1);
gtk_notebook_remove_page (notebook, index);
/* recursively free search model */
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->tree), &iter))
@@ -653,7 +653,7 @@
UNREF (list->labelXML);
gtk_tree_row_reference_free (list->summaryViewRowReference);
GNUNET_free (list->searchString);
- ECRS_freeUri (list->uri);
+ GNUNET_ECRS_uri_destroy (list->uri);
GNUNET_free (list);
}
@@ -671,9 +671,9 @@
const char *searchString;
GtkWidget *searchButton;
- searchString = getEntryLineValue (getMainXML (),
+ searchString = getEntryLineValue (GNUNET_GTK_get_main_glade_XML (),
"fssearchKeywordComboBoxEntry");
- searchButton = glade_xml_get_widget (getMainXML (), "fssearchbutton");
+ searchButton = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"fssearchbutton");
gtk_widget_set_sensitive (searchButton, strlen (searchString) > 0);
}
@@ -682,14 +682,14 @@
unsigned int anonymity;
unsigned int max;
GNUNET_CronTime delay;
- struct ECRS_URI *uri;
+ struct GNUNET_ECRS_URI *uri;
} FSSS;
static void *
search_start_helper (void *cls)
{
FSSS *fsss = cls;
- FSUI_startSearch (ctx, fsss->anonymity, fsss->max, fsss->delay, fsss->uri);
+ GNUNET_FSUI_search_start (ctx, fsss->anonymity, fsss->max, fsss->delay,
fsss->uri);
return NULL;
}
@@ -710,19 +710,19 @@
GtkWidget *searchNamespaceGtkCB;
GtkNotebook *notebook;
- searchString = getEntryLineValue (getMainXML (),
+ searchString = getEntryLineValue (GNUNET_GTK_get_main_glade_XML (),
"fssearchKeywordComboBoxEntry");
if ((searchString == NULL) || (strlen (searchString) == 0))
{
- GE_LOG (ectx,
- GE_ERROR | GE_USER | GE_IMMEDIATE,
+ GNUNET_GELOG (ectx,
+ GNUNET_GEERROR | GNUNET_GEUSER | GNUNET_GEIMMEDIATE,
_("Need a keyword to search!\n"));
return;
}
/* add the keyword to the list of keywords that have
been used so far */
searchKeywordGtkCB
- = GTK_COMBO_BOX (glade_xml_get_widget (getMainXML (),
+ = GTK_COMBO_BOX (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"fssearchKeywordComboBoxEntry"));
i = gtk_combo_box_get_active (searchKeywordGtkCB);
if (i == -1)
@@ -736,7 +736,7 @@
fsss.uri = NULL;
/* check for namespace search */
searchNamespaceGtkCB
- = glade_xml_get_widget (getMainXML (), "searchNamespaceComboBoxEntry");
+ = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"searchNamespaceComboBoxEntry");
if (TRUE ==
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (searchNamespaceGtkCB),
&iter))
@@ -757,7 +757,7 @@
}
else
{
- GE_ASSERT (ectx, strlen (ns) == sizeof (GNUNET_EncName) - 1);
+ GNUNET_GEASSERT (ectx, strlen (ns) == sizeof (GNUNET_EncName) - 1);
if ((descStr == NULL) && (ns != NULL))
descStr = GNUNET_strdup (ns);
}
@@ -766,18 +766,18 @@
char *ustring;
ustring = GNUNET_malloc (strlen (searchString) + sizeof
(GNUNET_EncName) +
- strlen (ECRS_URI_PREFIX) +
- strlen (ECRS_SUBSPACE_INFIX) + 10);
- strcpy (ustring, ECRS_URI_PREFIX);
- strcat (ustring, ECRS_SUBSPACE_INFIX);
+ strlen (GNUNET_ECRS_URI_PREFIX) +
+ strlen (GNUNET_ECRS_SUBSPACE_INFIX) + 10);
+ strcpy (ustring, GNUNET_ECRS_URI_PREFIX);
+ strcat (ustring, GNUNET_ECRS_SUBSPACE_INFIX);
strcat (ustring, ns);
strcat (ustring, "/");
strcat (ustring, searchString);
- fsss.uri = ECRS_stringToUri (ectx, ustring);
+ fsss.uri = GNUNET_ECRS_string_to_uri (ectx, ustring);
if (fsss.uri == NULL)
{
- GE_LOG (ectx,
- GE_ERROR | GE_BULK | GE_USER,
+ GNUNET_GELOG (ectx,
+ GNUNET_GEERROR | GNUNET_GEBULK | GNUNET_GEUSER,
_("Failed to create namespace URI from `%s'.\n"),
ustring);
}
@@ -789,47 +789,47 @@
free (ns);
}
if (fsss.uri == NULL)
- fsss.uri = ECRS_parseCharKeywordURI (ectx, searchString);
+ fsss.uri = GNUNET_ECRS_keyword_string_to_uri (ectx, searchString);
if (fsss.uri == NULL)
{
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
return;
}
/* check if search is already running */
notebook
- = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "downloadNotebook"));
+ = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"downloadNotebook"));
pages = gtk_notebook_get_n_pages (notebook);
list = search_head;
while (list != NULL)
{
- if (ECRS_equalsUri (list->uri, fsss.uri))
+ if (GNUNET_ECRS_uri_test_equal (list->uri, fsss.uri))
{
for (i = 0; i < pages; i++)
{
if (gtk_notebook_get_nth_page (notebook, i) == list->searchpage)
{
gtk_notebook_set_current_page (notebook, i);
- ECRS_freeUri (fsss.uri);
+ GNUNET_ECRS_uri_destroy (fsss.uri);
return;
}
}
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
}
list = list->next;
}
- fsss.anonymity = getSpinButtonValue (getMainXML (),
+ fsss.anonymity = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
"searchAnonymitySelectionSpinButton");
- fsss.max = getSpinButtonValue (getMainXML (), "maxResultsSpinButton");
- fsss.delay = getSpinButtonValue (getMainXML (),
+ fsss.max = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
"maxResultsSpinButton");
+ fsss.delay = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
"searchDelaySpinButton") *
GNUNET_CRON_SECONDS;
- run_with_save_calls (search_start_helper, &fsss);
- ECRS_freeUri (fsss.uri);
+ GNUNET_GTK_run_with_save_calls (search_start_helper, &fsss);
+ GNUNET_ECRS_uri_destroy (fsss.uri);
}
struct FCBC
{
- int (*method) (struct FSUI_Context * ctx, struct FSUI_SearchList * list);
- struct FSUI_SearchList *argument;
+ int (*method) (struct GNUNET_FSUI_Context * ctx, struct
GNUNET_FSUI_SearchList * list);
+ struct GNUNET_FSUI_SearchList *argument;
};
static void *
@@ -862,7 +862,7 @@
break;
list = list->next;
}
- GE_ASSERT (ectx, list != NULL);
+ GNUNET_GEASSERT (ectx, list != NULL);
if (list->fsui_list == NULL)
{
/* open directory - close directly */
@@ -871,11 +871,11 @@
else
{
/* actual search - close via FSUI */
- fcbc.method = &FSUI_abortSearch;
+ fcbc.method = &GNUNET_FSUI_search_abort;
fcbc.argument = list->fsui_list;
- run_with_save_calls (&fsui_callback, &fcbc);
- fcbc.method = &FSUI_stopSearch;
- run_with_save_calls (&fsui_callback, &fcbc);
+ GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
+ fcbc.method = &GNUNET_FSUI_search_stop;
+ GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
}
}
@@ -896,12 +896,12 @@
break;
list = list->next;
}
- GE_ASSERT (ectx, list != NULL);
+ GNUNET_GEASSERT (ectx, list != NULL);
if (list->fsui_list != NULL)
{
- fcbc.method = &FSUI_abortSearch;
+ fcbc.method = &GNUNET_FSUI_search_abort;
fcbc.argument = list->fsui_list;
- run_with_save_calls (&fsui_callback, &fcbc);
+ GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
}
}
@@ -923,11 +923,11 @@
}
else
{
- fcbc.method = &FSUI_abortSearch;
+ fcbc.method = &GNUNET_FSUI_search_abort;
fcbc.argument = s->fsui_list;
- run_with_save_calls (&fsui_callback, &fcbc);
- fcbc.method = &FSUI_stopSearch;
- run_with_save_calls (&fsui_callback, &fcbc);
+ GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
+ fcbc.method = &GNUNET_FSUI_search_stop;
+ GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
}
}
}
@@ -942,7 +942,7 @@
GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
- ggc_tree_selection_selected_foreach (selection, &stopSearch, NULL);
+ GNUNET_GTK_tree_selection_selected_foreach (selection, &stopSearch, NULL);
}
static void
@@ -956,9 +956,9 @@
gtk_tree_model_get (model, iter, SEARCH_SUMMARY_INTERNAL, &s, -1);
if ((s != NULL) && (s->fsui_list != NULL))
{
- fcbc.method = &FSUI_abortSearch;
+ fcbc.method = &GNUNET_FSUI_search_abort;
fcbc.argument = s->fsui_list;
- run_with_save_calls (&fsui_callback, &fcbc);
+ GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
}
}
@@ -972,7 +972,7 @@
GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
- ggc_tree_selection_selected_foreach (selection, &abortSearch, NULL);
+ GNUNET_GTK_tree_selection_selected_foreach (selection, &abortSearch, NULL);
}
/* end of search.c */
Modified: gnunet-gtk/src/plugins/fs/search.h
===================================================================
--- gnunet-gtk/src/plugins/fs/search.h 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/plugins/fs/search.h 2007-11-25 12:05:41 UTC (rev 5757)
@@ -38,7 +38,7 @@
*/
void addEntryToSearchTree (SearchList * searchContext,
DownloadList * downloadParent,
- const ECRS_FileInfo * info, GtkTreeIter * iter);
+ const GNUNET_ECRS_FileInfo * info, GtkTreeIter *
iter);
/**
* Add the given result to the model (search result
@@ -49,20 +49,20 @@
* the information, NULL for top-level
*/
void fs_search_result_received (SearchList * searchContext,
- const ECRS_FileInfo * info,
- const struct ECRS_URI *uri);
+ const GNUNET_ECRS_FileInfo * info,
+ const struct GNUNET_ECRS_URI *uri);
/**
* A search has been started. Open tab.
*
* @return internal search context
*/
-SearchList *fs_search_started (struct FSUI_SearchList *list,
- const struct ECRS_URI *uri,
+SearchList *fs_search_started (struct GNUNET_FSUI_SearchList *list,
+ const struct GNUNET_ECRS_URI *uri,
unsigned int anonymityLevel,
unsigned int resultCount,
- const ECRS_FileInfo * results,
- FSUI_State state);
+ const GNUNET_ECRS_FileInfo * results,
+ GNUNET_FSUI_State state);
/**
* A search process has been aborted. Update display.
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/plugins/fs/upload.c 2007-11-25 12:05:41 UTC (rev 5757)
@@ -68,15 +68,15 @@
}
void
-fs_upload_complete (UploadList * list, struct ECRS_URI *uri)
+fs_upload_complete (UploadList * list, struct GNUNET_ECRS_URI *uri)
{
GtkTreeIter iter;
GtkTreePath *path;
char *us;
list->has_terminated = GNUNET_YES;
- list->uri = ECRS_dupUri (uri);
- us = ECRS_uriToString (uri);
+ list->uri = GNUNET_ECRS_uri_duplicate (uri);
+ us = GNUNET_ECRS_uri_to_string (uri);
path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path);
gtk_tree_path_free (path);
@@ -110,7 +110,7 @@
GNUNET_free (list->filename);
if (list->uri != NULL)
{
- ECRS_freeUri (list->uri);
+ GNUNET_ECRS_uri_destroy (list->uri);
list->uri = NULL;
}
if (upload_head == list)
@@ -123,18 +123,18 @@
if (prev != NULL)
prev->next = list->next;
else
- GE_BREAK (ectx, 0);
+ GNUNET_GEBREAK (ectx, 0);
}
GNUNET_free (list);
}
UploadList *
-fs_upload_started (struct FSUI_UploadList *fsui,
+fs_upload_started (struct GNUNET_FSUI_UploadList *fsui,
UploadList * parent,
const char *filename,
- struct ECRS_URI *uri,
+ struct GNUNET_ECRS_URI *uri,
unsigned long long total,
- unsigned long long completed, FSUI_State state)
+ unsigned long long completed, GNUNET_FSUI_State state)
{
UploadList *ret;
GtkTreeIter iter;
@@ -162,12 +162,12 @@
{
gtk_tree_store_append (upload_summary, &iter, NULL);
}
- if ( (total != 0) && (state != FSUI_COMPLETED_JOINED) )
+ if ( (total != 0) && (state != GNUNET_FSUI_COMPLETED_JOINED) )
progress = 100 * completed / total;
else
progress = 100;
if (uri != NULL)
- u = ECRS_uriToString(uri);
+ u = GNUNET_ECRS_uri_to_string(uri);
else
u = GNUNET_strdup("");
gtk_tree_store_set (upload_summary, &iter, UPLOAD_FILENAME, filename,
UPLOAD_PROGRESS, progress, UPLOAD_URISTRING, u,
@@ -176,7 +176,7 @@
path = gtk_tree_model_get_path (GTK_TREE_MODEL (upload_summary), &iter);
ret->summaryViewRowReference
= gtk_tree_row_reference_new (GTK_TREE_MODEL (upload_summary), path);
- ret->has_terminated = ((state != FSUI_ACTIVE) && (state != FSUI_PENDING));
+ ret->has_terminated = ((state != GNUNET_FSUI_ACTIVE) && (state !=
GNUNET_FSUI_PENDING));
ret->next = upload_head;
upload_head = ret;
@@ -331,9 +331,9 @@
int extract;
int deep_index;
GNUNET_CronTime expire;
- struct ECRS_MetaData *meta;
- struct ECRS_URI *gkeywordURI;
- struct ECRS_URI *keywordURI;
+ struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_ECRS_URI *gkeywordURI;
+ struct GNUNET_ECRS_URI *keywordURI;
} FSUC;
static void *
@@ -341,9 +341,9 @@
{
FSUC *fsuc = cls;
- FSUI_startUpload (ctx,
+ GNUNET_FSUI_upload_star (ctx,
fsuc->filename,
- (DirectoryScanCallback) & GNUNET_disk_directory_scan,
+ (GNUNET_FSUI_DirectoryScanCallback) &
GNUNET_disk_directory_scan,
ectx,
fsuc->anonymity,
fsuc->priority,
@@ -364,35 +364,35 @@
GtkWidget *dialog;
EXTRACTOR_ExtractorList *extractors;
char *config;
- struct ECRS_MetaData *meta;
- struct ECRS_URI *keywordURI;
+ struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_ECRS_URI *keywordURI;
extractors = EXTRACTOR_loadDefaultLibraries ();
config = NULL;
- GC_get_configuration_value_string (cfg, "FS", "EXTRACTORS", "", &config);
+ GNUNET_GC_get_configuration_value_string (cfg, "FS", "EXTRACTORS", "",
&config);
if (strlen (config) > 0)
extractors = EXTRACTOR_loadConfigLibraries (extractors, config);
GNUNET_free (config);
- filename = getEntryLineValue (getMainXML (), "uploadFilenameComboBoxEntry");
+ filename = getEntryLineValue (GNUNET_GTK_get_main_glade_XML (),
"uploadFilenameComboBoxEntry");
metaXML
- = glade_xml_new (getGladeFileName (), "metaDataDialog", PACKAGE_NAME);
- connectGladeWithPlugins (metaXML);
+ = glade_xml_new (GNUNET_GTK_get_glade_filename (), "metaDataDialog",
PACKAGNUNET_GENAME);
+ GNUNET_GTK_connect_glade_with_plugins (metaXML);
dialog = glade_xml_get_widget (metaXML, "metaDataDialog");
- meta = ECRS_createMetaData ();
- ECRS_extractMetaData (ectx, meta, filename, extractors);
+ meta = GNUNET_ECRS_meta_data_create ();
+ GNUNET_ECRS_meta_data_extract_from_file (ectx, meta, filename, extractors);
EXTRACTOR_removeAll (extractors);
filenamerest = &filename[strlen (filename) - 1];
while ((filenamerest > filename) && (filenamerest[-1] != DIR_SEPARATOR))
filenamerest--;
- ECRS_addToMetaData (meta, EXTRACTOR_FILENAME, filenamerest);
+ GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_FILENAME, filenamerest);
createMetaDataListTreeView (metaXML,
"metaDataDialogMetaDataList",
"previewImage", meta);
- keywordURI = ECRS_metaDataToUri (meta);
- ECRS_freeMetaData (meta);
+ keywordURI = GNUNET_ECRS_meta_data_to_uri (meta);
+ GNUNET_ECRS_meta_data_destroy (meta);
createKeywordListTreeView (metaXML,
"metaDataDialogKeywordList", keywordURI);
- ECRS_freeUri (keywordURI);
+ GNUNET_ECRS_uri_destroy (keywordURI);
createMetaTypeComboBox (metaXML, "metaDataDialogMetaTypeComboBox");
g_signal_connect_data (gtk_tree_view_get_selection
(GTK_TREE_VIEW
@@ -411,14 +411,14 @@
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_CANCEL)
{
- fsuc.anonymity = getSpinButtonValue (getMainXML (),
+ fsuc.anonymity = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
"uploadAnonymityLevelSpinButton");
- fsuc.priority = getSpinButtonValue (getMainXML (),
+ fsuc.priority = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
"contentPrioritySpinButton");
- fsuc.index = getToggleButtonValue (getMainXML (), "indexbutton");
- fsuc.extract = getToggleButtonValue (getMainXML (),
+ fsuc.index = getToggleButtonValue (GNUNET_GTK_get_main_glade_XML (),
"indexbutton");
+ fsuc.extract = getToggleButtonValue (GNUNET_GTK_get_main_glade_XML (),
"doExtractCheckButton");
- fsuc.deep_index = getToggleButtonValue (getMainXML (),
+ fsuc.deep_index = getToggleButtonValue (GNUNET_GTK_get_main_glade_XML (),
"deepIndexCheckButton");
fsuc.expire = GNUNET_get_time () + 2 * GNUNET_CRON_YEARS;
fsuc.meta = getMetaDataFromList (metaXML,
@@ -426,14 +426,14 @@
"previewImage");
fsuc.keywordURI = getKeywordURIFromList (metaXML,
"metaDataDialogKeywordList");
- fsuc.gkeywordURI = ECRS_stringToUri (ectx,
- ECRS_URI_PREFIX ECRS_SEARCH_INFIX);
+ fsuc.gkeywordURI = GNUNET_ECRS_string_to_uri (ectx,
+ GNUNET_ECRS_URI_PREFIX
GNUNET_ECRS_SEARCH_INFIX);
fsuc.filename = GNUNET_strdup (filename);
- run_with_save_calls (&start_upload_helper, &fsuc);
+ GNUNET_GTK_run_with_save_calls (&start_upload_helper, &fsuc);
GNUNET_free (fsuc.filename);
- ECRS_freeMetaData (fsuc.meta);
- ECRS_freeUri (fsuc.gkeywordURI);
- ECRS_freeUri (fsuc.keywordURI);
+ GNUNET_ECRS_meta_data_destroy (fsuc.meta);
+ GNUNET_ECRS_uri_destroy (fsuc.gkeywordURI);
+ GNUNET_ECRS_uri_destroy (fsuc.keywordURI);
}
gtk_widget_destroy (dialog);
UNREF (metaXML);
@@ -449,13 +449,13 @@
char *ret;
uploadXML
- = glade_xml_new (getGladeFileName (),
- "uploadfilechooserdialog", PACKAGE_NAME);
- connectGladeWithPlugins (uploadXML);
+ = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+ "uploadfilechooserdialog", PACKAGNUNET_GENAME);
+ GNUNET_GTK_connect_glade_with_plugins (uploadXML);
dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
"uploadfilechooserdialog"));
gtk_file_chooser_set_filename (dialog, oldfilename);
- if (getToggleButtonValue (getMainXML (), "scopeRecursiveButton"))
+ if (getToggleButtonValue (GNUNET_GTK_get_main_glade_XML (),
"scopeRecursiveButton"))
gtk_file_chooser_set_action (dialog,
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_CANCEL)
@@ -472,7 +472,7 @@
static char *
selectFile (const char *oldfilename)
{
- if (getToggleButtonValue (getMainXML (), "scopeFileOnlyButton"))
+ if (getToggleButtonValue (GNUNET_GTK_get_main_glade_XML (),
"scopeFileOnlyButton"))
return plibc_ChooseFile (_("Choose the file you want to publish."),
OFN_FILEMUSTEXIST | OFN_SHAREAWARE);
return plibc_ChooseDir (_("Choose the directory you want to publish."),
@@ -493,7 +493,7 @@
GtkListStore *model;
GtkTreeIter iter;
- uploadLine = glade_xml_get_widget (getMainXML (),
+ uploadLine = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"uploadFilenameComboBoxEntry");
entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (uploadLine)));
oldfilename = gtk_entry_get_text (entry);
@@ -518,8 +518,8 @@
struct FCBC
{
- int (*method) (struct FSUI_Context * ctx, struct FSUI_UploadList * list);
- struct FSUI_UploadList *argument;
+ int (*method) (struct GNUNET_FSUI_Context * ctx, struct
GNUNET_FSUI_UploadList * list);
+ struct GNUNET_FSUI_UploadList *argument;
};
static void *
@@ -538,13 +538,13 @@
UploadList *ul;
struct FCBC fcbc;
- GE_ASSERT (ectx, model == GTK_TREE_MODEL (upload_summary));
+ GNUNET_GEASSERT (ectx, model == GTK_TREE_MODEL (upload_summary));
gtk_tree_model_get (model, iter, UPLOAD_INTERNAL, &ul, -1);
if ((ul->has_terminated) && (ul->is_top))
{
- fcbc.method = &FSUI_stopUpload;
+ fcbc.method = &GNUNET_FSUI_upload_stop;
fcbc.argument = ul->fsui_list;
- run_with_save_calls (&fsui_callback, &fcbc);
+ GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
}
}
@@ -562,7 +562,7 @@
int ok;
GtkWidget *toggle;
- filename = getEntryLineValue (getMainXML (), "uploadFilenameComboBoxEntry");
+ filename = getEntryLineValue (GNUNET_GTK_get_main_glade_XML (),
"uploadFilenameComboBoxEntry");
ok = (0 == stat (filename, &buf));
if (ok)
ok = (0 == ACCESS (filename, R_OK));
@@ -570,18 +570,18 @@
{
if (S_ISDIR (buf.st_mode))
{
- toggle = glade_xml_get_widget (getMainXML (),
+ toggle = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"scopeRecursiveButton");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), 1);
}
else
{
- toggle = glade_xml_get_widget (getMainXML (),
+ toggle = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"scopeFileOnlyButton");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), 1);
}
}
- uploadButton = glade_xml_get_widget (getMainXML (), "fsinsertuploadbutton");
+ uploadButton = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"fsinsertuploadbutton");
gtk_widget_set_sensitive (uploadButton, ok);
}
@@ -589,7 +589,7 @@
on_clearCompletedUploadsButton_clicked_fs (void *unused,
GtkWidget * clearButton)
{
- ggc_tree_model_foreach (GTK_TREE_MODEL (upload_summary),
+ GNUNET_GTK_tree_model_foreach (GTK_TREE_MODEL (upload_summary),
&clearCompletedUploadCallback, NULL);
}
@@ -601,11 +601,11 @@
UploadList *ul;
struct FCBC fcbc;
- GE_ASSERT (ectx, model == GTK_TREE_MODEL (upload_summary));
+ GNUNET_GEASSERT (ectx, model == GTK_TREE_MODEL (upload_summary));
gtk_tree_model_get (model, iter, UPLOAD_INTERNAL, &ul, -1);
fcbc.method = fsui_call;
fcbc.argument = ul->fsui_list;
- run_with_save_calls (&fsui_callback, &fcbc);
+ GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
}
void
@@ -614,10 +614,10 @@
GtkTreeSelection *selection;
GtkWidget *uploadList;
- uploadList = glade_xml_get_widget (getMainXML (), "activeUploadsList");
+ uploadList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"activeUploadsList");
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (uploadList));
- ggc_tree_selection_selected_foreach
- (selection, &fsuiCallUploadCallback, &FSUI_abortUpload);
+ GNUNET_GTK_tree_selection_selected_foreach
+ (selection, &fsuiCallUploadCallback, &GNUNET_FSUI_upload_abort);
}
void
@@ -626,12 +626,12 @@
GtkTreeSelection *selection;
GtkWidget *uploadList;
- uploadList = glade_xml_get_widget (getMainXML (), "activeUploadsList");
+ uploadList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"activeUploadsList");
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (uploadList));
- ggc_tree_selection_selected_foreach
- (selection, &fsuiCallUploadCallback, &FSUI_abortUpload);
- ggc_tree_selection_selected_foreach
- (selection, &fsuiCallUploadCallback, &FSUI_stopUpload);
+ GNUNET_GTK_tree_selection_selected_foreach
+ (selection, &fsuiCallUploadCallback, &GNUNET_FSUI_upload_abort);
+ GNUNET_GTK_tree_selection_selected_foreach
+ (selection, &fsuiCallUploadCallback, &GNUNET_FSUI_upload_stop);
}
Modified: gnunet-gtk/src/plugins/fs/upload.h
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.h 2007-11-25 12:05:27 UTC (rev 5756)
+++ gnunet-gtk/src/plugins/fs/upload.h 2007-11-25 12:05:41 UTC (rev 5757)
@@ -32,7 +32,7 @@
void fs_upload_update (UploadList * list, unsigned long long completed,
unsigned long long total);
-void fs_upload_complete (UploadList * list, struct ECRS_URI *uri);
+void fs_upload_complete (UploadList * list, struct GNUNET_ECRS_URI *uri);
void fs_upload_error (UploadList * list);
@@ -41,12 +41,12 @@
/**
* @param uri NULL if upload is not yet finished
*/
-UploadList *fs_upload_started (struct FSUI_UploadList *fsui,
+UploadList *fs_upload_started (struct GNUNET_FSUI_UploadList *fsui,
UploadList * parent,
const char *filename,
- struct ECRS_URI *uri,
+ struct GNUNET_ECRS_URI *uri,
unsigned long long total,
unsigned long long completed,
- FSUI_State state);
+ GNUNET_FSUI_State state);
#endif
Modified: gnunet-gtk/src/plugins/peers/peers.c
===================================================================
--- gnunet-gtk/src/plugins/peers/peers.c 2007-11-25 12:05:27 UTC (rev
5756)
+++ gnunet-gtk/src/plugins/peers/peers.c 2007-11-25 12:05:41 UTC (rev
5757)
@@ -36,9 +36,9 @@
static struct GNUNET_CronManager *cron;
-static struct GE_Context *ectx;
+static struct GNUNET_GEContext *ectx;
-static struct GC_Configuration *cfg;
+static struct GNUNET_GC_Configuration *cfg;
static GdkPixbuf *green;
@@ -236,7 +236,7 @@
GtkSortType order;
gint sort_column;
- w = glade_xml_get_widget (getMainXML (), "peersTreeView");
+ w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "peersTreeView");
old_model = gtk_tree_view_get_model (GTK_TREE_VIEW (w));
if (old_model != NULL)
{
@@ -258,13 +258,13 @@
GtkListStore *model;
model = getPeerModel ();
- gtkSaveCall (&updatePeerInfoSafe, model);
+ GNUNET_GTK_save_call (&updatePeerInfoSafe, model);
g_object_unref(G_OBJECT(model));
}
void
-init_peers (struct GE_Context *e, struct GC_Configuration *c)
+init_peers (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
{
GtkWidget *tab;
GtkWidget *peers;
@@ -276,7 +276,7 @@
ectx = e;
cfg = c;
- peers = glade_xml_get_widget (getMainXML (), "peersTreeView");
+ peers = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"peersTreeView");
renderer = gtk_cell_renderer_text_new ();
col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (peers),
-1,
@@ -379,9 +379,9 @@
GNUNET_free (fn);
GNUNET_free (dir);
- tab = glade_xml_get_widget (getMainXML (), "peersScrolledWindow");
+ tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"peersScrolledWindow");
gtk_widget_show (tab);
- cron = gnunet_gtk_get_cron ();
+ cron = GNUNET_GTK_get_cron_manager ();
GNUNET_cron_add_job (cron, &updatePeerInfo, REFRESH_RATE, REFRESH_RATE,
NULL);
}
@@ -400,7 +400,7 @@
g_object_unref (black);
if (yellow != NULL)
g_object_unref (yellow);
- w = glade_xml_get_widget (getMainXML (), "peersTreeView");
+ w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "peersTreeView");
gtk_tree_view_set_model (GTK_TREE_VIEW (w), NULL);
while (flags != NULL) {
Modified: gnunet-gtk/src/plugins/stats/functions.c
===================================================================
--- gnunet-gtk/src/plugins/stats/functions.c 2007-11-25 12:05:27 UTC (rev
5756)
+++ gnunet-gtk/src/plugins/stats/functions.c 2007-11-25 12:05:41 UTC (rev
5757)
@@ -43,9 +43,9 @@
static long long bandup;
-static struct GE_Context *ectx;
+static struct GNUNET_GEContext *ectx;
-static struct GC_Configuration *cfg;
+static struct GNUNET_GC_Configuration *cfg;
static struct GNUNET_CronManager *cron;
@@ -74,8 +74,8 @@
}
}
#if FUNCTIONS_DEBUG
- GE_LOG (ectx,
- GE_DEBUG | GE_DEVELOPER | GE_REQUEST,
+ GNUNET_GELOG (ectx,
+ GNUNET_GEDEBUG | GNUNET_GEDEVELOPER | GNUNET_GEREQUEST,
"Statistic not found: `%s'\n", optName);
#endif
return GNUNET_SYSERR;
@@ -192,19 +192,19 @@
&lnoise, NULL, "# bytes of noise received",
GNUNET_YES))
return GNUNET_SYSERR;
buffer = GNUNET_malloc (512);
- GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
P2P_PROTO_gap_RESULT);
+ GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
GNUNET_P2P_PROTO_GAP_RESULT);
if (GNUNET_OK != getStatValue (&content, &lcontent, NULL, buffer,
GNUNET_YES))
{
content = 0;
lcontent = 0;
}
- GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
p2p_PROTO_hello);
+ GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
GNUNET_P2P_PROTO_HELLO);
if (GNUNET_OK != getStatValue (&hellos, &lhellos, NULL, buffer, GNUNET_YES))
{
hellos = 0;
lhellos = 0;
}
- GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
P2P_PROTO_gap_QUERY);
+ GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
GNUNET_P2P_PROTO_GAP_QUERY);
if (GNUNET_OK != getStatValue (&queries, &lqueries, NULL, buffer,
GNUNET_YES))
{
queries = 0;
@@ -273,20 +273,20 @@
return GNUNET_SYSERR;
buffer = GNUNET_malloc (512);
GNUNET_snprintf (buffer,
- 512, "# bytes transmitted of type %d", P2P_PROTO_gap_RESULT);
+ 512, "# bytes transmitted of type %d",
GNUNET_P2P_PROTO_GAP_RESULT);
if (GNUNET_OK != getStatValue (&content, &lcontent, NULL, buffer,
GNUNET_YES))
{
content = 0;
lcontent = 0;
}
GNUNET_snprintf (buffer,
- 512, "# bytes transmitted of type %d", P2P_PROTO_gap_QUERY);
+ 512, "# bytes transmitted of type %d", GNUNET_P2P_PROTO_GAP_QUERY);
if (GNUNET_OK != getStatValue (&queries, &lqueries, NULL, buffer,
GNUNET_YES))
{
queries = 0;
lqueries = 0;
}
- GNUNET_snprintf (buffer, 512, "# bytes transmitted of type %d",
p2p_PROTO_hello);
+ GNUNET_snprintf (buffer, 512, "# bytes transmitted of type %d",
GNUNET_P2P_PROTO_HELLO);
if (GNUNET_OK != getStatValue (&hellos, &lhellos, NULL, buffer, GNUNET_YES))
{
queries = 0;
@@ -448,7 +448,7 @@
now = GNUNET_get_time ();
delta = now - lastUpdate;
GNUNET_mutex_lock (lock);
- if (GNUNET_OK == STATS_getStatistics (ectx, sock, &statsProcessor, &delta))
+ if (GNUNET_OK == GNUNET_STATS_get_statistics (ectx, sock, &statsProcessor,
&delta))
lastUpdate = now;
GNUNET_mutex_unlock (lock);
}
@@ -527,11 +527,11 @@
static unsigned long long UPDATE_INTERVAL;
void
-init_functions (struct GE_Context *e, struct GC_Configuration *c)
+init_functions (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
{
ectx = e;
cfg = c;
- GC_get_configuration_value_number (cfg,
+ GNUNET_GC_get_configuration_value_number (cfg,
"GNUNET-GTK",
"STATS-INTERVAL",
1,
@@ -539,7 +539,7 @@
30 * GNUNET_CRON_SECONDS,
&UPDATE_INTERVAL);
sock = GNUNET_client_connection_create (ectx, cfg);
lock = GNUNET_mutex_create (GNUNET_NO);
- cron = gnunet_gtk_get_cron ();
+ cron = GNUNET_GTK_get_cron_manager ();
GNUNET_cron_add_job (cron,
&updateStatValues, UPDATE_INTERVAL, UPDATE_INTERVAL, NULL);
GNUNET_cron_add_job (cron,
Modified: gnunet-gtk/src/plugins/stats/functions.h
===================================================================
--- gnunet-gtk/src/plugins/stats/functions.h 2007-11-25 12:05:27 UTC (rev
5756)
+++ gnunet-gtk/src/plugins/stats/functions.h 2007-11-25 12:05:41 UTC (rev
5757)
@@ -51,7 +51,7 @@
extern StatEntry stats[];
-void init_functions (struct GE_Context *e, struct GC_Configuration *c);
+void init_functions (struct GNUNET_GEContext *e, struct
GNUNET_GC_Configuration *c);
void done_functions (void);
Modified: gnunet-gtk/src/plugins/stats/statistics.c
===================================================================
--- gnunet-gtk/src/plugins/stats/statistics.c 2007-11-25 12:05:27 UTC (rev
5756)
+++ gnunet-gtk/src/plugins/stats/statistics.c 2007-11-25 12:05:41 UTC (rev
5757)
@@ -367,7 +367,7 @@
if (stats[statIdx].count > MAX_COLOR)
{
- GE_BREAK (NULL, 0);
+ GNUNET_GEBREAK (NULL, 0);
return NULL;
}
@@ -430,7 +430,7 @@
void
-init_stats (struct GE_Context *ectx, struct GC_Configuration *cfg)
+init_stats (struct GNUNET_GEContext *ectx, struct GNUNET_GC_Configuration *cfg)
{
GtkWidget *sys_box;
GtkWidget *label;
@@ -438,14 +438,14 @@
ProcConfig config;
int i;
- GC_get_configuration_value_number (cfg,
+ GNUNET_GC_get_configuration_value_number (cfg,
"GNUNET-GTK",
"STATS-INTERVAL",
1,
99 * GNUNET_CRON_YEARS,
30 * GNUNET_CRON_SECONDS,
&UPDATE_INTERVAL);
init_functions (ectx, cfg);
- notebook = glade_xml_get_widget (getMainXML (), "statsNotebook");
+ notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"statsNotebook");
memset (&config, 0, sizeof (ProcConfig));
gdk_color_parse ("black", &config.bg_color);
gdk_color_parse ("gray", &config.frame_color);
@@ -455,7 +455,7 @@
gdk_color_parse ("blue", &config.mem_color[3]);
gdk_color_parse ("gray", &config.mem_color[4]);
gdk_color_parse ("magenta", &config.mem_color[5]);
- GE_ASSERT (ectx, MAX_COLOR == 6);
+ GNUNET_GEASSERT (ectx, MAX_COLOR == 6);
i = -1;
while (stats[++i].paneName != NULL)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r5757 - in gnunet-gtk: . libltdl src/common src/core src/include src/plugins/about src/plugins/daemon src/plugins/fs src/plugins/fs/extensions src/plugins/peers src/plugins/stats,
gnunet <=