aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libltdl/ltdl.c54
-rw-r--r--src/common/helper.c55
-rw-r--r--src/common/logging.c18
-rw-r--r--src/core/eggtrayicon.c7
-rw-r--r--src/core/main.c20
-rw-r--r--src/include/gnunetgtk_common.h8
-rw-r--r--src/include/plibc.h10
-rw-r--r--src/plugins/about/about.c2
-rw-r--r--src/plugins/daemon/daemon.c8
-rw-r--r--src/plugins/fs/collection.c6
-rw-r--r--src/plugins/fs/content_tracking.c10
-rw-r--r--src/plugins/fs/directory.c4
-rw-r--r--src/plugins/fs/download.c60
-rw-r--r--src/plugins/fs/extensions/musicinsert.c10
-rw-r--r--src/plugins/fs/fs.c18
-rw-r--r--src/plugins/fs/fs.h2
-rw-r--r--src/plugins/fs/meta.c33
-rw-r--r--src/plugins/fs/namespace.c66
-rw-r--r--src/plugins/fs/namespace_create.c8
-rw-r--r--src/plugins/fs/namespace_search.c14
-rw-r--r--src/plugins/fs/search.c55
-rw-r--r--src/plugins/fs/upload.c10
-rw-r--r--src/plugins/peers/peers.c4
-rw-r--r--src/plugins/stats/functions.c11
-rw-r--r--src/plugins/stats/functions.h2
-rw-r--r--src/plugins/stats/statistics.c6
26 files changed, 251 insertions, 250 deletions
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 50c76b25..68037d23 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1614,32 +1614,32 @@ static enum DYLD_BOOL (*ltdl_NSIsSymbolNameDefinedInImage) (const struct
1614 *symbolName) = 0; 1614 *symbolName) = 0;
1615static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic) (NSModule module) = 0; 1615static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic) (NSModule module) = 0;
1616 1616
1617#ifndef NSADDIMAGNUNET_GEOPTION_NONE 1617#ifndef NSADDIMAGE_OPTION_NONE
1618#define NSADDIMAGNUNET_GEOPTION_NONE 0x0 1618#define NSADDIMAGE_OPTION_NONE 0x0
1619#endif 1619#endif
1620#ifndef NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR 1620#ifndef NSADDIMAGE_OPTION_RETURN_ON_ERROR
1621#define NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR 0x1 1621#define NSADDIMAGE_OPTION_RETURN_ON_ERROR 0x1
1622#endif 1622#endif
1623#ifndef NSADDIMAGNUNET_GEOPTION_WITH_SEARCHING 1623#ifndef NSADDIMAGE_OPTION_WITH_SEARCHING
1624#define NSADDIMAGNUNET_GEOPTION_WITH_SEARCHING 0x2 1624#define NSADDIMAGE_OPTION_WITH_SEARCHING 0x2
1625#endif 1625#endif
1626#ifndef NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED 1626#ifndef NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
1627#define NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED 0x4 1627#define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED 0x4
1628#endif 1628#endif
1629#ifndef NSADDIMAGNUNET_GEOPTION_MATCH_FILENAME_BY_INSTALLNAME 1629#ifndef NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME
1630#define NSADDIMAGNUNET_GEOPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8 1630#define NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8
1631#endif 1631#endif
1632#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND 1632#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND
1633#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND 0x0 1633#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND 0x0
1634#endif 1634#endif
1635#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW 1635#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
1636#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW 0x1 1636#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW 0x1
1637#endif 1637#endif
1638#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_FULLY 1638#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY
1639#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_FULLY 0x2 1639#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY 0x2
1640#endif 1640#endif
1641#ifndef NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR 1641#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
1642#define NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR 0x4 1642#define NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR 0x4
1643#endif 1643#endif
1644 1644
1645 1645
@@ -1686,7 +1686,7 @@ lt_int_dyld_lib_install_name (mh)
1686{ 1686{
1687/* NSAddImage is also used to get the loaded image, but it only works if the lib 1687/* NSAddImage is also used to get the loaded image, but it only works if the lib
1688 is installed, for uninstalled libs we need to check the install_names against 1688 is installed, for uninstalled libs we need to check the install_names against
1689 each other. Note that this is still broken if DYLD_IMAGNUNET_GESUFFIX is set and a 1689 each other. Note that this is still broken if DYLD_IMAGE_SUFFIX is set and a
1690 different lib was loaded as a result 1690 different lib was loaded as a result
1691*/ 1691*/
1692 int j; 1692 int j;
@@ -1761,18 +1761,18 @@ lt_int_dyld_NSlookupSymbolInLinkedLibs (symbol, mh)
1761 ltdl_NSAddImage ((char *) (((struct dylib_command *) lc)-> 1761 ltdl_NSAddImage ((char *) (((struct dylib_command *) lc)->
1762 dylib.name.offset + 1762 dylib.name.offset +
1763 (unsigned long) lc), 1763 (unsigned long) lc),
1764 NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED 1764 NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
1765 + 1765 +
1766 NSADDIMAGNUNET_GEOPTION_WITH_SEARCHING + 1766 NSADDIMAGE_OPTION_WITH_SEARCHING +
1767 NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR); 1767 NSADDIMAGE_OPTION_RETURN_ON_ERROR);
1768 } 1768 }
1769 if (mh1) 1769 if (mh1)
1770 { 1770 {
1771 retSym = ltdl_NSLookupSymbolInImage (mh1, 1771 retSym = ltdl_NSLookupSymbolInImage (mh1,
1772 symbol, 1772 symbol,
1773 NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW 1773 NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
1774 | 1774 |
1775 NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR); 1775 NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
1776 if (retSym) 1776 if (retSym)
1777 break; 1777 break;
1778 } 1778 }
@@ -1839,7 +1839,7 @@ sys_dyld_open (loader_data, filename)
1839 { 1839 {
1840 module = 1840 module =
1841 (lt_module) ltdl_NSAddImage (filename, 1841 (lt_module) ltdl_NSAddImage (filename,
1842 NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR); 1842 NSADDIMAGE_OPTION_RETURN_ON_ERROR);
1843 break; 1843 break;
1844 } 1844 }
1845 default: 1845 default:
@@ -1928,9 +1928,9 @@ sys_dyld_sym (loader_data, module, symbol)
1928 nssym = 1928 nssym =
1929 ltdl_NSLookupSymbolInImage ((struct mach_header *) module, 1929 ltdl_NSLookupSymbolInImage ((struct mach_header *) module,
1930 symbol, 1930 symbol,
1931 NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_BIND_NOW 1931 NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
1932 | 1932 |
1933 NSLOOKUPSYMBOLINIMAGNUNET_GEOPTION_RETURN_ON_ERROR); 1933 NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
1934 } 1934 }
1935 } 1935 }
1936 1936
diff --git a/src/common/helper.c b/src/common/helper.c
index 0abe2f06..8689c8b5 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -82,7 +82,7 @@ static Plugin *plugin;
82 82
83static void *shutdown_function; 83static void *shutdown_function;
84 84
85static struct GNUNET_GEContext *ectx; 85static struct GNUNET_GE_Context *ectx;
86 86
87static struct GNUNET_GC_Configuration *cfg; 87static struct GNUNET_GC_Configuration *cfg;
88 88
@@ -113,7 +113,7 @@ saveCallWrapper (gpointer data)
113 break; 113 break;
114 } 114 }
115 } 115 }
116 GNUNET_GEASSERT (NULL, i != pscCount); 116 GNUNET_GE_ASSERT (NULL, i != pscCount);
117 GNUNET_array_grow (psc, pscCount, pscCount - 1); 117 GNUNET_array_grow (psc, pscCount, pscCount - 1);
118 GNUNET_mutex_unlock (sclock); 118 GNUNET_mutex_unlock (sclock);
119 } 119 }
@@ -206,10 +206,11 @@ connector (const gchar * handler_name,
206 if ((module == NULL) || 206 if ((module == NULL) ||
207 (TRUE != g_module_symbol (module, handler_name, &method))) 207 (TRUE != g_module_symbol (module, handler_name, &method)))
208 { 208 {
209 GNUNET_GELOG (ectx, 209 GNUNET_GE_LOG (ectx,
210 GNUNET_GEWARNING | GNUNET_GEDEVELOPER | 210 GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER |
211 GNUNET_GEIMMEDIATE, 211 GNUNET_GE_IMMEDIATE,
212 _("Failed to find handler for `%s'\n"), handler_name); 212 _("Failed to find handler for `%s'\n"),
213 handler_name);
213 g_module_close (module); 214 g_module_close (module);
214 return; 215 return;
215 } 216 }
@@ -224,7 +225,7 @@ GNUNET_GTK_connect_glade_with_plugins (GladeXML * xml)
224 glade_xml_signal_autoconnect_full (xml, &connector, xml); 225 glade_xml_signal_autoconnect_full (xml, &connector, xml);
225} 226}
226 227
227typedef void (*InitCall) (struct GNUNET_GEContext * ectx, 228typedef void (*InitCall) (struct GNUNET_GE_Context * ectx,
228 struct GNUNET_GC_Configuration * cfg); 229 struct GNUNET_GC_Configuration * cfg);
229 230
230typedef void (*PlainCall) (void); 231typedef void (*PlainCall) (void);
@@ -301,7 +302,7 @@ unloadPlugin (void *p)
301} 302}
302 303
303void 304void
304GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *e, 305GNUNET_GTK_initialize_common_library (struct GNUNET_GE_Context *e,
305 struct GNUNET_GC_Configuration *c, 306 struct GNUNET_GC_Configuration *c,
306 void *callback) 307 void *callback)
307{ 308{
@@ -333,12 +334,12 @@ GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *e,
333#endif 334#endif
334 GNUNET_free (filename); 335 GNUNET_free (filename);
335 336
336 mainXML = glade_xml_new (gladeFile, "mainWindow", PACKAGNUNET_GENAME); 337 mainXML = glade_xml_new (gladeFile, "mainWindow", PACKAGNUNET_GE_NAME);
337 if (mainXML == NULL) 338 if (mainXML == NULL)
338 GNUNET_GEDIE_STRERROR_FILE (ectx, 339 GNUNET_GE_DIE_STRERROR_FILE (ectx,
339 GNUNET_GEFATAL | GNUNET_GEUSER | 340 GNUNET_GE_FATAL | GNUNET_GE_USER |
340 GNUNET_GEIMMEDIATE, "glade_xml_new", 341 GNUNET_GE_IMMEDIATE, "glade_xml_new",
341 gladeFile); 342 gladeFile);
342 /* load the plugins */ 343 /* load the plugins */
343 GNUNET_GC_get_configuration_value_string (cfg, 344 GNUNET_GC_get_configuration_value_string (cfg,
344 "GNUNET-GTK", 345 "GNUNET-GTK",
@@ -428,9 +429,9 @@ GNUNET_GTK_run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg)
428 cls.arg = arg; 429 cls.arg = arg;
429 doneThread = GNUNET_thread_create (&shutdownCode, &cls, 64 * 1024); 430 doneThread = GNUNET_thread_create (&shutdownCode, &cls, 64 * 1024);
430 if (doneThread == NULL) 431 if (doneThread == NULL)
431 GNUNET_GEDIE_STRERROR (ectx, 432 GNUNET_GE_DIE_STRERROR (ectx,
432 GNUNET_GEFATAL | GNUNET_GEADMIN | GNUNET_GEBULK, 433 GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
433 "pthread_create"); 434 GNUNET_GE_BULK, "pthread_create");
434 if (!GNUNET_thread_test_self (mainThread)) 435 if (!GNUNET_thread_test_self (mainThread))
435 { 436 {
436 /* another thread will run the save calls */ 437 /* another thread will run the save calls */
@@ -488,10 +489,10 @@ GNUNET_GTK_notify (int type, const char *message, ...)
488 if (!notify_init ("gnunet-gtk")) 489 if (!notify_init ("gnunet-gtk"))
489 { 490 {
490 once = 1; 491 once = 1;
491 GNUNET_GELOG (ectx, 492 GNUNET_GE_LOG (ectx,
492 GNUNET_GEWARNING | GNUNET_GEBULK | GNUNET_GEUSER | 493 GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER |
493 GNUNET_GEADMIN, 494 GNUNET_GE_ADMIN,
494 _("Could not initialize libnotify\n")); 495 _("Could not initialize libnotify\n"));
495 return; 496 return;
496 } 497 }
497 } 498 }
@@ -515,7 +516,7 @@ GNUNET_GTK_notify (int type, const char *message, ...)
515 va_end (arg); 516 va_end (arg);
516 libnotify = notify_notification_new ("gnunet-gtk", 517 libnotify = notify_notification_new ("gnunet-gtk",
517 msg, 518 msg,
518 PACKAGNUNET_GEDATA 519 PACKAGNUNET_GE_DATA
519 "/gnunet-gtk/gnunet-gtk-notify.png", 520 "/gnunet-gtk/gnunet-gtk-notify.png",
520 NULL); 521 NULL);
521 GNUNET_free (msg); 522 GNUNET_free (msg);
@@ -524,10 +525,10 @@ GNUNET_GTK_notify (int type, const char *message, ...)
524 if (!notify_notification_show (libnotify, NULL)) 525 if (!notify_notification_show (libnotify, NULL))
525 { 526 {
526 once = 1; 527 once = 1;
527 GNUNET_GELOG (ectx, 528 GNUNET_GE_LOG (ectx,
528 GNUNET_GEWARNING | GNUNET_GEUSER | GNUNET_GEADMIN | 529 GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN
529 GNUNET_GEBULK, 530 | GNUNET_GE_BULK,
530 _("Could not send notification via libnotify\n")); 531 _("Could not send notification via libnotify\n"));
531 } 532 }
532 g_object_unref (G_OBJECT (libnotify)); 533 g_object_unref (G_OBJECT (libnotify));
533 notify_uninit (); 534 notify_uninit ();
@@ -558,7 +559,7 @@ GNUNET_GTK_validate_utf8 (char *msg)
558 GNUNET_free (msg); 559 GNUNET_free (msg);
559 msg = GNUNET_strdup (ret); 560 msg = GNUNET_strdup (ret);
560 g_free (ret); 561 g_free (ret);
561 GNUNET_GEBREAK (NULL, TRUE == g_utf8_validate (msg, -1, &end)); 562 GNUNET_GE_BREAK (NULL, TRUE == g_utf8_validate (msg, -1, &end));
562 return msg; 563 return msg;
563} 564}
564 565
@@ -634,7 +635,7 @@ GNUNET_GTK_run_gnunet_setup (gboolean run_wizard)
634 messageDialog = 635 messageDialog =
635 gtk_message_dialog_new (GTK_WINDOW (mainWindow), 636 gtk_message_dialog_new (GTK_WINDOW (mainWindow),
636 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, 637 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
637 GTK_MESSAGNUNET_GEWARNING, GTK_BUTTONS_CLOSE, 638 GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
638 _ 639 _
639 ("Failed to run the configuration tool (gnunet-setup): %s"), 640 ("Failed to run the configuration tool (gnunet-setup): %s"),
640 error_message); 641 error_message);
diff --git a/src/common/logging.c b/src/common/logging.c
index aef6fa46..41cfdc2a 100644
--- a/src/common/logging.c
+++ b/src/common/logging.c
@@ -46,7 +46,7 @@ init ()
46 statusXML 46 statusXML
47 = 47 =
48 glade_xml_new (GNUNET_GTK_get_glade_filename (), "statusWindow", 48 glade_xml_new (GNUNET_GTK_get_glade_filename (), "statusWindow",
49 PACKAGNUNET_GENAME); 49 PACKAGNUNET_GE_NAME);
50 infoWindow = glade_xml_get_widget (statusXML, "statusWindow"); 50 infoWindow = glade_xml_get_widget (statusXML, "statusWindow");
51 infoWindowTextView 51 infoWindowTextView
52 = glade_xml_get_widget (statusXML, "messageWindowTextView"); 52 = glade_xml_get_widget (statusXML, "messageWindowTextView");
@@ -170,24 +170,24 @@ GNUNET_GTK_add_log_entry (const char *txt, ...)
170 170
171static void 171static void
172ge_gtk_log_handler (void *ctx, 172ge_gtk_log_handler (void *ctx,
173 GNUNET_GEKIND kind, const char *date, const char *msg) 173 GNUNET_GE_KIND kind, const char *date, const char *msg)
174{ 174{
175 int popUp; 175 int popUp;
176 176
177 popUp = GNUNET_NO; 177 popUp = GNUNET_NO;
178 if ((kind & (GNUNET_GEFATAL | GNUNET_GEERROR | GNUNET_GEWARNING)) > 0) 178 if ((kind & (GNUNET_GE_FATAL | GNUNET_GE_ERROR | GNUNET_GE_WARNING)) > 0)
179 popUp = GNUNET_YES; 179 popUp = GNUNET_YES;
180 GNUNET_GTK_show_info_message (popUp, "%s: %s", date, msg); 180 GNUNET_GTK_show_info_message (popUp, "%s: %s", date, msg);
181} 181}
182 182
183struct GNUNET_GEContext * 183struct GNUNET_GE_Context *
184GNUNET_GTK_create_gtk_logger (GNUNET_GEKIND mask) 184GNUNET_GTK_create_gtk_logger (GNUNET_GE_KIND mask)
185{ 185{
186 struct GNUNET_GEContext *myLog; 186 struct GNUNET_GE_Context *myLog;
187 187
188 myLog = GNUNET_GEcreate_context_callback (mask, 188 myLog = GNUNET_GE_create_context_callback (mask,
189 &ge_gtk_log_handler, NULL, NULL, 189 &ge_gtk_log_handler, NULL, NULL,
190 NULL); 190 NULL);
191 return myLog; 191 return myLog;
192} 192}
193 193
diff --git a/src/core/eggtrayicon.c b/src/core/eggtrayicon.c
index c855c960..932aab98 100644
--- a/src/core/eggtrayicon.c
+++ b/src/core/eggtrayicon.c
@@ -200,7 +200,7 @@ egg_tray_icon_init (EggTrayIcon * icon)
200 icon->stamp = 1; 200 icon->stamp = 1;
201 icon->orientation = GTK_ORIENTATION_HORIZONTAL; 201 icon->orientation = GTK_ORIENTATION_HORIZONTAL;
202 202
203 gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGNUNET_GEMASK); 203 gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
204} 204}
205 205
206static void 206static void
@@ -544,8 +544,7 @@ egg_tray_icon_send_message (EggTrayIcon * icon,
544 ev.window = (Window) gtk_plug_get_id (GTK_PLUG (icon)); 544 ev.window = (Window) gtk_plug_get_id (GTK_PLUG (icon));
545 ev.format = 8; 545 ev.format = 8;
546 ev.message_type = XInternAtom (xdisplay, 546 ev.message_type = XInternAtom (xdisplay,
547 "_NET_SYSTEM_TRAY_MESSAGNUNET_GEDATA", 547 "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
548 False);
549 if (len > 20) 548 if (len > 20)
550 { 549 {
551 memcpy (&ev.data, message, 20); 550 memcpy (&ev.data, message, 20);
@@ -649,7 +648,7 @@ initTrayIcon ()
649 648
650 trayContextMenuXML = 649 trayContextMenuXML =
651 glade_xml_new (GNUNET_GTK_get_glade_filename (), "trayContextMenu", 650 glade_xml_new (GNUNET_GTK_get_glade_filename (), "trayContextMenu",
652 PACKAGNUNET_GENAME); 651 PACKAGNUNET_GE_NAME);
653 trayContextMenu = 652 trayContextMenu =
654 glade_xml_get_widget (trayContextMenuXML, "trayContextMenu"); 653 glade_xml_get_widget (trayContextMenuXML, "trayContextMenu");
655 tray_quit = glade_xml_get_widget (trayContextMenuXML, "tray_quit"); 654 tray_quit = glade_xml_get_widget (trayContextMenuXML, "tray_quit");
diff --git a/src/core/main.c b/src/core/main.c
index a6663223..f8648341 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -64,7 +64,7 @@ shutdownCode (void *unused)
64void 64void
65GNUNET_GTK_main_quit () 65GNUNET_GTK_main_quit ()
66{ 66{
67 GNUNET_GEsetDefaultContext (NULL); 67 GNUNET_GE_setDefaultContext (NULL);
68 GNUNET_GTK_run_with_save_calls (&shutdownCode, NULL); 68 GNUNET_GTK_run_with_save_calls (&shutdownCode, NULL);
69 gtk_main_quit (); 69 gtk_main_quit ();
70} 70}
@@ -82,11 +82,11 @@ main (int argc, char *const *argv)
82{ 82{
83 GtkWidget *root; 83 GtkWidget *root;
84 int i; 84 int i;
85 struct GNUNET_GEContext *ectx; 85 struct GNUNET_GE_Context *ectx;
86 struct GNUNET_GEContext *my_ctx; 86 struct GNUNET_GE_Context *my_ctx;
87 struct GNUNET_GC_Configuration *cfg; 87 struct GNUNET_GC_Configuration *cfg;
88 char *log; 88 char *log;
89 GNUNET_GEKIND mask; 89 GNUNET_GE_KIND mask;
90#if ENABLE_NLS 90#if ENABLE_NLS
91 char *path; 91 char *path;
92#endif 92#endif
@@ -124,17 +124,17 @@ main (int argc, char *const *argv)
124 GNUNET_GC_get_configuration_value_string (cfg, 124 GNUNET_GC_get_configuration_value_string (cfg,
125 "LOGGING", 125 "LOGGING",
126 "USER-LEVEL", "WARNING", &log); 126 "USER-LEVEL", "WARNING", &log);
127 mask = GNUNET_GEgetKIND (log); 127 mask = GNUNET_GE_getKIND (log);
128 GNUNET_free (log); 128 GNUNET_free (log);
129 mask |= mask - 1; /* set all bits... */ 129 mask |= mask - 1; /* set all bits... */
130 mask |= GNUNET_GEUSER | GNUNET_GEBULK | GNUNET_GEIMMEDIATE; 130 mask |= GNUNET_GE_USER | GNUNET_GE_BULK | GNUNET_GE_IMMEDIATE;
131 if (GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg, 131 if (GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg,
132 "LOGGING", 132 "LOGGING",
133 "DEVELOPER", 133 "DEVELOPER",
134 GNUNET_NO)) 134 GNUNET_NO))
135 mask |= GNUNET_GEDEVELOPER | GNUNET_GEREQUEST; 135 mask |= GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST;
136 my_ctx = GNUNET_GTK_create_gtk_logger (mask); 136 my_ctx = GNUNET_GTK_create_gtk_logger (mask);
137 GNUNET_GEsetDefaultContext (my_ctx); 137 GNUNET_GE_setDefaultContext (my_ctx);
138 root = 138 root =
139 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow"); 139 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
140 gtk_window_maximize (GTK_WINDOW (root)); 140 gtk_window_maximize (GTK_WINDOW (root));
@@ -152,8 +152,8 @@ main (int argc, char *const *argv)
152 152
153 gtk_main (); 153 gtk_main ();
154 gdk_threads_leave (); 154 gdk_threads_leave ();
155 GNUNET_GEsetDefaultContext (ectx); 155 GNUNET_GE_setDefaultContext (ectx);
156 GNUNET_GEfree_context (my_ctx); 156 GNUNET_GE_free_context (my_ctx);
157 GNUNET_GTK_shutdown_common_library (); 157 GNUNET_GTK_shutdown_common_library ();
158 GNUNET_fini (ectx, cfg); 158 GNUNET_fini (ectx, cfg);
159 return 0; 159 return 0;
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index f0893c45..060ad102 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -31,9 +31,9 @@
31#include <gtk/gtktext.h> 31#include <gtk/gtktext.h>
32#include <glade/glade.h> 32#include <glade/glade.h>
33 33
34#define DEBUG_GTK 0 34#define GNUNET_GTK_DEBUG_GTK 0
35 35
36#if DEBUG_GTK 36#if GNUNET_GTK_DEBUG_GTK
37#define GNUNET_GTK_DEBUG_BEGIN() fprintf(stderr, "BEGIN of %s\n", __FUNCTION__) 37#define GNUNET_GTK_DEBUG_BEGIN() fprintf(stderr, "BEGIN of %s\n", __FUNCTION__)
38#define GNUNET_GTK_DEBUG_MARK() fprintf(stderr, "AT %s:%d\n", __FILE__, __LINE__) 38#define GNUNET_GTK_DEBUG_MARK() fprintf(stderr, "AT %s:%d\n", __FILE__, __LINE__)
39#define GNUNET_GTK_DEBUG_END() fprintf(stderr, "END of %s\n", __FUNCTION__) 39#define GNUNET_GTK_DEBUG_END() fprintf(stderr, "END of %s\n", __FUNCTION__)
@@ -43,7 +43,7 @@
43#define GNUNET_GTK_DEBUG_END() 43#define GNUNET_GTK_DEBUG_END()
44#endif 44#endif
45 45
46void GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *ectx, 46void GNUNET_GTK_initialize_common_library (struct GNUNET_GE_Context *ectx,
47 struct GNUNET_GC_Configuration 47 struct GNUNET_GC_Configuration
48 *cfg, void *callback); 48 *cfg, void *callback);
49 49
@@ -77,7 +77,7 @@ void GNUNET_GTK_show_info_message (int doPopup, const char *format, ...);
77 */ 77 */
78void GNUNET_GTK_add_log_entry (const char *txt, ...); 78void GNUNET_GTK_add_log_entry (const char *txt, ...);
79 79
80struct GNUNET_GEContext *GNUNET_GTK_create_gtk_logger (GNUNET_GEKIND mask); 80struct GNUNET_GE_Context *GNUNET_GTK_create_gtk_logger (GNUNET_GE_KIND mask);
81 81
82#define GNUNET_GTK_NOTIFY_LEVEL_LOW 0 82#define GNUNET_GTK_NOTIFY_LEVEL_LOW 0
83#define GNUNET_GTK_NOTIFY_LEVEL_NORMAL 1 83#define GNUNET_GTK_NOTIFY_LEVEL_NORMAL 1
diff --git a/src/include/plibc.h b/src/include/plibc.h
index d493121b..2618b994 100644
--- a/src/include/plibc.h
+++ b/src/include/plibc.h
@@ -58,7 +58,7 @@ extern "C"
58/* Conflicts with our definitions */ 58/* Conflicts with our definitions */
59#define __G_WIN32_H__ 59#define __G_WIN32_H__
60 60
61/* Convert LARGNUNET_GEINTEGER to double */ 61/* Convert LARGNUNET_GE_INTEGER to double */
62#define Li2Double(x) ((double)((x).HighPart) * 4.294967296E9 + \ 62#define Li2Double(x) ((double)((x).HighPart) * 4.294967296E9 + \
63 (double)((x).LowPart)) 63 (double)((x).LowPart))
64 64
@@ -241,10 +241,10 @@ extern "C"
241 241
242 typedef struct 242 typedef struct
243 { 243 {
244 LARGNUNET_GEINTEGER IdleTime; 244 LARGNUNET_GE_INTEGER IdleTime;
245 LARGNUNET_GEINTEGER KernelTime; 245 LARGNUNET_GE_INTEGER KernelTime;
246 LARGNUNET_GEINTEGER UserTime; 246 LARGNUNET_GE_INTEGER UserTime;
247 LARGNUNET_GEINTEGER Reserved1[2]; 247 LARGNUNET_GE_INTEGER Reserved1[2];
248 ULONG Reserved2; 248 ULONG Reserved2;
249 } SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION; 249 } SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION;
250 250
diff --git a/src/plugins/about/about.c b/src/plugins/about/about.c
index 4e859bb2..fe836bc9 100644
--- a/src/plugins/about/about.c
+++ b/src/plugins/about/about.c
@@ -40,7 +40,7 @@ on_about_clicked_about (GtkWidget * dummy, gpointer data)
40 40
41 axml = 41 axml =
42 glade_xml_new (GNUNET_GTK_get_glade_filename (), "aboutDialog", 42 glade_xml_new (GNUNET_GTK_get_glade_filename (), "aboutDialog",
43 PACKAGNUNET_GENAME); 43 PACKAGNUNET_GE_NAME);
44 ad = glade_xml_get_widget (axml, "aboutDialog"); 44 ad = glade_xml_get_widget (axml, "aboutDialog");
45 gtk_dialog_run (GTK_DIALOG (ad)); 45 gtk_dialog_run (GTK_DIALOG (ad));
46 gtk_widget_destroy (ad); 46 gtk_widget_destroy (ad);
diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 73d39c0e..a8bc1cf8 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -33,7 +33,7 @@
33 33
34static struct GNUNET_CronManager *cron; 34static struct GNUNET_CronManager *cron;
35 35
36static struct GNUNET_GEContext *ectx; 36static struct GNUNET_GE_Context *ectx;
37 37
38static struct GNUNET_GC_Configuration *cfg; 38static struct GNUNET_GC_Configuration *cfg;
39 39
@@ -263,7 +263,7 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
263 = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 263 = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
264 "gnunetdconfigFileChooserButton"); 264 "gnunetdconfigFileChooserButton");
265 fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser)); 265 fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
266 GNUNET_GEBREAK (ectx, fn != NULL); 266 GNUNET_GE_BREAK (ectx, fn != NULL);
267 if (GNUNET_SYSERR != GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES)) 267 if (GNUNET_SYSERR != GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES))
268 { 268 {
269 GNUNET_GTK_add_log_entry (_("Launched gnunetd")); 269 GNUNET_GTK_add_log_entry (_("Launched gnunetd"));
@@ -301,7 +301,7 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
301 dialog = gtk_message_dialog_new 301 dialog = gtk_message_dialog_new
302 (NULL, 302 (NULL,
303 GTK_DIALOG_MODAL, 303 GTK_DIALOG_MODAL,
304 GTK_MESSAGNUNET_GEERROR, 304 GTK_MESSAGE_ERROR,
305 GTK_BUTTONS_CLOSE, _("Error requesting shutdown of gnunetd.")); 305 GTK_BUTTONS_CLOSE, _("Error requesting shutdown of gnunetd."));
306 gtk_dialog_run (GTK_DIALOG (dialog)); 306 gtk_dialog_run (GTK_DIALOG (dialog));
307 gtk_widget_destroy (dialog); 307 gtk_widget_destroy (dialog);
@@ -316,7 +316,7 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
316} 316}
317 317
318void 318void
319init_daemon (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c) 319init_daemon (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
320{ 320{
321 GtkWidget *tab; 321 GtkWidget *tab;
322 GtkWidget *apps; 322 GtkWidget *apps;
diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c
index de195001..d12a9218 100644
--- a/src/plugins/fs/collection.c
+++ b/src/plugins/fs/collection.c
@@ -61,7 +61,7 @@ createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
61 61
62 metaXML 62 metaXML
63 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 63 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
64 "createCollectionDialog", PACKAGNUNET_GENAME); 64 "createCollectionDialog", PACKAGNUNET_GE_NAME);
65 GNUNET_GTK_connect_glade_with_plugins (metaXML); 65 GNUNET_GTK_connect_glade_with_plugins (metaXML);
66 dialog = glade_xml_get_widget (metaXML, "createCollectionDialog"); 66 dialog = glade_xml_get_widget (metaXML, "createCollectionDialog");
67 createMetaDataListTreeView (metaXML, 67 createMetaDataListTreeView (metaXML,
@@ -85,7 +85,7 @@ createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
85 dialog = gtk_message_dialog_new 85 dialog = gtk_message_dialog_new
86 (NULL, 86 (NULL,
87 GTK_DIALOG_MODAL, 87 GTK_DIALOG_MODAL,
88 GTK_MESSAGNUNET_GEERROR, 88 GTK_MESSAGE_ERROR,
89 GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!")); 89 GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
90 gtk_dialog_run (GTK_DIALOG (dialog)); 90 gtk_dialog_run (GTK_DIALOG (dialog));
91 gtk_widget_destroy (dialog); 91 gtk_widget_destroy (dialog);
@@ -117,7 +117,7 @@ createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
117 dialog = gtk_message_dialog_new 117 dialog = gtk_message_dialog_new
118 (NULL, 118 (NULL,
119 GTK_DIALOG_MODAL, 119 GTK_DIALOG_MODAL,
120 GTK_MESSAGNUNET_GEERROR, 120 GTK_MESSAGE_ERROR,
121 GTK_BUTTONS_CLOSE, 121 GTK_BUTTONS_CLOSE,
122 _("Failed to start collection `%s' (consult logs)."), 122 _("Failed to start collection `%s' (consult logs)."),
123 collectionName); 123 collectionName);
diff --git a/src/plugins/fs/content_tracking.c b/src/plugins/fs/content_tracking.c
index 8fff6c28..114f66e7 100644
--- a/src/plugins/fs/content_tracking.c
+++ b/src/plugins/fs/content_tracking.c
@@ -45,7 +45,7 @@ clearContentList (void *mdl)
45 struct GNUNET_ECRS_MetaData *meta; 45 struct GNUNET_ECRS_MetaData *meta;
46 GtkTreeIter iter; 46 GtkTreeIter iter;
47 47
48 DEBUG_BEGIN (); 48 GNUNET_GTK_DEBUG_BEGIN ();
49 if (gtk_tree_model_get_iter_first (model, &iter)) 49 if (gtk_tree_model_get_iter_first (model, &iter))
50 { 50 {
51 do 51 do
@@ -61,7 +61,7 @@ clearContentList (void *mdl)
61 } 61 }
62 while (gtk_list_store_remove (GTK_LIST_STORE (model), &iter)); 62 while (gtk_list_store_remove (GTK_LIST_STORE (model), &iter));
63 } 63 }
64 DEBUG_END (); 64 GNUNET_GTK_DEBUG_END ();
65 return NULL; 65 return NULL;
66} 66}
67 67
@@ -73,14 +73,14 @@ on_clearAvailableContentButton_clicked_fs (GtkWidget * dummy1,
73 GtkWidget *contentList; 73 GtkWidget *contentList;
74 GtkTreeModel *model; 74 GtkTreeModel *model;
75 75
76 DEBUG_BEGIN (); 76 GNUNET_GTK_DEBUG_BEGIN ();
77 contentList = 77 contentList =
78 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 78 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
79 "availableContentList"); 79 "availableContentList");
80 model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList)); 80 model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList));
81 GNUNET_URITRACK_clear (ectx, cfg); 81 GNUNET_URITRACK_clear (ectx, cfg);
82 GNUNET_GTK_save_call (&clearContentList, model); 82 GNUNET_GTK_save_call (&clearContentList, model);
83 DEBUG_END (); 83 GNUNET_GTK_DEBUG_END ();
84} 84}
85 85
86void 86void
@@ -146,7 +146,7 @@ updateView (void *cls)
146 } 146 }
147 147
148 if (GNUNET_ECRS_uri_test_chk (fi->uri)) 148 if (GNUNET_ECRS_uri_test_chk (fi->uri))
149 size = GNUNET_ECRS_uri_get_file_siz (fi->uri); 149 size = GNUNET_ECRS_uri_get_file_size (fi->uri);
150 else 150 else
151 size = 0; 151 size = 0;
152 uriString = GNUNET_ECRS_uri_to_string (fi->uri); 152 uriString = GNUNET_ECRS_uri_to_string (fi->uri);
diff --git a/src/plugins/fs/directory.c b/src/plugins/fs/directory.c
index 5524899c..8416fcdf 100644
--- a/src/plugins/fs/directory.c
+++ b/src/plugins/fs/directory.c
@@ -45,7 +45,7 @@ selectFile ()
45 45
46 uploadXML 46 uploadXML
47 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 47 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
48 "openDirectoryFileDialog", PACKAGNUNET_GENAME); 48 "openDirectoryFileDialog", PACKAGNUNET_GE_NAME);
49 GNUNET_GTK_connect_glade_with_plugins (uploadXML); 49 GNUNET_GTK_connect_glade_with_plugins (uploadXML);
50 dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML, 50 dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
51 "openDirectoryFileDialog")); 51 "openDirectoryFileDialog"));
@@ -121,7 +121,7 @@ on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
121 } 121 }
122 kws[0] = dn; 122 kws[0] = dn;
123 kws[1] = NULL; 123 kws[1] = NULL;
124 uri = GNUNET_ECRS_keyword_string_to_uri (kws); 124 uri = GNUNET_ECRS_keyword_strings_to_uri (kws);
125 md = NULL; 125 md = NULL;
126 list = fs_search_started (NULL, uri, 0, 0, NULL, GNUNET_FSUI_COMPLETED); 126 list = fs_search_started (NULL, uri, 0, 0, NULL, GNUNET_FSUI_COMPLETED);
127 GNUNET_ECRS_uri_destroy (uri); 127 GNUNET_ECRS_uri_destroy (uri);
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index e3db84f8..ce8c4c75 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -57,7 +57,7 @@ addFilesToDirectory (const GNUNET_ECRS_FileInfo * fi,
57 path = gtk_tree_row_reference_get_path (list->searchViewRowReference); 57 path = gtk_tree_row_reference_get_path (list->searchViewRowReference);
58 if (path == NULL) 58 if (path == NULL)
59 { 59 {
60 GNUNET_GEBREAK (ectx, 0); 60 GNUNET_GE_BREAK (ectx, 0);
61 return GNUNET_SYSERR; 61 return GNUNET_SYSERR;
62 } 62 }
63 gtk_tree_model_get_iter (model, &iter, path); 63 gtk_tree_model_get_iter (model, &iter, path);
@@ -135,9 +135,9 @@ refreshDirectoryViewFromDisk (DownloadList * list)
135 data = MMAP (NULL, size, PROT_READ, MAP_SHARED, fd, 0); 135 data = MMAP (NULL, size, PROT_READ, MAP_SHARED, fd, 0);
136 if ((data == MAP_FAILED) || (data == NULL)) 136 if ((data == MAP_FAILED) || (data == NULL))
137 { 137 {
138 GNUNET_GELOG_STRERROR_FILE (ectx, 138 GNUNET_GE_LOG_STRERROR_FILE (ectx,
139 GNUNET_GEERROR | GNUNET_GEADMIN | 139 GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
140 GNUNET_GEBULK, "mmap", f); 140 GNUNET_GE_BULK, "mmap", f);
141 CLOSE (fd); 141 CLOSE (fd);
142 GNUNET_free_non_null (fn); 142 GNUNET_free_non_null (fn);
143 return; 143 return;
@@ -208,7 +208,7 @@ fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
208 { 208 {
209 gtk_tree_store_append (download_summary, &iter, NULL); 209 gtk_tree_store_append (download_summary, &iter, NULL);
210 } 210 }
211 size = GNUNET_ECRS_uri_get_file_siz (fi->uri); 211 size = GNUNET_ECRS_uri_get_file_size (fi->uri);
212 size_h = GNUNET_get_byte_size_as_fancy_string (size); 212 size_h = GNUNET_get_byte_size_as_fancy_string (size);
213 sname = &filename[strlen (filename) - 1]; 213 sname = &filename[strlen (filename) - 1];
214 while ((sname > filename) && (sname[-1] != '/') && (sname[-1] != '\\')) 214 while ((sname > filename) && (sname[-1] != '/') && (sname[-1] != '\\'))
@@ -245,10 +245,10 @@ fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
245 /* FIXME: this requires GTK 2.8. Since it doesn't support Win9x, the quick 245 /* FIXME: this requires GTK 2.8. Since it doesn't support Win9x, the quick
246 solution is to #ifndef it */ 246 solution is to #ifndef it */
247#ifndef MINGW 247#ifndef MINGW
248 GNUNET_GEBREAK (ectx, 248 GNUNET_GE_BREAK (ectx,
249 gtk_tree_row_reference_get_model (dl_parent-> 249 gtk_tree_row_reference_get_model (dl_parent->
250 searchViewRowReference) 250 searchViewRowReference)
251 == model); 251 == model);
252#endif 252#endif
253 path = 253 path =
254 gtk_tree_row_reference_get_path (dl_parent-> 254 gtk_tree_row_reference_get_path (dl_parent->
@@ -256,16 +256,16 @@ fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
256 if (path != NULL) 256 if (path != NULL)
257 { 257 {
258 valid = gtk_tree_model_get_iter (model, &piter, path); 258 valid = gtk_tree_model_get_iter (model, &piter, path);
259 GNUNET_GEBREAK (ectx, valid == TRUE); 259 GNUNET_GE_BREAK (ectx, valid == TRUE);
260 if (valid == TRUE) 260 if (valid == TRUE)
261 { 261 {
262 valid = gtk_tree_model_iter_children (model, &iter, &piter); 262 valid = gtk_tree_model_iter_children (model, &iter, &piter);
263 GNUNET_GEBREAK (ectx, valid == TRUE); 263 GNUNET_GE_BREAK (ectx, valid == TRUE);
264 } 264 }
265 } 265 }
266 else 266 else
267 { 267 {
268 GNUNET_GEBREAK (ectx, 0); 268 GNUNET_GE_BREAK (ectx, 0);
269 valid = FALSE; 269 valid = FALSE;
270 } 270 }
271 } 271 }
@@ -273,7 +273,7 @@ fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
273 { 273 {
274 /* no download-parent, must be top-level entry in search */ 274 /* no download-parent, must be top-level entry in search */
275 valid = gtk_tree_model_get_iter_first (model, &iter); 275 valid = gtk_tree_model_get_iter_first (model, &iter);
276 GNUNET_GEBREAK (ectx, valid == TRUE); 276 GNUNET_GE_BREAK (ectx, valid == TRUE);
277 } 277 }
278 while (valid == TRUE) 278 while (valid == TRUE)
279 { 279 {
@@ -298,7 +298,7 @@ fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
298 { 298 {
299 /* did not find matching entry in search list -- bug! Continue 299 /* did not find matching entry in search list -- bug! Continue
300 without adding to to search list! */ 300 without adding to to search list! */
301 GNUNET_GEBREAK (ectx, 0); 301 GNUNET_GE_BREAK (ectx, 0);
302 list->searchList = NULL; 302 list->searchList = NULL;
303 } 303 }
304 } 304 }
@@ -332,7 +332,7 @@ fs_download_update (DownloadList * list,
332 path = gtk_tree_row_reference_get_path (list->summaryViewRowReference); 332 path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
333 if (path == NULL) 333 if (path == NULL)
334 { 334 {
335 GNUNET_GEBREAK (ectx, 0); 335 GNUNET_GE_BREAK (ectx, 0);
336 return; 336 return;
337 } 337 }
338 gtk_tree_model_get_iter (GTK_TREE_MODEL (download_summary), &iter, path); 338 gtk_tree_model_get_iter (GTK_TREE_MODEL (download_summary), &iter, path);
@@ -429,7 +429,7 @@ fs_download_stopped (DownloadList * list)
429 path = gtk_tree_row_reference_get_path (list->summaryViewRowReference); 429 path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
430 if (path == NULL) 430 if (path == NULL)
431 { 431 {
432 GNUNET_GEBREAK (ectx, 0); 432 GNUNET_GE_BREAK (ectx, 0);
433 } 433 }
434 else 434 else
435 { 435 {
@@ -449,7 +449,7 @@ fs_download_stopped (DownloadList * list)
449 path = gtk_tree_row_reference_get_path (list->searchViewRowReference); 449 path = gtk_tree_row_reference_get_path (list->searchViewRowReference);
450 if (path == NULL) 450 if (path == NULL)
451 { 451 {
452 GNUNET_GEBREAK (ectx, 0); 452 GNUNET_GE_BREAK (ectx, 0);
453 } 453 }
454 else 454 else
455 { 455 {
@@ -479,7 +479,7 @@ fs_download_stopped (DownloadList * list)
479 if (prev != NULL) 479 if (prev != NULL)
480 prev->next = list->next; 480 prev->next = list->next;
481 else 481 else
482 GNUNET_GEBREAK (ectx, 0); 482 GNUNET_GE_BREAK (ectx, 0);
483 } 483 }
484 GNUNET_free (list); 484 GNUNET_free (list);
485} 485}
@@ -590,7 +590,7 @@ initiateDownload (GtkTreeModel * model,
590 (!(GNUNET_ECRS_uri_test_chk (sdc.idc_uri) 590 (!(GNUNET_ECRS_uri_test_chk (sdc.idc_uri)
591 || GNUNET_ECRS_uri_test_loc (sdc.idc_uri)))) 591 || GNUNET_ECRS_uri_test_loc (sdc.idc_uri))))
592 { 592 {
593 GNUNET_GEBREAK (ectx, 0); 593 GNUNET_GE_BREAK (ectx, 0);
594 GNUNET_free_non_null (idc_name); 594 GNUNET_free_non_null (idc_name);
595 GNUNET_free_non_null (idc_mime); 595 GNUNET_free_non_null (idc_mime);
596 return; 596 return;
@@ -600,7 +600,7 @@ initiateDownload (GtkTreeModel * model,
600 (strlen (sdc.uri_name) < 600 (strlen (sdc.uri_name) <
601 strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_FILE_INFIX))) 601 strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_FILE_INFIX)))
602 { 602 {
603 GNUNET_GEBREAK (ectx, 0); 603 GNUNET_GE_BREAK (ectx, 0);
604 GNUNET_free_non_null (sdc.uri_name); 604 GNUNET_free_non_null (sdc.uri_name);
605 GNUNET_free_non_null (idc_name); 605 GNUNET_free_non_null (idc_name);
606 GNUNET_free_non_null (idc_mime); 606 GNUNET_free_non_null (idc_mime);
@@ -620,10 +620,10 @@ initiateDownload (GtkTreeModel * model,
620#ifdef WINDOWS 620#ifdef WINDOWS
621 char *filehash; 621 char *filehash;
622 622
623 GNUNET_GEASSERT (NULL, 623 GNUNET_GE_ASSERT (NULL,
624 strlen (sdc.uri_name) > 624 strlen (sdc.uri_name) >
625 strlen (GNUNET_ECRS_URI_PREFIX) + 625 strlen (GNUNET_ECRS_URI_PREFIX) +
626 strlen (GNUNET_ECRS_FILE_INFIX)); 626 strlen (GNUNET_ECRS_FILE_INFIX));
627 GNUNET_free_non_null (idc_name); 627 GNUNET_free_non_null (idc_name);
628 filehash = 628 filehash =
629 GNUNET_strdup (&sdc. 629 GNUNET_strdup (&sdc.
@@ -633,10 +633,10 @@ initiateDownload (GtkTreeModel * model,
633 idc_name = GNUNET_strdup (filehash); 633 idc_name = GNUNET_strdup (filehash);
634 GNUNET_free_non_null (filehash); 634 GNUNET_free_non_null (filehash);
635#else 635#else
636 GNUNET_GEASSERT (NULL, 636 GNUNET_GE_ASSERT (NULL,
637 strlen (sdc.uri_name) > 637 strlen (sdc.uri_name) >
638 strlen (GNUNET_ECRS_URI_PREFIX) + 638 strlen (GNUNET_ECRS_URI_PREFIX) +
639 strlen (GNUNET_ECRS_FILE_INFIX)); 639 strlen (GNUNET_ECRS_FILE_INFIX));
640 GNUNET_free_non_null (idc_name); 640 GNUNET_free_non_null (idc_name);
641 idc_name = 641 idc_name =
642 GNUNET_strdup (&sdc. 642 GNUNET_strdup (&sdc.
@@ -863,7 +863,7 @@ clearCompletedDownloadCallback (GtkTreeModel * model,
863 DownloadList *dl; 863 DownloadList *dl;
864 struct FCBC fcbc; 864 struct FCBC fcbc;
865 865
866 GNUNET_GEASSERT (ectx, model == GTK_TREE_MODEL (download_summary)); 866 GNUNET_GE_ASSERT (ectx, model == GTK_TREE_MODEL (download_summary));
867 gtk_tree_model_get (model, iter, DOWNLOAD_INTERNAL, &dl, -1); 867 gtk_tree_model_get (model, iter, DOWNLOAD_INTERNAL, &dl, -1);
868 if ((FALSE == gtk_tree_model_iter_has_child (model, 868 if ((FALSE == gtk_tree_model_iter_has_child (model,
869 iter)) && (dl->has_terminated)) 869 iter)) && (dl->has_terminated))
@@ -890,7 +890,7 @@ fsuiCallDownloadCallback (GtkTreeModel * model,
890 DownloadList *dl; 890 DownloadList *dl;
891 struct FCBC fcbc; 891 struct FCBC fcbc;
892 892
893 GNUNET_GEASSERT (ectx, model == GTK_TREE_MODEL (download_summary)); 893 GNUNET_GE_ASSERT (ectx, model == GTK_TREE_MODEL (download_summary));
894 gtk_tree_model_get (model, iter, DOWNLOAD_INTERNAL, &dl, -1); 894 gtk_tree_model_get (model, iter, DOWNLOAD_INTERNAL, &dl, -1);
895 fcbc.method = fsui_call; 895 fcbc.method = fsui_call;
896 fcbc.argument = dl->fsui_list; 896 fcbc.argument = dl->fsui_list;
diff --git a/src/plugins/fs/extensions/musicinsert.c b/src/plugins/fs/extensions/musicinsert.c
index bafeba77..ea58f520 100644
--- a/src/plugins/fs/extensions/musicinsert.c
+++ b/src/plugins/fs/extensions/musicinsert.c
@@ -79,7 +79,7 @@ show_musicinsertdialog ()
79{ 79{
80 musicinsertXML = 80 musicinsertXML =
81 glade_xml_new (MUSICINSERTXMLFILE, "musicinsertdialog", 81 glade_xml_new (MUSICINSERTXMLFILE, "musicinsertdialog",
82 PACKAGNUNET_GENAME); 82 PACKAGNUNET_GE_NAME);
83 glade_xml_signal_autoconnect (musicinsertXML); 83 glade_xml_signal_autoconnect (musicinsertXML);
84/* libglade*/ 84/* libglade*/
85 85
@@ -486,7 +486,7 @@ insertfiles ()
486 GtkWidget *message_dialog = 486 GtkWidget *message_dialog =
487 gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog), 487 gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
488 GTK_DIALOG_DESTROY_WITH_PARENT, 488 GTK_DIALOG_DESTROY_WITH_PARENT,
489 GTK_MESSAGNUNET_GEERROR, 489 GTK_MESSAGE_ERROR,
490 GTK_BUTTONS_CLOSE, 490 GTK_BUTTONS_CLOSE,
491 "%s", error_message); 491 "%s", error_message);
492 gtk_dialog_run (GTK_DIALOG (message_dialog)); 492 gtk_dialog_run (GTK_DIALOG (message_dialog));
@@ -751,7 +751,7 @@ on_diraddbutton_clicked (GtkButton * button, gpointer user_data)
751 GtkWidget *file_error_dialog = 751 GtkWidget *file_error_dialog =
752 gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog), 752 gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
753 GTK_DIALOG_DESTROY_WITH_PARENT, 753 GTK_DIALOG_DESTROY_WITH_PARENT,
754 GTK_MESSAGNUNET_GEERROR, 754 GTK_MESSAGE_ERROR,
755 GTK_BUTTONS_CLOSE, 755 GTK_BUTTONS_CLOSE,
756 file_error_message->str); 756 file_error_message->str);
757 gtk_dialog_run (GTK_DIALOG (file_error_dialog)); 757 gtk_dialog_run (GTK_DIALOG (file_error_dialog));
@@ -767,7 +767,7 @@ on_diraddbutton_clicked (GtkButton * button, gpointer user_data)
767 GtkWidget *message_dialog = 767 GtkWidget *message_dialog =
768 gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog), 768 gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
769 GTK_DIALOG_DESTROY_WITH_PARENT, 769 GTK_DIALOG_DESTROY_WITH_PARENT,
770 GTK_MESSAGNUNET_GEERROR, 770 GTK_MESSAGE_ERROR,
771 GTK_BUTTONS_CLOSE, 771 GTK_BUTTONS_CLOSE,
772 "%s%s", error_message, 772 "%s%s", error_message,
773 dir_opening_error->message); 773 dir_opening_error->message);
@@ -839,7 +839,7 @@ on_fileaddbutton_clicked (GtkButton * button, gpointer user_data)
839 GtkWidget *file_error_dialog = 839 GtkWidget *file_error_dialog =
840 gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog), 840 gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
841 GTK_DIALOG_DESTROY_WITH_PARENT, 841 GTK_DIALOG_DESTROY_WITH_PARENT,
842 GTK_MESSAGNUNET_GEERROR, 842 GTK_MESSAGE_ERROR,
843 GTK_BUTTONS_CLOSE, 843 GTK_BUTTONS_CLOSE,
844 file_error_message->str); 844 file_error_message->str);
845 gtk_dialog_run (GTK_DIALOG (file_error_dialog)); 845 gtk_dialog_run (GTK_DIALOG (file_error_dialog));
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 015f26c5..1eda8a50 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -37,7 +37,7 @@
37 37
38struct GNUNET_FSUI_Context *ctx; 38struct GNUNET_FSUI_Context *ctx;
39 39
40struct GNUNET_GEContext *ectx; 40struct GNUNET_GE_Context *ectx;
41 41
42struct GNUNET_GC_Configuration *cfg; 42struct GNUNET_GC_Configuration *cfg;
43 43
@@ -99,7 +99,7 @@ on_anonymity_spin_changed_fs (GtkWidget * w, gpointer dummy)
99 spin = GTK_SPIN_BUTTON (w); 99 spin = GTK_SPIN_BUTTON (w);
100 if (spin == NULL) 100 if (spin == NULL)
101 { 101 {
102 GNUNET_GEBREAK (NULL, 0); 102 GNUNET_GE_BREAK (NULL, 0);
103 return; 103 return;
104 } 104 }
105 val = gtk_spin_button_get_value_as_int (spin); 105 val = gtk_spin_button_get_value_as_int (spin);
@@ -249,10 +249,10 @@ saveEventProcessor (void *cls)
249 break; 249 break;
250 /* TODO: unindex events */ 250 /* TODO: unindex events */
251 default: 251 default:
252 GNUNET_GEBREAK (ectx, 0); 252 GNUNET_GE_BREAK (ectx, 0);
253 GNUNET_GELOG (ectx, 253 GNUNET_GE_LOG (ectx,
254 GNUNET_GEERROR, 254 GNUNET_GE_ERROR,
255 _("Unhandled (unknown) FSUI event: %u.\n"), event->type); 255 _("Unhandled (unknown) FSUI event: %u.\n"), event->type);
256 break; 256 break;
257 } 257 }
258 return ret; 258 return ret;
@@ -367,13 +367,13 @@ on_upload_copy_uri_activate (void *cls, GtkWidget * searchEntry)
367 last_y, 367 last_y,
368 &path, NULL, NULL, NULL)) 368 &path, NULL, NULL, NULL))
369 { 369 {
370 GNUNET_GEBREAK (NULL, 0); 370 GNUNET_GE_BREAK (NULL, 0);
371 return FALSE; 371 return FALSE;
372 } 372 }
373 if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), 373 if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary),
374 &iter, path)) 374 &iter, path))
375 { 375 {
376 GNUNET_GEBREAK (NULL, 0); 376 GNUNET_GE_BREAK (NULL, 0);
377 gtk_tree_path_free (path); 377 gtk_tree_path_free (path);
378 return FALSE; 378 return FALSE;
379 } 379 }
@@ -657,7 +657,7 @@ fs_summary_stop ()
657} 657}
658 658
659void 659void
660init_fs (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c) 660init_fs (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
661{ 661{
662 GtkWidget *tab; 662 GtkWidget *tab;
663 GtkWidget *book; 663 GtkWidget *book;
diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h
index 1c2a16a0..9a00a24f 100644
--- a/src/plugins/fs/fs.h
+++ b/src/plugins/fs/fs.h
@@ -313,7 +313,7 @@ typedef struct UL
313 313
314extern struct GNUNET_FSUI_Context *ctx; 314extern struct GNUNET_FSUI_Context *ctx;
315 315
316extern struct GNUNET_GEContext *ectx; 316extern struct GNUNET_GE_Context *ectx;
317 317
318extern struct GNUNET_GC_Configuration *cfg; 318extern struct GNUNET_GC_Configuration *cfg;
319 319
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index ba7a31e1..dca2b57f 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -66,7 +66,7 @@ createMetaDataListTreeView (GladeXML * xml,
66 GtkTreeViewColumn *column; 66 GtkTreeViewColumn *column;
67 int col; 67 int col;
68 68
69 DEBUG_BEGIN (); 69 GNUNET_GTK_DEBUG_BEGIN ();
70 metamodel 70 metamodel
71 = gtk_list_store_new (META_NUM, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING); 71 = gtk_list_store_new (META_NUM, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
72 metaList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name)); 72 metaList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name));
@@ -121,7 +121,7 @@ createMetaDataListTreeView (GladeXML * xml,
121 } 121 }
122 UNREF (loader); 122 UNREF (loader);
123 } 123 }
124 DEBUG_END (); 124 GNUNET_GTK_DEBUG_END ();
125} 125}
126 126
127static int 127static int
@@ -130,10 +130,10 @@ publishKeyword (const char *data, void *cls)
130 GtkListStore *store = cls; 130 GtkListStore *store = cls;
131 GtkTreeIter iter; 131 GtkTreeIter iter;
132 132
133 DEBUG_BEGIN (); 133 GNUNET_GTK_DEBUG_BEGIN ();
134 gtk_list_store_append (store, &iter); 134 gtk_list_store_append (store, &iter);
135 gtk_list_store_set (store, &iter, 0, data, -1); 135 gtk_list_store_set (store, &iter, 0, data, -1);
136 DEBUG_END (); 136 GNUNET_GTK_DEBUG_END ();
137 return GNUNET_OK; 137 return GNUNET_OK;
138} 138}
139 139
@@ -147,7 +147,7 @@ createKeywordListTreeView (GladeXML * xml,
147 GtkCellRenderer *renderer; 147 GtkCellRenderer *renderer;
148 GtkTreeViewColumn *column; 148 GtkTreeViewColumn *column;
149 149
150 DEBUG_BEGIN (); 150 GNUNET_GTK_DEBUG_BEGIN ();
151 keymodel = gtk_list_store_new (1, G_TYPE_STRING); 151 keymodel = gtk_list_store_new (1, G_TYPE_STRING);
152 keywordList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name)); 152 keywordList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name));
153 gtk_tree_selection_set_mode (gtk_tree_view_get_selection (keywordList), 153 gtk_tree_selection_set_mode (gtk_tree_view_get_selection (keywordList),
@@ -165,7 +165,7 @@ createKeywordListTreeView (GladeXML * xml,
165 gtk_tree_view_set_model (keywordList, GTK_TREE_MODEL (keymodel)); 165 gtk_tree_view_set_model (keywordList, GTK_TREE_MODEL (keymodel));
166 if (init != NULL) 166 if (init != NULL)
167 GNUNET_ECRS_uri_get_keywords_from_ksk (init, &publishKeyword, keymodel); 167 GNUNET_ECRS_uri_get_keywords_from_ksk (init, &publishKeyword, keymodel);
168 DEBUG_END (); 168 GNUNET_GTK_DEBUG_END ();
169} 169}
170 170
171void 171void
@@ -178,7 +178,7 @@ createMetaTypeComboBox (GladeXML * xml, const char *name)
178 GtkTreeIter iter; 178 GtkTreeIter iter;
179 EXTRACTOR_KeywordType type; 179 EXTRACTOR_KeywordType type;
180 180
181 DEBUG_BEGIN (); 181 GNUNET_GTK_DEBUG_BEGIN ();
182 keywordTypeModel 182 keywordTypeModel
183 = gtk_list_store_new (KTYPE_NUM, G_TYPE_STRING, G_TYPE_INT); 183 = gtk_list_store_new (KTYPE_NUM, G_TYPE_STRING, G_TYPE_INT);
184 metaType = glade_xml_get_widget (xml, name); 184 metaType = glade_xml_get_widget (xml, name);
@@ -196,7 +196,7 @@ createMetaTypeComboBox (GladeXML * xml, const char *name)
196 gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (metaType), 196 gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (metaType),
197 renderer, "text", KTYPE_STRING); 197 renderer, "text", KTYPE_STRING);
198 gtk_combo_box_set_active (GTK_COMBO_BOX (metaType), 0); 198 gtk_combo_box_set_active (GTK_COMBO_BOX (metaType), 0);
199 DEBUG_END (); 199 GNUNET_GTK_DEBUG_END ();
200} 200}
201 201
202void 202void
@@ -210,7 +210,7 @@ handleKeywordListUpdate (GladeXML * xml,
210 GtkListStore *keymodel; 210 GtkListStore *keymodel;
211 GtkTreeIter iter; 211 GtkTreeIter iter;
212 212
213 DEBUG_BEGIN (); 213 GNUNET_GTK_DEBUG_BEGIN ();
214 keywordList = glade_xml_get_widget (xml, keywordListName); 214 keywordList = glade_xml_get_widget (xml, keywordListName);
215 keymodel 215 keymodel
216 = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (keywordList))); 216 = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (keywordList)));
@@ -220,7 +220,7 @@ handleKeywordListUpdate (GladeXML * xml,
220 gtk_list_store_append (keymodel, &iter); 220 gtk_list_store_append (keymodel, &iter);
221 gtk_list_store_set (keymodel, &iter, 0, keyword, -1); 221 gtk_list_store_set (keymodel, &iter, 0, keyword, -1);
222 gtk_entry_set_text (GTK_ENTRY (entryLine), ""); 222 gtk_entry_set_text (GTK_ENTRY (entryLine), "");
223 DEBUG_END (); 223 GNUNET_GTK_DEBUG_END ();
224} 224}
225 225
226void 226void
@@ -239,7 +239,7 @@ handleMetaDataListUpdate (GladeXML * xml,
239 GtkTreeIter iter; 239 GtkTreeIter iter;
240 char *stype; 240 char *stype;
241 241
242 DEBUG_BEGIN (); 242 GNUNET_GTK_DEBUG_BEGIN ();
243 metaList = glade_xml_get_widget (xml, metaDataListName); 243 metaList = glade_xml_get_widget (xml, metaDataListName);
244 metamodel 244 metamodel
245 = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (metaList))); 245 = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (metaList)));
@@ -262,7 +262,7 @@ handleMetaDataListUpdate (GladeXML * xml,
262 META_STYPE, stype, META_VALUE, value, -1); 262 META_STYPE, stype, META_VALUE, value, -1);
263 gtk_entry_set_text (GTK_ENTRY (entryLine), ""); 263 gtk_entry_set_text (GTK_ENTRY (entryLine), "");
264 GNUNET_free_non_null (stype); 264 GNUNET_free_non_null (stype);
265 DEBUG_END (); 265 GNUNET_GTK_DEBUG_END ();
266} 266}
267 267
268static void 268static void
@@ -323,8 +323,7 @@ getMetaDataFromList (GladeXML * xml,
323 323
324 preview = glade_xml_get_widget (xml, previewName); 324 preview = glade_xml_get_widget (xml, previewName);
325 325
326 if (GTK_IMAGNUNET_GEPIXBUF == 326 if (GTK_IMAGE_PIXBUF == gtk_image_get_storage_type (GTK_IMAGE (preview)))
327 gtk_image_get_storage_type (GTK_IMAGE (preview)))
328 { 327 {
329 pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (preview)); 328 pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (preview));
330 if (pixbuf == NULL) 329 if (pixbuf == NULL)
@@ -380,7 +379,7 @@ getKeywordURIFromList (GladeXML * xml, const char *name)
380 unsigned int kpos; 379 unsigned int kpos;
381 unsigned int ksize; 380 unsigned int ksize;
382 381
383 DEBUG_BEGIN (); 382 GNUNET_GTK_DEBUG_BEGIN ();
384 keyList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name)); 383 keyList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name));
385 keymodel = gtk_tree_view_get_model (keyList); 384 keymodel = gtk_tree_view_get_model (keyList);
386 385
@@ -401,11 +400,11 @@ getKeywordURIFromList (GladeXML * xml, const char *name)
401 } 400 }
402 keywords[kpos] = NULL; 401 keywords[kpos] = NULL;
403 402
404 keywordURI = GNUNET_ECRS_keyword_string_to_uri ((const char **) keywords); 403 keywordURI = GNUNET_ECRS_keyword_strings_to_uri ((const char **) keywords);
405 while (kpos > 0) 404 while (kpos > 0)
406 GNUNET_free (keywords[--kpos]); 405 GNUNET_free (keywords[--kpos]);
407 GNUNET_array_grow (keywords, ksize, 0); 406 GNUNET_array_grow (keywords, ksize, 0);
408 DEBUG_END (); 407 GNUNET_GTK_DEBUG_END ();
409 return keywordURI; 408 return keywordURI;
410} 409}
411 410
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index dd424ee3..e41cf46c 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -114,10 +114,10 @@ makeNamespaceFrame (NamespaceList * entry)
114 GtkTreeViewColumn *column; 114 GtkTreeViewColumn *column;
115 int col; 115 int col;
116 116
117 DEBUG_BEGIN (); 117 GNUNET_GTK_DEBUG_BEGIN ();
118 namespaceXML 118 namespaceXML
119 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 119 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
120 "namespaceContentFrame", PACKAGNUNET_GENAME); 120 "namespaceContentFrame", PACKAGNUNET_GE_NAME);
121 GNUNET_GTK_connect_glade_with_plugins (namespaceXML); 121 GNUNET_GTK_connect_glade_with_plugins (namespaceXML);
122 child = extractMainWidgetFromWindow (namespaceXML, "namespaceContentFrame"); 122 child = extractMainWidgetFromWindow (namespaceXML, "namespaceContentFrame");
123 resultList = glade_xml_get_widget (namespaceXML, 123 resultList = glade_xml_get_widget (namespaceXML,
@@ -278,7 +278,7 @@ makeNamespaceFrame (NamespaceList * entry)
278 278
279 279
280 UNREF (namespaceXML); 280 UNREF (namespaceXML);
281 DEBUG_END (); 281 GNUNET_GTK_DEBUG_END ();
282 282
283 entry->namespacepage = child; 283 entry->namespacepage = child;
284} 284}
@@ -318,7 +318,7 @@ addNamespaceContentToModel (void *cls,
318 unsigned long long size; 318 unsigned long long size;
319 char *size_h; 319 char *size_h;
320 320
321 DEBUG_BEGIN (); 321 GNUNET_GTK_DEBUG_BEGIN ();
322 filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta, 322 filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
323 EXTRACTOR_FILENAME, 323 EXTRACTOR_FILENAME,
324 EXTRACTOR_TITLE, 324 EXTRACTOR_TITLE,
@@ -352,7 +352,7 @@ addNamespaceContentToModel (void *cls,
352 if (mime == NULL) 352 if (mime == NULL)
353 mime = GNUNET_strdup (_("unknown")); 353 mime = GNUNET_strdup (_("unknown"));
354 if (GNUNET_ECRS_uri_test_chk (fi->uri)) 354 if (GNUNET_ECRS_uri_test_chk (fi->uri))
355 size = GNUNET_ECRS_uri_get_file_siz (fi->uri); 355 size = GNUNET_ECRS_uri_get_file_size (fi->uri);
356 else 356 else
357 size = 0; 357 size = 0;
358 uriString = GNUNET_ECRS_uri_to_string (fi->uri); 358 uriString = GNUNET_ECRS_uri_to_string (fi->uri);
@@ -393,7 +393,7 @@ addNamespaceContentToModel (void *cls,
393 GNUNET_free (freq); 393 GNUNET_free (freq);
394 GNUNET_free (date); 394 GNUNET_free (date);
395 GNUNET_free (mime); 395 GNUNET_free (mime);
396 DEBUG_END (); 396 GNUNET_GTK_DEBUG_END ();
397 return GNUNET_OK; 397 return GNUNET_OK;
398} 398}
399 399
@@ -415,7 +415,7 @@ addTabForNamespace (void *unused,
415 GNUNET_ECRS_namespace_test_exists (NULL, cfg, namespaceName, 415 GNUNET_ECRS_namespace_test_exists (NULL, cfg, namespaceName,
416 namespaceId)) 416 namespaceId))
417 return GNUNET_OK; 417 return GNUNET_OK;
418 DEBUG_BEGIN (); 418 GNUNET_GTK_DEBUG_BEGIN ();
419 label = gtk_label_new (namespaceName); 419 label = gtk_label_new (namespaceName);
420 list = GNUNET_malloc (sizeof (NamespaceList)); 420 list = GNUNET_malloc (sizeof (NamespaceList));
421 list->name = GNUNET_strdup (namespaceName); 421 list->name = GNUNET_strdup (namespaceName);
@@ -434,7 +434,7 @@ addTabForNamespace (void *unused,
434 gtk_widget_show (notebook); 434 gtk_widget_show (notebook);
435 GNUNET_NS_namespace_list_contents 435 GNUNET_NS_namespace_list_contents
436 (ectx, cfg, namespaceName, &addNamespaceContentToModel, list->model); 436 (ectx, cfg, namespaceName, &addNamespaceContentToModel, list->model);
437 DEBUG_END (); 437 GNUNET_GTK_DEBUG_END ();
438 /* enable "delete" menu entry */ 438 /* enable "delete" menu entry */
439 439
440 del_menu = 440 del_menu =
@@ -468,7 +468,7 @@ frame_destroy (GtkWidget * tree)
468 } 468 }
469 if (pos == NULL) 469 if (pos == NULL)
470 { 470 {
471 GNUNET_GEBREAK (NULL, 0); 471 GNUNET_GE_BREAK (NULL, 0);
472 return; 472 return;
473 } 473 }
474 if (prev == NULL) 474 if (prev == NULL)
@@ -516,7 +516,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
516 GtkWidget *dialog; 516 GtkWidget *dialog;
517 gint ret; 517 gint ret;
518 518
519 DEBUG_BEGIN (); 519 GNUNET_GTK_DEBUG_BEGIN ();
520 notebook = 520 notebook =
521 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 521 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
522 "localNamespacesNotebook"); 522 "localNamespacesNotebook");
@@ -528,7 +528,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
528 dialog = gtk_message_dialog_new 528 dialog = gtk_message_dialog_new
529 (NULL, 529 (NULL,
530 GTK_DIALOG_MODAL, 530 GTK_DIALOG_MODAL,
531 GTK_MESSAGNUNET_GEERROR, 531 GTK_MESSAGE_ERROR,
532 GTK_BUTTONS_CLOSE, 532 GTK_BUTTONS_CLOSE,
533 _("No local namespaces available that could be deleted!")); 533 _("No local namespaces available that could be deleted!"));
534 gtk_dialog_run (GTK_DIALOG (dialog)); 534 gtk_dialog_run (GTK_DIALOG (dialog));
@@ -545,7 +545,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
545 } 545 }
546 if (list == NULL) 546 if (list == NULL)
547 { 547 {
548 GNUNET_GEBREAK (ectx, 0); 548 GNUNET_GE_BREAK (ectx, 0);
549 return; 549 return;
550 } 550 }
551 /* open window to ask for confirmation, 551 /* open window to ask for confirmation,
@@ -554,7 +554,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
554 dialog = gtk_message_dialog_new 554 dialog = gtk_message_dialog_new
555 (NULL, 555 (NULL,
556 GTK_DIALOG_MODAL, 556 GTK_DIALOG_MODAL,
557 GTK_MESSAGNUNET_GEERROR, 557 GTK_MESSAGE_ERROR,
558 GTK_BUTTONS_YES_NO, 558 GTK_BUTTONS_YES_NO,
559 _("Should the namespace `%s' really be deleted?"), list->name); 559 _("Should the namespace `%s' really be deleted?"), list->name);
560 ret = gtk_dialog_run (GTK_DIALOG (dialog)); 560 ret = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -564,7 +564,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
564 gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), num); 564 gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), num);
565 GNUNET_NS_namespace_delete (ectx, cfg, list->name); 565 GNUNET_NS_namespace_delete (ectx, cfg, list->name);
566 frame_destroy (list->treeview); 566 frame_destroy (list->treeview);
567 DEBUG_END (); 567 GNUNET_GTK_DEBUG_END ();
568} 568}
569 569
570typedef struct 570typedef struct
@@ -592,13 +592,13 @@ addToNamespaceCB (GtkTreeModel * model,
592 NamespaceList *list; 592 NamespaceList *list;
593 GNUNET_ECRS_FileInfo fi; 593 GNUNET_ECRS_FileInfo fi;
594 594
595 DEBUG_BEGIN (); 595 GNUNET_GTK_DEBUG_BEGIN ();
596 dst = NULL; 596 dst = NULL;
597 gtk_tree_model_get (model, 597 gtk_tree_model_get (model,
598 iter, NAMESPACE_URI, &dst, NAMESPACE_META, &meta, -1); 598 iter, NAMESPACE_URI, &dst, NAMESPACE_META, &meta, -1);
599 if (dst == NULL) 599 if (dst == NULL)
600 { 600 {
601 GNUNET_GEBREAK (ectx, 0); 601 GNUNET_GE_BREAK (ectx, 0);
602 return; 602 return;
603 } 603 }
604 resultURI = GNUNET_NS_add_to_namespace (ectx, cfg, cls->anonymityLevel, 1000, /* FIXME: priority */ 604 resultURI = GNUNET_NS_add_to_namespace (ectx, cfg, cls->anonymityLevel, 1000, /* FIXME: priority */
@@ -615,7 +615,7 @@ addToNamespaceCB (GtkTreeModel * model,
615 list = list->next; 615 list = list->next;
616 if (list == NULL) 616 if (list == NULL)
617 { 617 {
618 GNUNET_GEBREAK (ectx, 0); 618 GNUNET_GE_BREAK (ectx, 0);
619 } 619 }
620 else 620 else
621 { 621 {
@@ -639,7 +639,7 @@ addToNamespaceCB (GtkTreeModel * model,
639 ("Failed to insert content into namespace " 639 ("Failed to insert content into namespace "
640 "(consult logs).\n")); 640 "(consult logs).\n"));
641 } 641 }
642 DEBUG_END (); 642 GNUNET_GTK_DEBUG_END ();
643} 643}
644 644
645void 645void
@@ -677,21 +677,21 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
677 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 677 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
678 "localNamespacesNotebook"); 678 "localNamespacesNotebook");
679 num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook)); 679 num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
680 GNUNET_GEASSERT (ectx, num != -1); 680 GNUNET_GE_ASSERT (ectx, num != -1);
681 page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), num); 681 page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), num);
682 list = head; 682 list = head;
683 while ((list != NULL) && (list->namespacepage != page)) 683 while ((list != NULL) && (list->namespacepage != page))
684 list = list->next; 684 list = list->next;
685 if (list == NULL) 685 if (list == NULL)
686 { 686 {
687 GNUNET_GEBREAK (ectx, 0); 687 GNUNET_GE_BREAK (ectx, 0);
688 return; 688 return;
689 } 689 }
690 cls.namespaceName = list->name; 690 cls.namespaceName = list->name;
691 691
692 metaXML 692 metaXML
693 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 693 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
694 "namespaceInsertDialog", PACKAGNUNET_GENAME); 694 "namespaceInsertDialog", PACKAGNUNET_GE_NAME);
695 GNUNET_GTK_connect_glade_with_plugins (metaXML); 695 GNUNET_GTK_connect_glade_with_plugins (metaXML);
696 dialog = glade_xml_get_widget (metaXML, "namespaceInsertDialog"); 696 dialog = glade_xml_get_widget (metaXML, "namespaceInsertDialog");
697 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); 697 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -715,7 +715,7 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
715 dialog = gtk_message_dialog_new 715 dialog = gtk_message_dialog_new
716 (NULL, 716 (NULL,
717 GTK_DIALOG_MODAL, 717 GTK_DIALOG_MODAL,
718 GTK_MESSAGNUNET_GEERROR, 718 GTK_MESSAGE_ERROR,
719 GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!")); 719 GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
720 gtk_dialog_run (GTK_DIALOG (dialog)); 720 gtk_dialog_run (GTK_DIALOG (dialog));
721 gtk_widget_destroy (dialog); 721 gtk_widget_destroy (dialog);
@@ -779,20 +779,20 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
779 gint num; 779 gint num;
780 const char *nn_str; 780 const char *nn_str;
781 781
782 DEBUG_BEGIN (); 782 GNUNET_GTK_DEBUG_BEGIN ();
783 /* find out which namespace this is about */ 783 /* find out which namespace this is about */
784 notebook = 784 notebook =
785 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 785 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
786 "localNamespacesNotebook"); 786 "localNamespacesNotebook");
787 num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook)); 787 num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
788 GNUNET_GEASSERT (ectx, num != -1); 788 GNUNET_GE_ASSERT (ectx, num != -1);
789 page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), num); 789 page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), num);
790 list = head; 790 list = head;
791 while ((list != NULL) && (list->namespacepage != page)) 791 while ((list != NULL) && (list->namespacepage != page))
792 list = list->next; 792 list = list->next;
793 if (list == NULL) 793 if (list == NULL)
794 { 794 {
795 GNUNET_GEBREAK (ectx, 0); 795 GNUNET_GE_BREAK (ectx, 0);
796 return; 796 return;
797 } 797 }
798 cls.namespaceName = list->name; 798 cls.namespaceName = list->name;
@@ -801,7 +801,7 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
801 selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list->treeview)); 801 selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list->treeview));
802 if (TRUE != gtk_tree_selection_get_selected (selection, NULL, &iter)) 802 if (TRUE != gtk_tree_selection_get_selected (selection, NULL, &iter))
803 { 803 {
804 GNUNET_GEBREAK (ectx, 0); 804 GNUNET_GE_BREAK (ectx, 0);
805 return; 805 return;
806 } 806 }
807 gtk_tree_model_get (list->model, 807 gtk_tree_model_get (list->model,
@@ -811,19 +811,19 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
811 IN_NAMESPACE_PUB_FREQ_STRING, &freq, -1); 811 IN_NAMESPACE_PUB_FREQ_STRING, &freq, -1);
812 if ((last == NULL) || (next == NULL) || (freq == NULL)) 812 if ((last == NULL) || (next == NULL) || (freq == NULL))
813 { 813 {
814 GNUNET_GEBREAK (NULL, 0); 814 GNUNET_GE_BREAK (NULL, 0);
815 return; 815 return;
816 } 816 }
817 if (GNUNET_OK != parseTimeInterval (freq, &cls.updateInterval)) 817 if (GNUNET_OK != parseTimeInterval (freq, &cls.updateInterval))
818 { 818 {
819 GNUNET_GEBREAK (ectx, 0); 819 GNUNET_GE_BREAK (ectx, 0);
820 cls.updateInterval = GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC; 820 cls.updateInterval = GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC;
821 } 821 }
822 822
823 /* create update dialog */ 823 /* create update dialog */
824 metaXML 824 metaXML
825 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 825 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
826 "namespaceUpdateDialog", PACKAGNUNET_GENAME); 826 "namespaceUpdateDialog", PACKAGNUNET_GE_NAME);
827 GNUNET_GTK_connect_glade_with_plugins (metaXML); 827 GNUNET_GTK_connect_glade_with_plugins (metaXML);
828 dialog = glade_xml_get_widget (metaXML, "namespaceUpdateDialog"); 828 dialog = glade_xml_get_widget (metaXML, "namespaceUpdateDialog");
829 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); 829 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -877,7 +877,7 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
877 mdialog = gtk_message_dialog_new 877 mdialog = gtk_message_dialog_new
878 (NULL, 878 (NULL,
879 GTK_DIALOG_MODAL, 879 GTK_DIALOG_MODAL,
880 GTK_MESSAGNUNET_GEERROR, 880 GTK_MESSAGE_ERROR,
881 GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!")); 881 GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
882 gtk_dialog_run (GTK_DIALOG (mdialog)); 882 gtk_dialog_run (GTK_DIALOG (mdialog));
883 gtk_widget_destroy (mdialog); 883 gtk_widget_destroy (mdialog);
@@ -896,7 +896,7 @@ CLEANUP:
896 free (last); 896 free (last);
897 free (next); 897 free (next);
898 free (freq); 898 free (freq);
899 DEBUG_END (); 899 GNUNET_GTK_DEBUG_END ();
900} 900}
901 901
902 902
@@ -911,7 +911,7 @@ fs_namespace_start ()
911 GtkTreeViewColumn *column; 911 GtkTreeViewColumn *column;
912 int col; 912 int col;
913 913
914 DEBUG_BEGIN (); 914 GNUNET_GTK_DEBUG_BEGIN ();
915 trackCheckButton 915 trackCheckButton
916 = 916 =
917 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 917 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
@@ -990,7 +990,7 @@ fs_namespace_start ()
990 GNUNET_NS_namespace_list_all (ectx, cfg, &addTabForNamespace, NULL); 990 GNUNET_NS_namespace_list_all (ectx, cfg, &addTabForNamespace, NULL);
991 GNUNET_NS_register_discovery_callback (ectx, cfg, &namespace_discovered_cb, 991 GNUNET_NS_register_discovery_callback (ectx, cfg, &namespace_discovered_cb,
992 NULL); 992 NULL);
993 DEBUG_END (); 993 GNUNET_GTK_DEBUG_END ();
994} 994}
995 995
996 996
diff --git a/src/plugins/fs/namespace_create.c b/src/plugins/fs/namespace_create.c
index c443b7bf..ac611bc4 100644
--- a/src/plugins/fs/namespace_create.c
+++ b/src/plugins/fs/namespace_create.c
@@ -173,10 +173,10 @@ create_namespace_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
173 GNUNET_HashCode namespaceId; 173 GNUNET_HashCode namespaceId;
174 GNUNET_HashCode rootEntry; 174 GNUNET_HashCode rootEntry;
175 175
176 DEBUG_BEGIN (); 176 GNUNET_GTK_DEBUG_BEGIN ();
177 metaXML 177 metaXML
178 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 178 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
179 "namespaceMetaDataDialog", PACKAGNUNET_GENAME); 179 "namespaceMetaDataDialog", PACKAGNUNET_GE_NAME);
180 GNUNET_GTK_connect_glade_with_plugins (metaXML); 180 GNUNET_GTK_connect_glade_with_plugins (metaXML);
181 dialog = glade_xml_get_widget (metaXML, "namespaceMetaDataDialog"); 181 dialog = glade_xml_get_widget (metaXML, "namespaceMetaDataDialog");
182 createMetaDataListTreeView (metaXML, 182 createMetaDataListTreeView (metaXML,
@@ -238,7 +238,7 @@ create_namespace_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
238 dialog = gtk_message_dialog_new 238 dialog = gtk_message_dialog_new
239 (NULL, 239 (NULL,
240 GTK_DIALOG_MODAL, 240 GTK_DIALOG_MODAL,
241 GTK_MESSAGNUNET_GEERROR, 241 GTK_MESSAGE_ERROR,
242 GTK_BUTTONS_CLOSE, 242 GTK_BUTTONS_CLOSE,
243 _("Failed to create namespace `%s'." 243 _("Failed to create namespace `%s'."
244 "Consult logs, most likely error is" 244 "Consult logs, most likely error is"
@@ -253,5 +253,5 @@ create_namespace_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
253 gtk_widget_destroy (dialog); 253 gtk_widget_destroy (dialog);
254 UNREF (metaXML); 254 UNREF (metaXML);
255 metaXML = NULL; 255 metaXML = NULL;
256 DEBUG_END (); 256 GNUNET_GTK_DEBUG_END ();
257} 257}
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c
index a764f707..06dc4145 100644
--- a/src/plugins/fs/namespace_search.c
+++ b/src/plugins/fs/namespace_search.c
@@ -52,7 +52,7 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
52 int rating; 52 int rating;
53 int newrating; 53 int newrating;
54 54
55 DEBUG_BEGIN (); 55 GNUNET_GTK_DEBUG_BEGIN ();
56 spin = 56 spin =
57 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 57 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
58 "namespaceRatingSpinButton"); 58 "namespaceRatingSpinButton");
@@ -86,7 +86,7 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
86 { 86 {
87 /* concurrent modification? */ 87 /* concurrent modification? */
88 gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), rating); 88 gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), rating);
89 GNUNET_GEBREAK (ectx, 0); 89 GNUNET_GE_BREAK (ectx, 0);
90 } 90 }
91 gtk_list_store_set (GTK_LIST_STORE (model), 91 gtk_list_store_set (GTK_LIST_STORE (model),
92 &iter, NS_SEARCH_RATING, rating, -1); 92 &iter, NS_SEARCH_RATING, rating, -1);
@@ -104,7 +104,7 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
104 free (description); 104 free (description);
105 if (encStr != NULL) 105 if (encStr != NULL)
106 free (encStr); 106 free (encStr);
107 DEBUG_END (); 107 GNUNET_GTK_DEBUG_END ();
108} 108}
109 109
110 110
@@ -129,7 +129,7 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
129 GNUNET_HashCode root; 129 GNUNET_HashCode root;
130 GNUNET_EncName enc; 130 GNUNET_EncName enc;
131 131
132 DEBUG_BEGIN (); 132 GNUNET_GTK_DEBUG_BEGIN ();
133 spin = 133 spin =
134 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 134 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
135 "namespaceRatingSpinButton"); 135 "namespaceRatingSpinButton");
@@ -184,7 +184,7 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
184 free (descStr); 184 free (descStr);
185 if (encStr != NULL) 185 if (encStr != NULL)
186 free (encStr); 186 free (encStr);
187 DEBUG_END (); 187 GNUNET_GTK_DEBUG_END ();
188} 188}
189 189
190struct NewNamespaceInfo 190struct NewNamespaceInfo
@@ -211,7 +211,7 @@ saveDiscovery (void *cls)
211 int found; 211 int found;
212 char *encName; 212 char *encName;
213 213
214 DEBUG_BEGIN (); 214 GNUNET_GTK_DEBUG_BEGIN ();
215 ncbe = 215 ncbe =
216 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 216 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
217 "searchNamespaceComboBoxEntry"); 217 "searchNamespaceComboBoxEntry");
@@ -274,7 +274,7 @@ saveDiscovery (void *cls)
274 NS_SEARCH_RATING, nni->rating, -1); 274 NS_SEARCH_RATING, nni->rating, -1);
275 } 275 }
276 GNUNET_free (name); 276 GNUNET_free (name);
277 DEBUG_END (); 277 GNUNET_GTK_DEBUG_END ();
278 278
279 return NULL; 279 return NULL;
280} 280}
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 055f126d..5afa8621 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -73,7 +73,7 @@ updateSearchSummary (SearchList * searchContext)
73 if (TRUE != 73 if (TRUE !=
74 gtk_tree_model_get_iter (GTK_TREE_MODEL (search_summary), &iter, path)) 74 gtk_tree_model_get_iter (GTK_TREE_MODEL (search_summary), &iter, path))
75 { 75 {
76 GNUNET_GEBREAK (ectx, 0); 76 GNUNET_GE_BREAK (ectx, 0);
77 return; 77 return;
78 } 78 }
79 gtk_tree_path_free (path); 79 gtk_tree_path_free (path);
@@ -112,7 +112,7 @@ addEntryToSearchTree (SearchList * searchContext,
112 unsigned long long size; 112 unsigned long long size;
113 char *size_h; 113 char *size_h;
114 GdkPixbuf *pixbuf; 114 GdkPixbuf *pixbuf;
115 enum URITRACK_STATE state; 115 enum GNUNET_URITRACK_STATE state;
116 116
117 state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri); 117 state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri);
118 mime = getMimeTypeFromMetaData (info->meta); 118 mime = getMimeTypeFromMetaData (info->meta);
@@ -120,8 +120,8 @@ addEntryToSearchTree (SearchList * searchContext,
120 name = getFileNameFromMetaData (info->meta); 120 name = getFileNameFromMetaData (info->meta);
121 size = GNUNET_ECRS_uri_test_chk (info->uri) 121 size = GNUNET_ECRS_uri_test_chk (info->uri)
122 || GNUNET_ECRS_uri_test_loc (info-> 122 || GNUNET_ECRS_uri_test_loc (info->
123 uri) ? GNUNET_ECRS_uri_get_file_siz (info-> 123 uri) ? GNUNET_ECRS_uri_get_file_size (info->
124 uri) : 124 uri) :
125 0; 125 0;
126 pixbuf = getThumbnailFromMetaData (info->meta); 126 pixbuf = getThumbnailFromMetaData (info->meta);
127 size_h = GNUNET_get_byte_size_as_fancy_string (size); 127 size_h = GNUNET_get_byte_size_as_fancy_string (size);
@@ -163,7 +163,7 @@ fs_search_result_received (SearchList * searchContext,
163{ 163{
164 GtkTreeStore *model; 164 GtkTreeStore *model;
165 GtkTreeIter iter; 165 GtkTreeIter iter;
166 enum URITRACK_STATE state; 166 enum GNUNET_URITRACK_STATE state;
167 167
168 state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri); 168 state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri);
169 if ((state & (GNUNET_URITRACK_INSERTED | 169 if ((state & (GNUNET_URITRACK_INSERTED |
@@ -196,13 +196,13 @@ on_search_copy_uri_activate (void *cls, GtkWidget * searchEntry)
196 list->last_y, 196 list->last_y,
197 &path, NULL, NULL, NULL)) 197 &path, NULL, NULL, NULL))
198 { 198 {
199 GNUNET_GEBREAK (NULL, 0); 199 GNUNET_GE_BREAK (NULL, 0);
200 return FALSE; 200 return FALSE;
201 } 201 }
202 if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (list->tree), 202 if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (list->tree),
203 &iter, path)) 203 &iter, path))
204 { 204 {
205 GNUNET_GEBREAK (NULL, 0); 205 GNUNET_GE_BREAK (NULL, 0);
206 gtk_tree_path_free (path); 206 gtk_tree_path_free (path);
207 return FALSE; 207 return FALSE;
208 } 208 }
@@ -228,7 +228,7 @@ selectFile ()
228 228
229 uploadXML 229 uploadXML
230 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 230 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
231 "directorySaveDialog", PACKAGNUNET_GENAME); 231 "directorySaveDialog", PACKAGNUNET_GE_NAME);
232 GNUNET_GTK_connect_glade_with_plugins (uploadXML); 232 GNUNET_GTK_connect_glade_with_plugins (uploadXML);
233 dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML, 233 dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
234 "directorySaveDialog")); 234 "directorySaveDialog"));
@@ -302,7 +302,7 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
302 fis_size, fis, meta)) 302 fis_size, fis, meta))
303 { 303 {
304 GNUNET_GTK_add_log_entry (_("Internal error.")); 304 GNUNET_GTK_add_log_entry (_("Internal error."));
305 GNUNET_GEBREAK (NULL, 0); 305 GNUNET_GE_BREAK (NULL, 0);
306 GNUNET_ECRS_meta_data_destroy (meta); 306 GNUNET_ECRS_meta_data_destroy (meta);
307 GNUNET_array_grow (fis, fis_size, 0); 307 GNUNET_array_grow (fis, fis_size, 0);
308 GNUNET_free (name); 308 GNUNET_free (name);
@@ -387,11 +387,11 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
387 description = GNUNET_ECRS_uri_to_string (uri); 387 description = GNUNET_ECRS_uri_to_string (uri);
388 if (description == NULL) 388 if (description == NULL)
389 { 389 {
390 GNUNET_GEBREAK (ectx, 0); 390 GNUNET_GE_BREAK (ectx, 0);
391 return NULL; 391 return NULL;
392 } 392 }
393 GNUNET_GEASSERT (ectx, 393 GNUNET_GE_ASSERT (ectx,
394 strlen (description) >= strlen (GNUNET_ECRS_URI_PREFIX)); 394 strlen (description) >= strlen (GNUNET_ECRS_URI_PREFIX));
395 dhead = &description[strlen (GNUNET_ECRS_URI_PREFIX)]; 395 dhead = &description[strlen (GNUNET_ECRS_URI_PREFIX)];
396 if (0 == 396 if (0 ==
397 strncmp (dhead, GNUNET_ECRS_SEARCH_INFIX, 397 strncmp (dhead, GNUNET_ECRS_SEARCH_INFIX,
@@ -411,7 +411,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
411 list->searchXML 411 list->searchXML
412 = 412 =
413 glade_xml_new (GNUNET_GTK_get_glade_filename (), "searchResultsFrame", 413 glade_xml_new (GNUNET_GTK_get_glade_filename (), "searchResultsFrame",
414 PACKAGNUNET_GENAME); 414 PACKAGNUNET_GE_NAME);
415 GNUNET_GTK_connect_glade_with_plugins (list->searchXML); 415 GNUNET_GTK_connect_glade_with_plugins (list->searchXML);
416 list->searchpage 416 list->searchpage
417 = extractMainWidgetFromWindow (list->searchXML, "searchResultsFrame"); 417 = extractMainWidgetFromWindow (list->searchXML, "searchResultsFrame");
@@ -545,7 +545,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
545 /* load label */ 545 /* load label */
546 list->labelXML 546 list->labelXML
547 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 547 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
548 "searchTabLabelWindow", PACKAGNUNET_GENAME); 548 "searchTabLabelWindow", PACKAGNUNET_GE_NAME);
549 GNUNET_GTK_connect_glade_with_plugins (list->labelXML); 549 GNUNET_GTK_connect_glade_with_plugins (list->labelXML);
550 list->tab_label 550 list->tab_label
551 = extractMainWidgetFromWindow (list->labelXML, "searchTabLabelWindow"); 551 = extractMainWidgetFromWindow (list->labelXML, "searchTabLabelWindow");
@@ -657,7 +657,7 @@ fs_search_stopped (SearchList * list)
657 for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--) 657 for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
658 if (list->searchpage == gtk_notebook_get_nth_page (notebook, i)) 658 if (list->searchpage == gtk_notebook_get_nth_page (notebook, i))
659 index = i; 659 index = i;
660 GNUNET_GEBREAK (ectx, index != -1); 660 GNUNET_GE_BREAK (ectx, index != -1);
661 gtk_notebook_remove_page (notebook, index); 661 gtk_notebook_remove_page (notebook, index);
662 /* recursively free search model */ 662 /* recursively free search model */
663 if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->tree), &iter)) 663 if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->tree), &iter))
@@ -736,9 +736,9 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
736 "fssearchKeywordComboBoxEntry"); 736 "fssearchKeywordComboBoxEntry");
737 if ((searchString == NULL) || (strlen (searchString) == 0)) 737 if ((searchString == NULL) || (strlen (searchString) == 0))
738 { 738 {
739 GNUNET_GELOG (ectx, 739 GNUNET_GE_LOG (ectx,
740 GNUNET_GEERROR | GNUNET_GEUSER | GNUNET_GEIMMEDIATE, 740 GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
741 _("Need a keyword to search!\n")); 741 _("Need a keyword to search!\n"));
742 return; 742 return;
743 } 743 }
744 /* add the keyword to the list of keywords that have 744 /* add the keyword to the list of keywords that have
@@ -781,7 +781,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
781 } 781 }
782 else 782 else
783 { 783 {
784 GNUNET_GEASSERT (ectx, strlen (ns) == sizeof (GNUNET_EncName) - 1); 784 GNUNET_GE_ASSERT (ectx, strlen (ns) == sizeof (GNUNET_EncName) - 1);
785 if ((descStr == NULL) && (ns != NULL)) 785 if ((descStr == NULL) && (ns != NULL))
786 descStr = GNUNET_strdup (ns); 786 descStr = GNUNET_strdup (ns);
787 } 787 }
@@ -801,10 +801,11 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
801 fsss.uri = GNUNET_ECRS_string_to_uri (ectx, ustring); 801 fsss.uri = GNUNET_ECRS_string_to_uri (ectx, ustring);
802 if (fsss.uri == NULL) 802 if (fsss.uri == NULL)
803 { 803 {
804 GNUNET_GELOG (ectx, 804 GNUNET_GE_LOG (ectx,
805 GNUNET_GEERROR | GNUNET_GEBULK | GNUNET_GEUSER, 805 GNUNET_GE_ERROR | GNUNET_GE_BULK |
806 _("Failed to create namespace URI from `%s'.\n"), 806 GNUNET_GE_USER,
807 ustring); 807 _("Failed to create namespace URI from `%s'.\n"),
808 ustring);
808 } 809 }
809 GNUNET_free (ustring); 810 GNUNET_free (ustring);
810 } 811 }
@@ -817,7 +818,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
817 fsss.uri = GNUNET_ECRS_keyword_string_to_uri (ectx, searchString); 818 fsss.uri = GNUNET_ECRS_keyword_string_to_uri (ectx, searchString);
818 if (fsss.uri == NULL) 819 if (fsss.uri == NULL)
819 { 820 {
820 GNUNET_GEBREAK (ectx, 0); 821 GNUNET_GE_BREAK (ectx, 0);
821 return; 822 return;
822 } 823 }
823 /* check if search is already running */ 824 /* check if search is already running */
@@ -840,7 +841,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
840 return; 841 return;
841 } 842 }
842 } 843 }
843 GNUNET_GEBREAK (ectx, 0); 844 GNUNET_GE_BREAK (ectx, 0);
844 } 845 }
845 list = list->next; 846 list = list->next;
846 } 847 }
@@ -893,7 +894,7 @@ on_closeSearchButton_clicked_fs (GtkWidget * searchPage,
893 break; 894 break;
894 list = list->next; 895 list = list->next;
895 } 896 }
896 GNUNET_GEASSERT (ectx, list != NULL); 897 GNUNET_GE_ASSERT (ectx, list != NULL);
897 if (list->fsui_list == NULL) 898 if (list->fsui_list == NULL)
898 { 899 {
899 /* open directory - close directly */ 900 /* open directory - close directly */
@@ -927,7 +928,7 @@ on_abortSearchButton_clicked_fs (GtkWidget * searchPage,
927 break; 928 break;
928 list = list->next; 929 list = list->next;
929 } 930 }
930 GNUNET_GEASSERT (ectx, list != NULL); 931 GNUNET_GE_ASSERT (ectx, list != NULL);
931 if (list->fsui_list != NULL) 932 if (list->fsui_list != NULL)
932 { 933 {
933 fcbc.method = &GNUNET_FSUI_search_abort; 934 fcbc.method = &GNUNET_FSUI_search_abort;
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 1f3b9743..ac76006b 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -121,7 +121,7 @@ fs_upload_stopped (UploadList * list)
121 if (prev != NULL) 121 if (prev != NULL)
122 prev->next = list->next; 122 prev->next = list->next;
123 else 123 else
124 GNUNET_GEBREAK (ectx, 0); 124 GNUNET_GE_BREAK (ectx, 0);
125 } 125 }
126 GNUNET_free (list); 126 GNUNET_free (list);
127} 127}
@@ -375,7 +375,7 @@ on_fsinsertuploadbutton_clicked_fs (gpointer dummy, GtkWidget * uploadButton)
375 "uploadFilenameComboBoxEntry"); 375 "uploadFilenameComboBoxEntry");
376 metaXML = 376 metaXML =
377 glade_xml_new (GNUNET_GTK_get_glade_filename (), "metaDataDialog", 377 glade_xml_new (GNUNET_GTK_get_glade_filename (), "metaDataDialog",
378 PACKAGNUNET_GENAME); 378 PACKAGNUNET_GE_NAME);
379 GNUNET_GTK_connect_glade_with_plugins (metaXML); 379 GNUNET_GTK_connect_glade_with_plugins (metaXML);
380 dialog = glade_xml_get_widget (metaXML, "metaDataDialog"); 380 dialog = glade_xml_get_widget (metaXML, "metaDataDialog");
381 meta = GNUNET_ECRS_meta_data_create (); 381 meta = GNUNET_ECRS_meta_data_create ();
@@ -455,7 +455,7 @@ selectFile (const char *oldfilename)
455 455
456 uploadXML 456 uploadXML
457 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 457 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
458 "uploadfilechooserdialog", PACKAGNUNET_GENAME); 458 "uploadfilechooserdialog", PACKAGNUNET_GE_NAME);
459 GNUNET_GTK_connect_glade_with_plugins (uploadXML); 459 GNUNET_GTK_connect_glade_with_plugins (uploadXML);
460 dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML, 460 dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
461 "uploadfilechooserdialog")); 461 "uploadfilechooserdialog"));
@@ -546,7 +546,7 @@ clearCompletedUploadCallback (GtkTreeModel * model,
546 UploadList *ul; 546 UploadList *ul;
547 struct FCBC fcbc; 547 struct FCBC fcbc;
548 548
549 GNUNET_GEASSERT (ectx, model == GTK_TREE_MODEL (upload_summary)); 549 GNUNET_GE_ASSERT (ectx, model == GTK_TREE_MODEL (upload_summary));
550 gtk_tree_model_get (model, iter, UPLOAD_INTERNAL, &ul, -1); 550 gtk_tree_model_get (model, iter, UPLOAD_INTERNAL, &ul, -1);
551 if ((ul->has_terminated) && (ul->is_top)) 551 if ((ul->has_terminated) && (ul->is_top))
552 { 552 {
@@ -613,7 +613,7 @@ fsuiCallUploadCallback (GtkTreeModel * model,
613 UploadList *ul; 613 UploadList *ul;
614 struct FCBC fcbc; 614 struct FCBC fcbc;
615 615
616 GNUNET_GEASSERT (ectx, model == GTK_TREE_MODEL (upload_summary)); 616 GNUNET_GE_ASSERT (ectx, model == GTK_TREE_MODEL (upload_summary));
617 gtk_tree_model_get (model, iter, UPLOAD_INTERNAL, &ul, -1); 617 gtk_tree_model_get (model, iter, UPLOAD_INTERNAL, &ul, -1);
618 fcbc.method = fsui_call; 618 fcbc.method = fsui_call;
619 fcbc.argument = ul->fsui_list; 619 fcbc.argument = ul->fsui_list;
diff --git a/src/plugins/peers/peers.c b/src/plugins/peers/peers.c
index e25072b0..fdab628d 100644
--- a/src/plugins/peers/peers.c
+++ b/src/plugins/peers/peers.c
@@ -36,7 +36,7 @@
36 36
37static struct GNUNET_CronManager *cron; 37static struct GNUNET_CronManager *cron;
38 38
39static struct GNUNET_GEContext *ectx; 39static struct GNUNET_GE_Context *ectx;
40 40
41static struct GNUNET_GC_Configuration *cfg; 41static struct GNUNET_GC_Configuration *cfg;
42 42
@@ -270,7 +270,7 @@ updatePeerInfo (void *dummy)
270 270
271 271
272void 272void
273init_peers (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c) 273init_peers (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
274{ 274{
275 GtkWidget *tab; 275 GtkWidget *tab;
276 GtkWidget *peers; 276 GtkWidget *peers;
diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index c586b0fa..0dd1b9ec 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -43,7 +43,7 @@ static long long banddown;
43 43
44static long long bandup; 44static long long bandup;
45 45
46static struct GNUNET_GEContext *ectx; 46static struct GNUNET_GE_Context *ectx;
47 47
48static struct GNUNET_GC_Configuration *cfg; 48static struct GNUNET_GC_Configuration *cfg;
49 49
@@ -75,9 +75,9 @@ getStatValue (long long *value,
75 } 75 }
76 } 76 }
77#if FUNCTIONS_DEBUG 77#if FUNCTIONS_DEBUG
78 GNUNET_GELOG (ectx, 78 GNUNET_GE_LOG (ectx,
79 GNUNET_GEDEBUG | GNUNET_GEDEVELOPER | GNUNET_GEREQUEST, 79 GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
80 "Statistic not found: `%s'\n", optName); 80 "Statistic not found: `%s'\n", optName);
81#endif 81#endif
82 return GNUNET_SYSERR; 82 return GNUNET_SYSERR;
83} 83}
@@ -559,7 +559,8 @@ StatEntry stats[] = {
559static unsigned long long UPDATE_INTERVAL; 559static unsigned long long UPDATE_INTERVAL;
560 560
561void 561void
562init_functions (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c) 562init_functions (struct GNUNET_GE_Context *e,
563 struct GNUNET_GC_Configuration *c)
563{ 564{
564 ectx = e; 565 ectx = e;
565 cfg = c; 566 cfg = c;
diff --git a/src/plugins/stats/functions.h b/src/plugins/stats/functions.h
index 1ec9b095..6c3b2c24 100644
--- a/src/plugins/stats/functions.h
+++ b/src/plugins/stats/functions.h
@@ -51,7 +51,7 @@ typedef struct SE_
51 51
52extern StatEntry stats[]; 52extern StatEntry stats[];
53 53
54void init_functions (struct GNUNET_GEContext *e, 54void init_functions (struct GNUNET_GE_Context *e,
55 struct GNUNET_GC_Configuration *c); 55 struct GNUNET_GC_Configuration *c);
56 56
57void done_functions (void); 57void done_functions (void);
diff --git a/src/plugins/stats/statistics.c b/src/plugins/stats/statistics.c
index 04b2fb66..e253fa40 100644
--- a/src/plugins/stats/statistics.c
+++ b/src/plugins/stats/statistics.c
@@ -367,7 +367,7 @@ load_graph_new (int statIdx, const ProcConfig * config)
367 367
368 if (stats[statIdx].count > MAX_COLOR) 368 if (stats[statIdx].count > MAX_COLOR)
369 { 369 {
370 GNUNET_GEBREAK (NULL, 0); 370 GNUNET_GE_BREAK (NULL, 0);
371 return NULL; 371 return NULL;
372 } 372 }
373 373
@@ -430,7 +430,7 @@ create_sys_view (int statIdx, const ProcConfig * config)
430 430
431 431
432void 432void
433init_stats (struct GNUNET_GEContext *ectx, 433init_stats (struct GNUNET_GE_Context *ectx,
434 struct GNUNET_GC_Configuration *cfg) 434 struct GNUNET_GC_Configuration *cfg)
435{ 435{
436 GtkWidget *sys_box; 436 GtkWidget *sys_box;
@@ -458,7 +458,7 @@ init_stats (struct GNUNET_GEContext *ectx,
458 gdk_color_parse ("blue", &config.mem_color[3]); 458 gdk_color_parse ("blue", &config.mem_color[3]);
459 gdk_color_parse ("gray", &config.mem_color[4]); 459 gdk_color_parse ("gray", &config.mem_color[4]);
460 gdk_color_parse ("magenta", &config.mem_color[5]); 460 gdk_color_parse ("magenta", &config.mem_color[5]);
461 GNUNET_GEASSERT (ectx, MAX_COLOR == 6); 461 GNUNET_GE_ASSERT (ectx, MAX_COLOR == 6);
462 i = -1; 462 i = -1;
463 while (stats[++i].paneName != NULL) 463 while (stats[++i].paneName != NULL)
464 { 464 {
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 01:28:37 +0000