[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5764 - in gnunet-gtk: libltdl src/common src/core src/incl
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r5764 - 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:26:07 -0700 (MST) |
Author: grothoff
Date: 2007-11-25 05:26:06 -0700 (Sun, 25 Nov 2007)
New Revision: 5764
Modified:
gnunet-gtk/libltdl/ltdl.c
gnunet-gtk/src/common/helper.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/directory.c
gnunet-gtk/src/plugins/fs/download.c
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/meta.c
gnunet-gtk/src/plugins/fs/namespace.c
gnunet-gtk/src/plugins/fs/namespace_create.c
gnunet-gtk/src/plugins/fs/namespace_search.c
gnunet-gtk/src/plugins/fs/search.c
gnunet-gtk/src/plugins/fs/upload.c
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:
fix
Modified: gnunet-gtk/libltdl/ltdl.c
===================================================================
--- gnunet-gtk/libltdl/ltdl.c 2007-11-25 12:25:52 UTC (rev 5763)
+++ gnunet-gtk/libltdl/ltdl.c 2007-11-25 12:26:06 UTC (rev 5764)
@@ -1614,32 +1614,32 @@
*symbolName) = 0;
static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic) (NSModule module) = 0;
-#ifndef NSADDIMAGNUNET_GEOPTION_NONE
-#define NSADDIMAGNUNET_GEOPTION_NONE 0x0
+#ifndef NSADDIMAGE_OPTION_NONE
+#define NSADDIMAGE_OPTION_NONE 0x0
#endif
-#ifndef NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR
-#define NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR 0x1
+#ifndef NSADDIMAGE_OPTION_RETURN_ON_ERROR
+#define NSADDIMAGE_OPTION_RETURN_ON_ERROR 0x1
#endif
-#ifndef NSADDIMAGNUNET_GEOPTION_WITH_SEARCHING
-#define NSADDIMAGNUNET_GEOPTION_WITH_SEARCHING 0x2
+#ifndef NSADDIMAGE_OPTION_WITH_SEARCHING
+#define NSADDIMAGE_OPTION_WITH_SEARCHING 0x2
#endif
-#ifndef NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED
-#define NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED 0x4
+#ifndef NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
+#define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED 0x4
#endif
-#ifndef NSADDIMAGNUNET_GEOPTION_MATCH_FILENAME_BY_INSTALLNAME
-#define NSADDIMAGNUNET_GEOPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8
+#ifndef NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME
+#define NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8
#endif
-#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND
-#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND 0x0
+#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND 0x0
#endif
-#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW
-#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW 0x1
+#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW 0x1
#endif
-#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_FULLY
-#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_FULLY 0x2
+#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY 0x2
#endif
-#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR
-#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR 0x4
+#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_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_IMAGNUNET_GESUFFIX is
set and a
+ each other. Note that this is still broken if DYLD_IMAGE_SUFFIX is set and a
different lib was loaded as a result
*/
int j;
@@ -1761,18 +1761,18 @@
ltdl_NSAddImage ((char *) (((struct dylib_command *) lc)->
dylib.name.offset +
(unsigned long) lc),
-
NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED
+ NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
+
- NSADDIMAGNUNET_GEOPTION_WITH_SEARCHING +
- NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR);
+ NSADDIMAGE_OPTION_WITH_SEARCHING +
+ NSADDIMAGE_OPTION_RETURN_ON_ERROR);
}
if (mh1)
{
retSym = ltdl_NSLookupSymbolInImage (mh1,
symbol,
-
NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW
+
NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
|
-
NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR);
+
NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
if (retSym)
break;
}
@@ -1839,7 +1839,7 @@
{
module =
(lt_module) ltdl_NSAddImage (filename,
-
NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR);
+ NSADDIMAGE_OPTION_RETURN_ON_ERROR);
break;
}
default:
@@ -1928,9 +1928,9 @@
nssym =
ltdl_NSLookupSymbolInImage ((struct mach_header *) module,
symbol,
-
NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW
+
NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
|
-
NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR);
+
NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
}
}
Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c 2007-11-25 12:25:52 UTC (rev 5763)
+++ gnunet-gtk/src/common/helper.c 2007-11-25 12:26:06 UTC (rev 5764)
@@ -82,7 +82,7 @@
static void *shutdown_function;
-static struct GNUNET_GEContext *ectx;
+static struct GNUNET_GE_Context *ectx;
static struct GNUNET_GC_Configuration *cfg;
@@ -113,7 +113,7 @@
break;
}
}
- GNUNET_GEASSERT (NULL, i != pscCount);
+ GNUNET_GE_ASSERT (NULL, i != pscCount);
GNUNET_array_grow (psc, pscCount, pscCount - 1);
GNUNET_mutex_unlock (sclock);
}
@@ -206,10 +206,11 @@
if ((module == NULL) ||
(TRUE != g_module_symbol (module, handler_name, &method)))
{
- GNUNET_GELOG (ectx,
- GNUNET_GEWARNING | GNUNET_GEDEVELOPER |
- GNUNET_GEIMMEDIATE,
- _("Failed to find handler for `%s'\n"), handler_name);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE,
+ _("Failed to find handler for `%s'\n"),
+ handler_name);
g_module_close (module);
return;
}
@@ -224,7 +225,7 @@
glade_xml_signal_autoconnect_full (xml, &connector, xml);
}
-typedef void (*InitCall) (struct GNUNET_GEContext * ectx,
+typedef void (*InitCall) (struct GNUNET_GE_Context * ectx,
struct GNUNET_GC_Configuration * cfg);
typedef void (*PlainCall) (void);
@@ -301,7 +302,7 @@
}
void
-GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *e,
+GNUNET_GTK_initialize_common_library (struct GNUNET_GE_Context *e,
struct GNUNET_GC_Configuration *c,
void *callback)
{
@@ -333,12 +334,12 @@
#endif
GNUNET_free (filename);
- mainXML = glade_xml_new (gladeFile, "mainWindow", PACKAGNUNET_GENAME);
+ mainXML = glade_xml_new (gladeFile, "mainWindow", PACKAGNUNET_GE_NAME);
if (mainXML == NULL)
- GNUNET_GEDIE_STRERROR_FILE (ectx,
- GNUNET_GEFATAL | GNUNET_GEUSER |
- GNUNET_GEIMMEDIATE, "glade_xml_new",
- gladeFile);
+ GNUNET_GE_DIE_STRERROR_FILE (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "glade_xml_new",
+ gladeFile);
/* load the plugins */
GNUNET_GC_get_configuration_value_string (cfg,
"GNUNET-GTK",
@@ -428,9 +429,9 @@
cls.arg = arg;
doneThread = GNUNET_thread_create (&shutdownCode, &cls, 64 * 1024);
if (doneThread == NULL)
- GNUNET_GEDIE_STRERROR (ectx,
- GNUNET_GEFATAL | GNUNET_GEADMIN | GNUNET_GEBULK,
- "pthread_create");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "pthread_create");
if (!GNUNET_thread_test_self (mainThread))
{
/* another thread will run the save calls */
@@ -488,10 +489,10 @@
if (!notify_init ("gnunet-gtk"))
{
once = 1;
- GNUNET_GELOG (ectx,
- GNUNET_GEWARNING | GNUNET_GEBULK | GNUNET_GEUSER |
- GNUNET_GEADMIN,
- _("Could not initialize libnotify\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN,
+ _("Could not initialize libnotify\n"));
return;
}
}
@@ -515,7 +516,7 @@
va_end (arg);
libnotify = notify_notification_new ("gnunet-gtk",
msg,
- PACKAGNUNET_GEDATA
+ PACKAGNUNET_GE_DATA
"/gnunet-gtk/gnunet-gtk-notify.png",
NULL);
GNUNET_free (msg);
@@ -524,10 +525,10 @@
if (!notify_notification_show (libnotify, NULL))
{
once = 1;
- GNUNET_GELOG (ectx,
- GNUNET_GEWARNING | GNUNET_GEUSER | GNUNET_GEADMIN |
- GNUNET_GEBULK,
- _("Could not send notification via libnotify\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN
+ | GNUNET_GE_BULK,
+ _("Could not send notification via libnotify\n"));
}
g_object_unref (G_OBJECT (libnotify));
notify_uninit ();
@@ -558,7 +559,7 @@
GNUNET_free (msg);
msg = GNUNET_strdup (ret);
g_free (ret);
- GNUNET_GEBREAK (NULL, TRUE == g_utf8_validate (msg, -1, &end));
+ GNUNET_GE_BREAK (NULL, TRUE == g_utf8_validate (msg, -1, &end));
return msg;
}
@@ -634,7 +635,7 @@
messageDialog =
gtk_message_dialog_new (GTK_WINDOW (mainWindow),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGNUNET_GEWARNING, GTK_BUTTONS_CLOSE,
+ GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
_
("Failed to run the configuration tool
(gnunet-setup): %s"),
error_message);
Modified: gnunet-gtk/src/common/logging.c
===================================================================
--- gnunet-gtk/src/common/logging.c 2007-11-25 12:25:52 UTC (rev 5763)
+++ gnunet-gtk/src/common/logging.c 2007-11-25 12:26:06 UTC (rev 5764)
@@ -46,7 +46,7 @@
statusXML
=
glade_xml_new (GNUNET_GTK_get_glade_filename (), "statusWindow",
- PACKAGNUNET_GENAME);
+ PACKAGNUNET_GE_NAME);
infoWindow = glade_xml_get_widget (statusXML, "statusWindow");
infoWindowTextView
= glade_xml_get_widget (statusXML, "messageWindowTextView");
@@ -170,24 +170,24 @@
static void
ge_gtk_log_handler (void *ctx,
- GNUNET_GEKIND kind, const char *date, const char *msg)
+ GNUNET_GE_KIND kind, const char *date, const char *msg)
{
int popUp;
popUp = GNUNET_NO;
- if ((kind & (GNUNET_GEFATAL | GNUNET_GEERROR | GNUNET_GEWARNING)) > 0)
+ if ((kind & (GNUNET_GE_FATAL | GNUNET_GE_ERROR | GNUNET_GE_WARNING)) > 0)
popUp = GNUNET_YES;
GNUNET_GTK_show_info_message (popUp, "%s: %s", date, msg);
}
-struct GNUNET_GEContext *
-GNUNET_GTK_create_gtk_logger (GNUNET_GEKIND mask)
+struct GNUNET_GE_Context *
+GNUNET_GTK_create_gtk_logger (GNUNET_GE_KIND mask)
{
- struct GNUNET_GEContext *myLog;
+ struct GNUNET_GE_Context *myLog;
- myLog = GNUNET_GEcreate_context_callback (mask,
- &ge_gtk_log_handler, NULL, NULL,
- NULL);
+ myLog = GNUNET_GE_create_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:25:52 UTC (rev 5763)
+++ gnunet-gtk/src/core/eggtrayicon.c 2007-11-25 12:26:06 UTC (rev 5764)
@@ -200,7 +200,7 @@
icon->stamp = 1;
icon->orientation = GTK_ORIENTATION_HORIZONTAL;
- gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGNUNET_GEMASK);
+ gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
}
static void
@@ -544,8 +544,7 @@
ev.window = (Window) gtk_plug_get_id (GTK_PLUG (icon));
ev.format = 8;
ev.message_type = XInternAtom (xdisplay,
- "_NET_SYSTEM_TRAY_MESSAGNUNET_GEDATA",
- False);
+ "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
if (len > 20)
{
memcpy (&ev.data, message, 20);
@@ -649,7 +648,7 @@
trayContextMenuXML =
glade_xml_new (GNUNET_GTK_get_glade_filename (), "trayContextMenu",
- PACKAGNUNET_GENAME);
+ PACKAGNUNET_GE_NAME);
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:25:52 UTC (rev 5763)
+++ gnunet-gtk/src/core/main.c 2007-11-25 12:26:06 UTC (rev 5764)
@@ -64,7 +64,7 @@
void
GNUNET_GTK_main_quit ()
{
- GNUNET_GEsetDefaultContext (NULL);
+ GNUNET_GE_setDefaultContext (NULL);
GNUNET_GTK_run_with_save_calls (&shutdownCode, NULL);
gtk_main_quit ();
}
@@ -82,11 +82,11 @@
{
GtkWidget *root;
int i;
- struct GNUNET_GEContext *ectx;
- struct GNUNET_GEContext *my_ctx;
+ struct GNUNET_GE_Context *ectx;
+ struct GNUNET_GE_Context *my_ctx;
struct GNUNET_GC_Configuration *cfg;
char *log;
- GNUNET_GEKIND mask;
+ GNUNET_GE_KIND mask;
#if ENABLE_NLS
char *path;
#endif
@@ -124,17 +124,17 @@
GNUNET_GC_get_configuration_value_string (cfg,
"LOGGING",
"USER-LEVEL", "WARNING", &log);
- mask = GNUNET_GEgetKIND (log);
+ mask = GNUNET_GE_getKIND (log);
GNUNET_free (log);
mask |= mask - 1; /* set all bits... */
- mask |= GNUNET_GEUSER | GNUNET_GEBULK | GNUNET_GEIMMEDIATE;
+ mask |= GNUNET_GE_USER | GNUNET_GE_BULK | GNUNET_GE_IMMEDIATE;
if (GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg,
"LOGGING",
"DEVELOPER",
GNUNET_NO))
- mask |= GNUNET_GEDEVELOPER | GNUNET_GEREQUEST;
+ mask |= GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST;
my_ctx = GNUNET_GTK_create_gtk_logger (mask);
- GNUNET_GEsetDefaultContext (my_ctx);
+ GNUNET_GE_setDefaultContext (my_ctx);
root =
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
gtk_window_maximize (GTK_WINDOW (root));
@@ -152,8 +152,8 @@
gtk_main ();
gdk_threads_leave ();
- GNUNET_GEsetDefaultContext (ectx);
- GNUNET_GEfree_context (my_ctx);
+ GNUNET_GE_setDefaultContext (ectx);
+ GNUNET_GE_free_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:25:52 UTC (rev
5763)
+++ gnunet-gtk/src/include/gnunetgtk_common.h 2007-11-25 12:26:06 UTC (rev
5764)
@@ -31,9 +31,9 @@
#include <gtk/gtktext.h>
#include <glade/glade.h>
-#define DEBUG_GTK 0
+#define GNUNET_GTK_DEBUG_GTK 0
-#if DEBUG_GTK
+#if GNUNET_GTK_DEBUG_GTK
#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__)
@@ -43,7 +43,7 @@
#define GNUNET_GTK_DEBUG_END()
#endif
-void GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *ectx,
+void GNUNET_GTK_initialize_common_library (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration
*cfg, void *callback);
@@ -77,7 +77,7 @@
*/
void GNUNET_GTK_add_log_entry (const char *txt, ...);
-struct GNUNET_GEContext *GNUNET_GTK_create_gtk_logger (GNUNET_GEKIND mask);
+struct GNUNET_GE_Context *GNUNET_GTK_create_gtk_logger (GNUNET_GE_KIND mask);
#define GNUNET_GTK_NOTIFY_LEVEL_LOW 0
#define GNUNET_GTK_NOTIFY_LEVEL_NORMAL 1
Modified: gnunet-gtk/src/include/plibc.h
===================================================================
--- gnunet-gtk/src/include/plibc.h 2007-11-25 12:25:52 UTC (rev 5763)
+++ gnunet-gtk/src/include/plibc.h 2007-11-25 12:26:06 UTC (rev 5764)
@@ -58,7 +58,7 @@
/* Conflicts with our definitions */
#define __G_WIN32_H__
-/* Convert LARGNUNET_GEINTEGER to double */
+/* Convert LARGNUNET_GE_INTEGER to double */
#define Li2Double(x) ((double)((x).HighPart) * 4.294967296E9 + \
(double)((x).LowPart))
@@ -241,10 +241,10 @@
typedef struct
{
- LARGNUNET_GEINTEGER IdleTime;
- LARGNUNET_GEINTEGER KernelTime;
- LARGNUNET_GEINTEGER UserTime;
- LARGNUNET_GEINTEGER Reserved1[2];
+ LARGNUNET_GE_INTEGER IdleTime;
+ LARGNUNET_GE_INTEGER KernelTime;
+ LARGNUNET_GE_INTEGER UserTime;
+ LARGNUNET_GE_INTEGER 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:25:52 UTC (rev
5763)
+++ gnunet-gtk/src/plugins/about/about.c 2007-11-25 12:26:06 UTC (rev
5764)
@@ -40,7 +40,7 @@
axml =
glade_xml_new (GNUNET_GTK_get_glade_filename (), "aboutDialog",
- PACKAGNUNET_GENAME);
+ PACKAGNUNET_GE_NAME);
ad = glade_xml_get_widget (axml, "aboutDialog");
gtk_dialog_run (GTK_DIALOG (ad));
gtk_widget_destroy (ad);
Modified: gnunet-gtk/src/plugins/daemon/daemon.c
===================================================================
--- gnunet-gtk/src/plugins/daemon/daemon.c 2007-11-25 12:25:52 UTC (rev
5763)
+++ gnunet-gtk/src/plugins/daemon/daemon.c 2007-11-25 12:26:06 UTC (rev
5764)
@@ -33,7 +33,7 @@
static struct GNUNET_CronManager *cron;
-static struct GNUNET_GEContext *ectx;
+static struct GNUNET_GE_Context *ectx;
static struct GNUNET_GC_Configuration *cfg;
@@ -263,7 +263,7 @@
= glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"gnunetdconfigFileChooserButton");
fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
- GNUNET_GEBREAK (ectx, fn != NULL);
+ GNUNET_GE_BREAK (ectx, fn != NULL);
if (GNUNET_SYSERR != GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES))
{
GNUNET_GTK_add_log_entry (_("Launched gnunetd"));
@@ -301,7 +301,7 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGNUNET_GEERROR,
+ GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE, _("Error requesting shutdown of gnunetd."));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -316,7 +316,7 @@
}
void
-init_daemon (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
+init_daemon (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
{
GtkWidget *tab;
GtkWidget *apps;
Modified: gnunet-gtk/src/plugins/fs/collection.c
===================================================================
--- gnunet-gtk/src/plugins/fs/collection.c 2007-11-25 12:25:52 UTC (rev
5763)
+++ gnunet-gtk/src/plugins/fs/collection.c 2007-11-25 12:26:06 UTC (rev
5764)
@@ -61,7 +61,7 @@
metaXML
= glade_xml_new (GNUNET_GTK_get_glade_filename (),
- "createCollectionDialog", PACKAGNUNET_GENAME);
+ "createCollectionDialog", PACKAGNUNET_GE_NAME);
GNUNET_GTK_connect_glade_with_plugins (metaXML);
dialog = glade_xml_get_widget (metaXML, "createCollectionDialog");
createMetaDataListTreeView (metaXML,
@@ -85,7 +85,7 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGNUNET_GEERROR,
+ GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -117,7 +117,7 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGNUNET_GEERROR,
+ GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
_("Failed to start collection `%s' (consult logs)."),
collectionName);
Modified: gnunet-gtk/src/plugins/fs/content_tracking.c
===================================================================
--- gnunet-gtk/src/plugins/fs/content_tracking.c 2007-11-25 12:25:52 UTC
(rev 5763)
+++ gnunet-gtk/src/plugins/fs/content_tracking.c 2007-11-25 12:26:06 UTC
(rev 5764)
@@ -45,7 +45,7 @@
struct GNUNET_ECRS_MetaData *meta;
GtkTreeIter iter;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
if (gtk_tree_model_get_iter_first (model, &iter))
{
do
@@ -61,7 +61,7 @@
}
while (gtk_list_store_remove (GTK_LIST_STORE (model), &iter));
}
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
return NULL;
}
@@ -73,14 +73,14 @@
GtkWidget *contentList;
GtkTreeModel *model;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
contentList =
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"availableContentList");
model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList));
GNUNET_URITRACK_clear (ectx, cfg);
GNUNET_GTK_save_call (&clearContentList, model);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
}
void
@@ -146,7 +146,7 @@
}
if (GNUNET_ECRS_uri_test_chk (fi->uri))
- size = GNUNET_ECRS_uri_get_file_siz (fi->uri);
+ size = GNUNET_ECRS_uri_get_file_size (fi->uri);
else
size = 0;
uriString = GNUNET_ECRS_uri_to_string (fi->uri);
Modified: gnunet-gtk/src/plugins/fs/directory.c
===================================================================
--- gnunet-gtk/src/plugins/fs/directory.c 2007-11-25 12:25:52 UTC (rev
5763)
+++ gnunet-gtk/src/plugins/fs/directory.c 2007-11-25 12:26:06 UTC (rev
5764)
@@ -45,7 +45,7 @@
uploadXML
= glade_xml_new (GNUNET_GTK_get_glade_filename (),
- "openDirectoryFileDialog", PACKAGNUNET_GENAME);
+ "openDirectoryFileDialog", PACKAGNUNET_GE_NAME);
GNUNET_GTK_connect_glade_with_plugins (uploadXML);
dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
"openDirectoryFileDialog"));
@@ -121,7 +121,7 @@
}
kws[0] = dn;
kws[1] = NULL;
- uri = GNUNET_ECRS_keyword_string_to_uri (kws);
+ uri = GNUNET_ECRS_keyword_strings_to_uri (kws);
md = NULL;
list = fs_search_started (NULL, uri, 0, 0, NULL, GNUNET_FSUI_COMPLETED);
GNUNET_ECRS_uri_destroy (uri);
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2007-11-25 12:25:52 UTC (rev
5763)
+++ gnunet-gtk/src/plugins/fs/download.c 2007-11-25 12:26:06 UTC (rev
5764)
@@ -57,7 +57,7 @@
path = gtk_tree_row_reference_get_path (list->searchViewRowReference);
if (path == NULL)
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
return GNUNET_SYSERR;
}
gtk_tree_model_get_iter (model, &iter, path);
@@ -135,9 +135,9 @@
data = MMAP (NULL, size, PROT_READ, MAP_SHARED, fd, 0);
if ((data == MAP_FAILED) || (data == NULL))
{
- GNUNET_GELOG_STRERROR_FILE (ectx,
- GNUNET_GEERROR | GNUNET_GEADMIN |
- GNUNET_GEBULK, "mmap", f);
+ GNUNET_GE_LOG_STRERROR_FILE (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "mmap", f);
CLOSE (fd);
GNUNET_free_non_null (fn);
return;
@@ -208,7 +208,7 @@
{
gtk_tree_store_append (download_summary, &iter, NULL);
}
- size = GNUNET_ECRS_uri_get_file_siz (fi->uri);
+ size = GNUNET_ECRS_uri_get_file_size (fi->uri);
size_h = GNUNET_get_byte_size_as_fancy_string (size);
sname = &filename[strlen (filename) - 1];
while ((sname > filename) && (sname[-1] != '/') && (sname[-1] != '\\'))
@@ -245,10 +245,10 @@
/* FIXME: this requires GTK 2.8. Since it doesn't support Win9x, the
quick
solution is to #ifndef it */
#ifndef MINGW
- GNUNET_GEBREAK (ectx,
- gtk_tree_row_reference_get_model (dl_parent->
-
searchViewRowReference)
- == model);
+ GNUNET_GE_BREAK (ectx,
+ gtk_tree_row_reference_get_model (dl_parent->
+
searchViewRowReference)
+ == model);
#endif
path =
gtk_tree_row_reference_get_path (dl_parent->
@@ -256,16 +256,16 @@
if (path != NULL)
{
valid = gtk_tree_model_get_iter (model, &piter, path);
- GNUNET_GEBREAK (ectx, valid == TRUE);
+ GNUNET_GE_BREAK (ectx, valid == TRUE);
if (valid == TRUE)
{
valid = gtk_tree_model_iter_children (model, &iter, &piter);
- GNUNET_GEBREAK (ectx, valid == TRUE);
+ GNUNET_GE_BREAK (ectx, valid == TRUE);
}
}
else
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
valid = FALSE;
}
}
@@ -273,7 +273,7 @@
{
/* no download-parent, must be top-level entry in search */
valid = gtk_tree_model_get_iter_first (model, &iter);
- GNUNET_GEBREAK (ectx, valid == TRUE);
+ GNUNET_GE_BREAK (ectx, valid == TRUE);
}
while (valid == TRUE)
{
@@ -298,7 +298,7 @@
{
/* did not find matching entry in search list -- bug! Continue
without adding to to search list! */
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
list->searchList = NULL;
}
}
@@ -332,7 +332,7 @@
path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
if (path == NULL)
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
return;
}
gtk_tree_model_get_iter (GTK_TREE_MODEL (download_summary), &iter, path);
@@ -429,7 +429,7 @@
path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
if (path == NULL)
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
}
else
{
@@ -449,7 +449,7 @@
path = gtk_tree_row_reference_get_path (list->searchViewRowReference);
if (path == NULL)
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
}
else
{
@@ -479,7 +479,7 @@
if (prev != NULL)
prev->next = list->next;
else
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
}
GNUNET_free (list);
}
@@ -590,7 +590,7 @@
(!(GNUNET_ECRS_uri_test_chk (sdc.idc_uri)
|| GNUNET_ECRS_uri_test_loc (sdc.idc_uri))))
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
GNUNET_free_non_null (idc_name);
GNUNET_free_non_null (idc_mime);
return;
@@ -600,7 +600,7 @@
(strlen (sdc.uri_name) <
strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_FILE_INFIX)))
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
GNUNET_free_non_null (sdc.uri_name);
GNUNET_free_non_null (idc_name);
GNUNET_free_non_null (idc_mime);
@@ -620,10 +620,10 @@
#ifdef WINDOWS
char *filehash;
- GNUNET_GEASSERT (NULL,
- strlen (sdc.uri_name) >
- strlen (GNUNET_ECRS_URI_PREFIX) +
- strlen (GNUNET_ECRS_FILE_INFIX));
+ GNUNET_GE_ASSERT (NULL,
+ strlen (sdc.uri_name) >
+ strlen (GNUNET_ECRS_URI_PREFIX) +
+ strlen (GNUNET_ECRS_FILE_INFIX));
GNUNET_free_non_null (idc_name);
filehash =
GNUNET_strdup (&sdc.
@@ -633,10 +633,10 @@
idc_name = GNUNET_strdup (filehash);
GNUNET_free_non_null (filehash);
#else
- GNUNET_GEASSERT (NULL,
- strlen (sdc.uri_name) >
- strlen (GNUNET_ECRS_URI_PREFIX) +
- strlen (GNUNET_ECRS_FILE_INFIX));
+ GNUNET_GE_ASSERT (NULL,
+ strlen (sdc.uri_name) >
+ strlen (GNUNET_ECRS_URI_PREFIX) +
+ strlen (GNUNET_ECRS_FILE_INFIX));
GNUNET_free_non_null (idc_name);
idc_name =
GNUNET_strdup (&sdc.
@@ -863,7 +863,7 @@
DownloadList *dl;
struct FCBC fcbc;
- GNUNET_GEASSERT (ectx, model == GTK_TREE_MODEL (download_summary));
+ GNUNET_GE_ASSERT (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))
@@ -890,7 +890,7 @@
DownloadList *dl;
struct FCBC fcbc;
- GNUNET_GEASSERT (ectx, model == GTK_TREE_MODEL (download_summary));
+ GNUNET_GE_ASSERT (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;
Modified: gnunet-gtk/src/plugins/fs/extensions/musicinsert.c
===================================================================
--- gnunet-gtk/src/plugins/fs/extensions/musicinsert.c 2007-11-25 12:25:52 UTC
(rev 5763)
+++ gnunet-gtk/src/plugins/fs/extensions/musicinsert.c 2007-11-25 12:26:06 UTC
(rev 5764)
@@ -79,7 +79,7 @@
{
musicinsertXML =
glade_xml_new (MUSICINSERTXMLFILE, "musicinsertdialog",
- PACKAGNUNET_GENAME);
+ PACKAGNUNET_GE_NAME);
glade_xml_signal_autoconnect (musicinsertXML);
/* libglade*/
@@ -486,7 +486,7 @@
GtkWidget *message_dialog =
gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGNUNET_GEERROR,
+ GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
"%s", error_message);
gtk_dialog_run (GTK_DIALOG (message_dialog));
@@ -751,7 +751,7 @@
GtkWidget *file_error_dialog =
gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGNUNET_GEERROR,
+ GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
file_error_message->str);
gtk_dialog_run (GTK_DIALOG (file_error_dialog));
@@ -767,7 +767,7 @@
GtkWidget *message_dialog =
gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGNUNET_GEERROR,
+ GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
"%s%s", error_message,
dir_opening_error->message);
@@ -839,7 +839,7 @@
GtkWidget *file_error_dialog =
gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGNUNET_GEERROR,
+ GTK_MESSAGE_ERROR,
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:25:52 UTC (rev 5763)
+++ gnunet-gtk/src/plugins/fs/fs.c 2007-11-25 12:26:06 UTC (rev 5764)
@@ -37,7 +37,7 @@
struct GNUNET_FSUI_Context *ctx;
-struct GNUNET_GEContext *ectx;
+struct GNUNET_GE_Context *ectx;
struct GNUNET_GC_Configuration *cfg;
@@ -99,7 +99,7 @@
spin = GTK_SPIN_BUTTON (w);
if (spin == NULL)
{
- GNUNET_GEBREAK (NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
return;
}
val = gtk_spin_button_get_value_as_int (spin);
@@ -249,10 +249,10 @@
break;
/* TODO: unindex events */
default:
- GNUNET_GEBREAK (ectx, 0);
- GNUNET_GELOG (ectx,
- GNUNET_GEERROR,
- _("Unhandled (unknown) FSUI event: %u.\n"), event->type);
+ GNUNET_GE_BREAK (ectx, 0);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR,
+ _("Unhandled (unknown) FSUI event: %u.\n"), event->type);
break;
}
return ret;
@@ -367,13 +367,13 @@
last_y,
&path, NULL, NULL, NULL))
{
- GNUNET_GEBREAK (NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
return FALSE;
}
if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary),
&iter, path))
{
- GNUNET_GEBREAK (NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
gtk_tree_path_free (path);
return FALSE;
}
@@ -657,7 +657,7 @@
}
void
-init_fs (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
+init_fs (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
{
GtkWidget *tab;
GtkWidget *book;
Modified: gnunet-gtk/src/plugins/fs/fs.h
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.h 2007-11-25 12:25:52 UTC (rev 5763)
+++ gnunet-gtk/src/plugins/fs/fs.h 2007-11-25 12:26:06 UTC (rev 5764)
@@ -313,7 +313,7 @@
extern struct GNUNET_FSUI_Context *ctx;
-extern struct GNUNET_GEContext *ectx;
+extern struct GNUNET_GE_Context *ectx;
extern struct GNUNET_GC_Configuration *cfg;
Modified: gnunet-gtk/src/plugins/fs/meta.c
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.c 2007-11-25 12:25:52 UTC (rev 5763)
+++ gnunet-gtk/src/plugins/fs/meta.c 2007-11-25 12:26:06 UTC (rev 5764)
@@ -66,7 +66,7 @@
GtkTreeViewColumn *column;
int col;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
metamodel
= gtk_list_store_new (META_NUM, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
metaList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name));
@@ -121,7 +121,7 @@
}
UNREF (loader);
}
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
}
static int
@@ -130,10 +130,10 @@
GtkListStore *store = cls;
GtkTreeIter iter;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, data, -1);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
return GNUNET_OK;
}
@@ -147,7 +147,7 @@
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
keymodel = gtk_list_store_new (1, G_TYPE_STRING);
keywordList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name));
gtk_tree_selection_set_mode (gtk_tree_view_get_selection (keywordList),
@@ -165,7 +165,7 @@
gtk_tree_view_set_model (keywordList, GTK_TREE_MODEL (keymodel));
if (init != NULL)
GNUNET_ECRS_uri_get_keywords_from_ksk (init, &publishKeyword, keymodel);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
}
void
@@ -178,7 +178,7 @@
GtkTreeIter iter;
EXTRACTOR_KeywordType type;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
keywordTypeModel
= gtk_list_store_new (KTYPE_NUM, G_TYPE_STRING, G_TYPE_INT);
metaType = glade_xml_get_widget (xml, name);
@@ -196,7 +196,7 @@
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (metaType),
renderer, "text", KTYPE_STRING);
gtk_combo_box_set_active (GTK_COMBO_BOX (metaType), 0);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
}
void
@@ -210,7 +210,7 @@
GtkListStore *keymodel;
GtkTreeIter iter;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
keywordList = glade_xml_get_widget (xml, keywordListName);
keymodel
= GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (keywordList)));
@@ -220,7 +220,7 @@
gtk_list_store_append (keymodel, &iter);
gtk_list_store_set (keymodel, &iter, 0, keyword, -1);
gtk_entry_set_text (GTK_ENTRY (entryLine), "");
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
}
void
@@ -239,7 +239,7 @@
GtkTreeIter iter;
char *stype;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
metaList = glade_xml_get_widget (xml, metaDataListName);
metamodel
= GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (metaList)));
@@ -262,7 +262,7 @@
META_STYPE, stype, META_VALUE, value, -1);
gtk_entry_set_text (GTK_ENTRY (entryLine), "");
GNUNET_free_non_null (stype);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
}
static void
@@ -323,8 +323,7 @@
preview = glade_xml_get_widget (xml, previewName);
- if (GTK_IMAGNUNET_GEPIXBUF ==
- gtk_image_get_storage_type (GTK_IMAGE (preview)))
+ if (GTK_IMAGE_PIXBUF == gtk_image_get_storage_type (GTK_IMAGE (preview)))
{
pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (preview));
if (pixbuf == NULL)
@@ -380,7 +379,7 @@
unsigned int kpos;
unsigned int ksize;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
keyList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name));
keymodel = gtk_tree_view_get_model (keyList);
@@ -401,11 +400,11 @@
}
keywords[kpos] = NULL;
- keywordURI = GNUNET_ECRS_keyword_string_to_uri ((const char **) keywords);
+ keywordURI = GNUNET_ECRS_keyword_strings_to_uri ((const char **) keywords);
while (kpos > 0)
GNUNET_free (keywords[--kpos]);
GNUNET_array_grow (keywords, ksize, 0);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
return keywordURI;
}
Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c 2007-11-25 12:25:52 UTC (rev
5763)
+++ gnunet-gtk/src/plugins/fs/namespace.c 2007-11-25 12:26:06 UTC (rev
5764)
@@ -114,10 +114,10 @@
GtkTreeViewColumn *column;
int col;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
namespaceXML
= glade_xml_new (GNUNET_GTK_get_glade_filename (),
- "namespaceContentFrame", PACKAGNUNET_GENAME);
+ "namespaceContentFrame", PACKAGNUNET_GE_NAME);
GNUNET_GTK_connect_glade_with_plugins (namespaceXML);
child = extractMainWidgetFromWindow (namespaceXML, "namespaceContentFrame");
resultList = glade_xml_get_widget (namespaceXML,
@@ -278,7 +278,7 @@
UNREF (namespaceXML);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
entry->namespacepage = child;
}
@@ -318,7 +318,7 @@
unsigned long long size;
char *size_h;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
EXTRACTOR_FILENAME,
EXTRACTOR_TITLE,
@@ -352,7 +352,7 @@
if (mime == NULL)
mime = GNUNET_strdup (_("unknown"));
if (GNUNET_ECRS_uri_test_chk (fi->uri))
- size = GNUNET_ECRS_uri_get_file_siz (fi->uri);
+ size = GNUNET_ECRS_uri_get_file_size (fi->uri);
else
size = 0;
uriString = GNUNET_ECRS_uri_to_string (fi->uri);
@@ -393,7 +393,7 @@
GNUNET_free (freq);
GNUNET_free (date);
GNUNET_free (mime);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
return GNUNET_OK;
}
@@ -415,7 +415,7 @@
GNUNET_ECRS_namespace_test_exists (NULL, cfg, namespaceName,
namespaceId))
return GNUNET_OK;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
label = gtk_label_new (namespaceName);
list = GNUNET_malloc (sizeof (NamespaceList));
list->name = GNUNET_strdup (namespaceName);
@@ -434,7 +434,7 @@
gtk_widget_show (notebook);
GNUNET_NS_namespace_list_contents
(ectx, cfg, namespaceName, &addNamespaceContentToModel, list->model);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
/* enable "delete" menu entry */
del_menu =
@@ -468,7 +468,7 @@
}
if (pos == NULL)
{
- GNUNET_GEBREAK (NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
return;
}
if (prev == NULL)
@@ -516,7 +516,7 @@
GtkWidget *dialog;
gint ret;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
notebook =
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"localNamespacesNotebook");
@@ -528,7 +528,7 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGNUNET_GEERROR,
+ GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
_("No local namespaces available that could be deleted!"));
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -545,7 +545,7 @@
}
if (list == NULL)
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
return;
}
/* open window to ask for confirmation,
@@ -554,7 +554,7 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGNUNET_GEERROR,
+ GTK_MESSAGE_ERROR,
GTK_BUTTONS_YES_NO,
_("Should the namespace `%s' really be deleted?"), list->name);
ret = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -564,7 +564,7 @@
gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), num);
GNUNET_NS_namespace_delete (ectx, cfg, list->name);
frame_destroy (list->treeview);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
}
typedef struct
@@ -592,13 +592,13 @@
NamespaceList *list;
GNUNET_ECRS_FileInfo fi;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
dst = NULL;
gtk_tree_model_get (model,
iter, NAMESPACE_URI, &dst, NAMESPACE_META, &meta, -1);
if (dst == NULL)
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
return;
}
resultURI = GNUNET_NS_add_to_namespace (ectx, cfg, cls->anonymityLevel,
1000, /* FIXME: priority */
@@ -615,7 +615,7 @@
list = list->next;
if (list == NULL)
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
}
else
{
@@ -639,7 +639,7 @@
("Failed to insert content into namespace "
"(consult logs).\n"));
}
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
}
void
@@ -677,21 +677,21 @@
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"localNamespacesNotebook");
num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
- GNUNET_GEASSERT (ectx, num != -1);
+ GNUNET_GE_ASSERT (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)
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
return;
}
cls.namespaceName = list->name;
metaXML
= glade_xml_new (GNUNET_GTK_get_glade_filename (),
- "namespaceInsertDialog", PACKAGNUNET_GENAME);
+ "namespaceInsertDialog", PACKAGNUNET_GE_NAME);
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);
@@ -715,7 +715,7 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGNUNET_GEERROR,
+ GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -779,20 +779,20 @@
gint num;
const char *nn_str;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
/* find out which namespace this is about */
notebook =
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"localNamespacesNotebook");
num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
- GNUNET_GEASSERT (ectx, num != -1);
+ GNUNET_GE_ASSERT (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)
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
return;
}
cls.namespaceName = list->name;
@@ -801,7 +801,7 @@
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list->treeview));
if (TRUE != gtk_tree_selection_get_selected (selection, NULL, &iter))
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
return;
}
gtk_tree_model_get (list->model,
@@ -811,19 +811,19 @@
IN_NAMESPACE_PUB_FREQ_STRING, &freq, -1);
if ((last == NULL) || (next == NULL) || (freq == NULL))
{
- GNUNET_GEBREAK (NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
return;
}
if (GNUNET_OK != parseTimeInterval (freq, &cls.updateInterval))
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
cls.updateInterval = GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC;
}
/* create update dialog */
metaXML
= glade_xml_new (GNUNET_GTK_get_glade_filename (),
- "namespaceUpdateDialog", PACKAGNUNET_GENAME);
+ "namespaceUpdateDialog", PACKAGNUNET_GE_NAME);
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);
@@ -877,7 +877,7 @@
mdialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGNUNET_GEERROR,
+ GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
gtk_dialog_run (GTK_DIALOG (mdialog));
gtk_widget_destroy (mdialog);
@@ -896,7 +896,7 @@
free (last);
free (next);
free (freq);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
}
@@ -911,7 +911,7 @@
GtkTreeViewColumn *column;
int col;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
trackCheckButton
=
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
@@ -990,7 +990,7 @@
GNUNET_NS_namespace_list_all (ectx, cfg, &addTabForNamespace, NULL);
GNUNET_NS_register_discovery_callback (ectx, cfg, &namespace_discovered_cb,
NULL);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
}
Modified: gnunet-gtk/src/plugins/fs/namespace_create.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_create.c 2007-11-25 12:25:52 UTC
(rev 5763)
+++ gnunet-gtk/src/plugins/fs/namespace_create.c 2007-11-25 12:26:06 UTC
(rev 5764)
@@ -173,10 +173,10 @@
GNUNET_HashCode namespaceId;
GNUNET_HashCode rootEntry;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
metaXML
= glade_xml_new (GNUNET_GTK_get_glade_filename (),
- "namespaceMetaDataDialog", PACKAGNUNET_GENAME);
+ "namespaceMetaDataDialog", PACKAGNUNET_GE_NAME);
GNUNET_GTK_connect_glade_with_plugins (metaXML);
dialog = glade_xml_get_widget (metaXML, "namespaceMetaDataDialog");
createMetaDataListTreeView (metaXML,
@@ -238,7 +238,7 @@
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,
- GTK_MESSAGNUNET_GEERROR,
+ GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
_("Failed to create namespace `%s'."
"Consult logs, most likely error is"
@@ -253,5 +253,5 @@
gtk_widget_destroy (dialog);
UNREF (metaXML);
metaXML = NULL;
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
}
Modified: gnunet-gtk/src/plugins/fs/namespace_search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_search.c 2007-11-25 12:25:52 UTC
(rev 5763)
+++ gnunet-gtk/src/plugins/fs/namespace_search.c 2007-11-25 12:26:06 UTC
(rev 5764)
@@ -52,7 +52,7 @@
int rating;
int newrating;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
spin =
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"namespaceRatingSpinButton");
@@ -86,7 +86,7 @@
{
/* concurrent modification? */
gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), rating);
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
}
gtk_list_store_set (GTK_LIST_STORE (model),
&iter, NS_SEARCH_RATING, rating, -1);
@@ -104,7 +104,7 @@
free (description);
if (encStr != NULL)
free (encStr);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
}
@@ -129,7 +129,7 @@
GNUNET_HashCode root;
GNUNET_EncName enc;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
spin =
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"namespaceRatingSpinButton");
@@ -184,7 +184,7 @@
free (descStr);
if (encStr != NULL)
free (encStr);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
}
struct NewNamespaceInfo
@@ -211,7 +211,7 @@
int found;
char *encName;
- DEBUG_BEGIN ();
+ GNUNET_GTK_DEBUG_BEGIN ();
ncbe =
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"searchNamespaceComboBoxEntry");
@@ -274,7 +274,7 @@
NS_SEARCH_RATING, nni->rating, -1);
}
GNUNET_free (name);
- DEBUG_END ();
+ GNUNET_GTK_DEBUG_END ();
return NULL;
}
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2007-11-25 12:25:52 UTC (rev 5763)
+++ gnunet-gtk/src/plugins/fs/search.c 2007-11-25 12:26:06 UTC (rev 5764)
@@ -73,7 +73,7 @@
if (TRUE !=
gtk_tree_model_get_iter (GTK_TREE_MODEL (search_summary), &iter, path))
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
return;
}
gtk_tree_path_free (path);
@@ -112,7 +112,7 @@
unsigned long long size;
char *size_h;
GdkPixbuf *pixbuf;
- enum URITRACK_STATE state;
+ enum GNUNET_URITRACK_STATE state;
state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri);
mime = getMimeTypeFromMetaData (info->meta);
@@ -120,8 +120,8 @@
name = getFileNameFromMetaData (info->meta);
size = GNUNET_ECRS_uri_test_chk (info->uri)
|| GNUNET_ECRS_uri_test_loc (info->
- uri) ? GNUNET_ECRS_uri_get_file_siz (info->
- uri) :
+ uri) ? GNUNET_ECRS_uri_get_file_size (info->
+ uri) :
0;
pixbuf = getThumbnailFromMetaData (info->meta);
size_h = GNUNET_get_byte_size_as_fancy_string (size);
@@ -163,7 +163,7 @@
{
GtkTreeStore *model;
GtkTreeIter iter;
- enum URITRACK_STATE state;
+ enum GNUNET_URITRACK_STATE state;
state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri);
if ((state & (GNUNET_URITRACK_INSERTED |
@@ -196,13 +196,13 @@
list->last_y,
&path, NULL, NULL, NULL))
{
- GNUNET_GEBREAK (NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
return FALSE;
}
if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (list->tree),
&iter, path))
{
- GNUNET_GEBREAK (NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
gtk_tree_path_free (path);
return FALSE;
}
@@ -228,7 +228,7 @@
uploadXML
= glade_xml_new (GNUNET_GTK_get_glade_filename (),
- "directorySaveDialog", PACKAGNUNET_GENAME);
+ "directorySaveDialog", PACKAGNUNET_GE_NAME);
GNUNET_GTK_connect_glade_with_plugins (uploadXML);
dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
"directorySaveDialog"));
@@ -302,7 +302,7 @@
fis_size, fis, meta))
{
GNUNET_GTK_add_log_entry (_("Internal error."));
- GNUNET_GEBREAK (NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
GNUNET_ECRS_meta_data_destroy (meta);
GNUNET_array_grow (fis, fis_size, 0);
GNUNET_free (name);
@@ -387,11 +387,11 @@
description = GNUNET_ECRS_uri_to_string (uri);
if (description == NULL)
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
return NULL;
}
- GNUNET_GEASSERT (ectx,
- strlen (description) >= strlen (GNUNET_ECRS_URI_PREFIX));
+ GNUNET_GE_ASSERT (ectx,
+ strlen (description) >= strlen (GNUNET_ECRS_URI_PREFIX));
dhead = &description[strlen (GNUNET_ECRS_URI_PREFIX)];
if (0 ==
strncmp (dhead, GNUNET_ECRS_SEARCH_INFIX,
@@ -411,7 +411,7 @@
list->searchXML
=
glade_xml_new (GNUNET_GTK_get_glade_filename (), "searchResultsFrame",
- PACKAGNUNET_GENAME);
+ PACKAGNUNET_GE_NAME);
GNUNET_GTK_connect_glade_with_plugins (list->searchXML);
list->searchpage
= extractMainWidgetFromWindow (list->searchXML, "searchResultsFrame");
@@ -545,7 +545,7 @@
/* load label */
list->labelXML
= glade_xml_new (GNUNET_GTK_get_glade_filename (),
- "searchTabLabelWindow", PACKAGNUNET_GENAME);
+ "searchTabLabelWindow", PACKAGNUNET_GE_NAME);
GNUNET_GTK_connect_glade_with_plugins (list->labelXML);
list->tab_label
= extractMainWidgetFromWindow (list->labelXML, "searchTabLabelWindow");
@@ -657,7 +657,7 @@
for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
if (list->searchpage == gtk_notebook_get_nth_page (notebook, i))
index = i;
- GNUNET_GEBREAK (ectx, index != -1);
+ GNUNET_GE_BREAK (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))
@@ -736,9 +736,9 @@
"fssearchKeywordComboBoxEntry");
if ((searchString == NULL) || (strlen (searchString) == 0))
{
- GNUNET_GELOG (ectx,
- GNUNET_GEERROR | GNUNET_GEUSER | GNUNET_GEIMMEDIATE,
- _("Need a keyword to search!\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ _("Need a keyword to search!\n"));
return;
}
/* add the keyword to the list of keywords that have
@@ -781,7 +781,7 @@
}
else
{
- GNUNET_GEASSERT (ectx, strlen (ns) == sizeof (GNUNET_EncName) - 1);
+ GNUNET_GE_ASSERT (ectx, strlen (ns) == sizeof (GNUNET_EncName) - 1);
if ((descStr == NULL) && (ns != NULL))
descStr = GNUNET_strdup (ns);
}
@@ -801,10 +801,11 @@
fsss.uri = GNUNET_ECRS_string_to_uri (ectx, ustring);
if (fsss.uri == NULL)
{
- GNUNET_GELOG (ectx,
- GNUNET_GEERROR | GNUNET_GEBULK | GNUNET_GEUSER,
- _("Failed to create namespace URI from `%s'.\n"),
- ustring);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _("Failed to create namespace URI from `%s'.\n"),
+ ustring);
}
GNUNET_free (ustring);
}
@@ -817,7 +818,7 @@
fsss.uri = GNUNET_ECRS_keyword_string_to_uri (ectx, searchString);
if (fsss.uri == NULL)
{
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
return;
}
/* check if search is already running */
@@ -840,7 +841,7 @@
return;
}
}
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
}
list = list->next;
}
@@ -893,7 +894,7 @@
break;
list = list->next;
}
- GNUNET_GEASSERT (ectx, list != NULL);
+ GNUNET_GE_ASSERT (ectx, list != NULL);
if (list->fsui_list == NULL)
{
/* open directory - close directly */
@@ -927,7 +928,7 @@
break;
list = list->next;
}
- GNUNET_GEASSERT (ectx, list != NULL);
+ GNUNET_GE_ASSERT (ectx, list != NULL);
if (list->fsui_list != NULL)
{
fcbc.method = &GNUNET_FSUI_search_abort;
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2007-11-25 12:25:52 UTC (rev 5763)
+++ gnunet-gtk/src/plugins/fs/upload.c 2007-11-25 12:26:06 UTC (rev 5764)
@@ -121,7 +121,7 @@
if (prev != NULL)
prev->next = list->next;
else
- GNUNET_GEBREAK (ectx, 0);
+ GNUNET_GE_BREAK (ectx, 0);
}
GNUNET_free (list);
}
@@ -375,7 +375,7 @@
"uploadFilenameComboBoxEntry");
metaXML =
glade_xml_new (GNUNET_GTK_get_glade_filename (), "metaDataDialog",
- PACKAGNUNET_GENAME);
+ PACKAGNUNET_GE_NAME);
GNUNET_GTK_connect_glade_with_plugins (metaXML);
dialog = glade_xml_get_widget (metaXML, "metaDataDialog");
meta = GNUNET_ECRS_meta_data_create ();
@@ -455,7 +455,7 @@
uploadXML
= glade_xml_new (GNUNET_GTK_get_glade_filename (),
- "uploadfilechooserdialog", PACKAGNUNET_GENAME);
+ "uploadfilechooserdialog", PACKAGNUNET_GE_NAME);
GNUNET_GTK_connect_glade_with_plugins (uploadXML);
dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
"uploadfilechooserdialog"));
@@ -546,7 +546,7 @@
UploadList *ul;
struct FCBC fcbc;
- GNUNET_GEASSERT (ectx, model == GTK_TREE_MODEL (upload_summary));
+ GNUNET_GE_ASSERT (ectx, model == GTK_TREE_MODEL (upload_summary));
gtk_tree_model_get (model, iter, UPLOAD_INTERNAL, &ul, -1);
if ((ul->has_terminated) && (ul->is_top))
{
@@ -613,7 +613,7 @@
UploadList *ul;
struct FCBC fcbc;
- GNUNET_GEASSERT (ectx, model == GTK_TREE_MODEL (upload_summary));
+ GNUNET_GE_ASSERT (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;
Modified: gnunet-gtk/src/plugins/peers/peers.c
===================================================================
--- gnunet-gtk/src/plugins/peers/peers.c 2007-11-25 12:25:52 UTC (rev
5763)
+++ gnunet-gtk/src/plugins/peers/peers.c 2007-11-25 12:26:06 UTC (rev
5764)
@@ -36,7 +36,7 @@
static struct GNUNET_CronManager *cron;
-static struct GNUNET_GEContext *ectx;
+static struct GNUNET_GE_Context *ectx;
static struct GNUNET_GC_Configuration *cfg;
@@ -270,7 +270,7 @@
void
-init_peers (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
+init_peers (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
{
GtkWidget *tab;
GtkWidget *peers;
Modified: gnunet-gtk/src/plugins/stats/functions.c
===================================================================
--- gnunet-gtk/src/plugins/stats/functions.c 2007-11-25 12:25:52 UTC (rev
5763)
+++ gnunet-gtk/src/plugins/stats/functions.c 2007-11-25 12:26:06 UTC (rev
5764)
@@ -43,7 +43,7 @@
static long long bandup;
-static struct GNUNET_GEContext *ectx;
+static struct GNUNET_GE_Context *ectx;
static struct GNUNET_GC_Configuration *cfg;
@@ -75,9 +75,9 @@
}
}
#if FUNCTIONS_DEBUG
- GNUNET_GELOG (ectx,
- GNUNET_GEDEBUG | GNUNET_GEDEVELOPER | GNUNET_GEREQUEST,
- "Statistic not found: `%s'\n", optName);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
+ "Statistic not found: `%s'\n", optName);
#endif
return GNUNET_SYSERR;
}
@@ -559,7 +559,8 @@
static unsigned long long UPDATE_INTERVAL;
void
-init_functions (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
+init_functions (struct GNUNET_GE_Context *e,
+ struct GNUNET_GC_Configuration *c)
{
ectx = e;
cfg = c;
Modified: gnunet-gtk/src/plugins/stats/functions.h
===================================================================
--- gnunet-gtk/src/plugins/stats/functions.h 2007-11-25 12:25:52 UTC (rev
5763)
+++ gnunet-gtk/src/plugins/stats/functions.h 2007-11-25 12:26:06 UTC (rev
5764)
@@ -51,7 +51,7 @@
extern StatEntry stats[];
-void init_functions (struct GNUNET_GEContext *e,
+void init_functions (struct GNUNET_GE_Context *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:25:52 UTC (rev
5763)
+++ gnunet-gtk/src/plugins/stats/statistics.c 2007-11-25 12:26:06 UTC (rev
5764)
@@ -367,7 +367,7 @@
if (stats[statIdx].count > MAX_COLOR)
{
- GNUNET_GEBREAK (NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
return NULL;
}
@@ -430,7 +430,7 @@
void
-init_stats (struct GNUNET_GEContext *ectx,
+init_stats (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg)
{
GtkWidget *sys_box;
@@ -458,7 +458,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]);
- GNUNET_GEASSERT (ectx, MAX_COLOR == 6);
+ GNUNET_GE_ASSERT (ectx, MAX_COLOR == 6);
i = -1;
while (stats[++i].paneName != NULL)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r5764 - 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 <=