diff options
Diffstat (limited to 'src/core/main.c')
-rw-r--r-- | src/core/main.c | 20 |
1 files changed, 10 insertions, 10 deletions
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) | |||
64 | void | 64 | void |
65 | GNUNET_GTK_main_quit () | 65 | GNUNET_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; |