2nd round of renaming

1 files changed, 37 insertions, 37 deletions

diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index d96a4409..537f19c5 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -33,9 +33,9 @@
 
 static struct GNUNET_CronManager *cron;
 
-static struct GE_Context *ectx;
+static struct GNUNET_GEContext *ectx;
 
-static struct GC_Configuration *cfg;
+static struct GNUNET_GC_Configuration *cfg;
 
 /**
  * cron job that periodically updates the model for the
@@ -91,7 +91,7 @@ updateAppModelSafe (void *unused)
       while (next != NULL);
       GNUNET_free (apps);
     }
-  w = glade_xml_get_widget (getMainXML (), "applicationList");
+  w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "applicationList");
   gtk_tree_view_set_model (GTK_TREE_VIEW (w), GTK_TREE_MODEL (model));
   gtk_tree_selection_set_mode (gtk_tree_view_get_selection
                                (GTK_TREE_VIEW (w)), GTK_SELECTION_NONE);
@@ -103,7 +103,7 @@ updateAppModelSafe (void *unused)
 static void
 updateAppModel (void *dummy)
 {
-  gtkSaveCall (&updateAppModelSafe, NULL);
+  GNUNET_GTK_save_call (&updateAppModelSafe, NULL);
 }
 
 
@@ -121,7 +121,7 @@ doUpdateMenus (void *arg)
   static int isLocal;
   char *host;
   int canStart;
-  struct GC_Configuration *dcfg;
+  struct GNUNET_GC_Configuration *dcfg;
   char *fn;
   char *user;
   struct passwd *pws;
@@ -129,16 +129,16 @@ doUpdateMenus (void *arg)
   if (once)
     {
       once = 0;
-      killEntry = glade_xml_get_widget (getMainXML (), "stopDaemon");
-      launchEntry = glade_xml_get_widget (getMainXML (), "startDaemon");
-      statsEntryYes = glade_xml_get_widget (getMainXML (), "statusPixmapYes");
-      statsEntryNo = glade_xml_get_widget (getMainXML (), "statusPixmapNo");
+      killEntry = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopDaemon");
+      launchEntry = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "startDaemon");
+      statsEntryYes = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statusPixmapYes");
+      statsEntryNo = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statusPixmapNo");
       statsEntryError
-        = glade_xml_get_widget (getMainXML (), "statusPixmapError");
+        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statusPixmapError");
       chooser
-        = glade_xml_get_widget (getMainXML (),
+        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                                 "gnunetdconfigFileChooserButton");
-      GC_get_configuration_value_string (cfg,
+      GNUNET_GC_get_configuration_value_string (cfg,
                                          "NETWORK",
                                          "HOST", "localhost", &host);
       if (strcmp (host, "localhost") == 0)
@@ -157,12 +157,12 @@ doUpdateMenus (void *arg)
         {
           if (GNUNET_disk_file_test (ectx, fn) == GNUNET_YES)
             {
-              dcfg = GC_create ();
+              dcfg = GNUNET_GC_create ();
               canStart = 1;
-              if (0 != GC_parse_configuration (dcfg, fn))
+              if (0 != GNUNET_GC_parse_configuration (dcfg, fn))
                 canStart = 0;
               user = NULL;
-              GC_get_configuration_value_string (dcfg,
+              GNUNET_GC_get_configuration_value_string (dcfg,
                                                  "GNUNETD",
                                                  "USER", "", &user);
               if (strlen (user) > 0)
@@ -184,7 +184,7 @@ doUpdateMenus (void *arg)
 #endif
                 }
               GNUNET_free (user);
-              GC_free (dcfg);
+              GNUNET_GC_free (dcfg);
             }
           g_free (fn);
         }
@@ -223,7 +223,7 @@ cronCheckDaemon (void *dummy)
     ret = 1;
   else
     ret = 0;
-  gtkSaveCall (&doUpdateMenus, &ret);
+  GNUNET_GTK_save_call (&doUpdateMenus, &ret);
 }
 
 
@@ -237,7 +237,7 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
   GtkWidget *chooser;
   char *fn;
 
-  launchEntry = glade_xml_get_widget (getMainXML (), "startDaemon");
+  launchEntry = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "startDaemon");
   gtk_widget_set_sensitive (launchEntry, FALSE);
   if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
     {
@@ -246,19 +246,19 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
     }
   else
     {
-      addLogEntry (_("Launching gnunetd..."));
+      GNUNET_GTK_add_log_entry (_("Launching gnunetd..."));
       chooser
-        = glade_xml_get_widget (getMainXML (),
+        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                                 "gnunetdconfigFileChooserButton");
       fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
-      GE_BREAK (ectx, fn != NULL);
+      GNUNET_GEBREAK (ectx, fn != NULL);
       if (GNUNET_SYSERR != GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES))
         {
-          addLogEntry (_("Launched gnunetd"));
+          GNUNET_GTK_add_log_entry (_("Launched gnunetd"));
         }
       else
         {
-          addLogEntry (_("Launching gnunetd failed"));
+          GNUNET_GTK_add_log_entry (_("Launching gnunetd failed"));
         }
       if (fn != NULL)
         g_free (fn);
@@ -274,7 +274,7 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
   GtkWidget *killEntry = NULL;
   struct GNUNET_ClientServerConnection *sock;
 
-  killEntry = glade_xml_get_widget (getMainXML (), "stopDaemon");
+  killEntry = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopDaemon");
   gtk_widget_set_sensitive (killEntry, FALSE);
 
   if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
@@ -287,14 +287,14 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
           dialog = gtk_message_dialog_new
             (NULL,
              GTK_DIALOG_MODAL,
-             GTK_MESSAGE_ERROR,
+             GTK_MESSAGNUNET_GEERROR,
              GTK_BUTTONS_CLOSE, _("Error requesting shutdown of gnunetd."));
           gtk_dialog_run (GTK_DIALOG (dialog));
           gtk_widget_destroy (dialog);
         }
       else
         {
-          addLogEntry (_("Terminating gnunetd..."));
+          GNUNET_GTK_add_log_entry (_("Terminating gnunetd..."));
         }
       GNUNET_client_connection_destroy (sock);
     }
@@ -302,7 +302,7 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
 }
 
 void
-init_daemon (struct GE_Context *e, struct GC_Configuration *c)
+init_daemon (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
 {
   GtkWidget *tab;
   GtkWidget *apps;
@@ -313,7 +313,7 @@ init_daemon (struct GE_Context *e, struct GC_Configuration *c)
 
   ectx = e;
   cfg = c;
-  apps = glade_xml_get_widget (getMainXML (), "applicationList");
+  apps = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "applicationList");
   model = gtk_list_store_new (1, G_TYPE_STRING);
   gtk_tree_view_set_model (GTK_TREE_VIEW (apps), GTK_TREE_MODEL (model));
   renderer = gtk_cell_renderer_text_new ();
@@ -333,31 +333,31 @@ init_daemon (struct GE_Context *e, struct GC_Configuration *c)
   gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
                                       (GTK_TREE_VIEW (apps), col - 1), TRUE);
 
-  tab = glade_xml_get_widget (getMainXML (), "daemonScrolledWindow");
+  tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "daemonScrolledWindow");
   gtk_widget_show (tab);
   daemon_config = NULL;
-  GC_get_configuration_value_filename (cfg,
+  GNUNET_GC_get_configuration_value_filename (cfg,
                                        "DAEMON",
                                        "CONFIGFILE",
-                                       DEFAULT_DAEMON_CONFIG_FILE,
+                                       GNUNET_DEFAULT_DAEMON_CONFIG_FILE,
                                        &daemon_config);
   if (GNUNET_YES == GNUNET_disk_file_test (NULL, daemon_config))
     {
       gtk_file_chooser_set_filename (GTK_FILE_CHOOSER
                                      (glade_xml_get_widget
-                                      (getMainXML (),
+                                      (GNUNET_GTK_get_main_glade_XML (),
                                        "gnunetdconfigFileChooserButton")),
                                      daemon_config);
     }
   else
     {
-      addLogEntry (_
+      GNUNET_GTK_add_log_entry (_
                    ("Configuration file for GNUnet daemon `%s' does not exist! Run `gnunet-setup -d'."),
                    daemon_config);
     }
   GNUNET_free (daemon_config);
 
-  cron = gnunet_gtk_get_cron ();
+  cron = GNUNET_GTK_get_cron_manager ();
   GNUNET_cron_add_job (cron, &cronCheckDaemon, 0, 15 * GNUNET_CRON_SECONDS, NULL);
   GNUNET_cron_add_job (cron,
                 &updateAppModel, 5 * GNUNET_CRON_MINUTES, 5 * GNUNET_CRON_MINUTES, NULL);
@@ -370,7 +370,7 @@ done_daemon ()
 
   GNUNET_cron_del_job (cron, &cronCheckDaemon, 15 * GNUNET_CRON_SECONDS, NULL);
   GNUNET_cron_del_job (cron, &updateAppModel, 5 * GNUNET_CRON_MINUTES, NULL);
-  w = glade_xml_get_widget (getMainXML (), "applicationList");
+  w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "applicationList");
   gtk_tree_view_set_model (GTK_TREE_VIEW (w), NULL);
 
 }
@@ -381,7 +381,7 @@ done_daemon ()
 void
 on_startDaemonConfWizard_clicked_daemon (GtkWidget * widget, gpointer data)
 {
-  startGNUnetSetup (TRUE);
+  GNUNET_GTK_run_gnunet_setup (TRUE);
 }
 
 /**
@@ -390,7 +390,7 @@ on_startDaemonConfWizard_clicked_daemon (GtkWidget * widget, gpointer data)
 void
 on_startDaemonConfTool_clicked_daemon (GtkWidget * widget, gpointer data)
 {
-  startGNUnetSetup (FALSE);
+  GNUNET_GTK_run_gnunet_setup (FALSE);
 }
 
 /* end of daemon.c */