die gui message, die

5 files changed, 32 insertions, 88 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index bf2ae4a8..59c10bf8 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -1,5 +1,6 @@
 /*
      This file is part of GNUnet
+     (C) 2003, 2004, 2005 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -144,78 +145,6 @@ deleteEvent(GtkWidget * widget,
   return FALSE;
 }
 
-/**
- * A callback to destroy any widget given as second argument
- */
-static void 
-destroyWidget(GtkWidget * dummy, 
-              GtkWidget * widget) {
-  gtk_widget_destroy(widget);
-}
-
-/**
- * Callback function for guiMessage()
- *
- * FIXME: use GLADE (or direct GTK functionality) here!
- */
-static void doGuiMessage(void * args) {
-  const gchar * msg = args;
-  GtkWidget * window;
-  GtkWidget * label;
-  GtkWidget * box;
-  GtkWidget * button;
-
-  window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-  gtk_container_set_border_width(GTK_CONTAINER(window), 10);
-  gtk_window_set_title(GTK_WINDOW(window), 
-                       _("Notification"));
-  gtk_signal_connect(GTK_OBJECT(window), 
-                     "delete_event",
-                     GTK_SIGNAL_FUNC(deleteEvent), 
-                     NULL);
-
-  box = gtk_vbox_new(FALSE, 0);
-  gtk_container_add(GTK_CONTAINER(window), 
-                    box);
-
-  label = gtk_label_new(msg);
-  gtk_box_pack_start(GTK_BOX(box),
-                     label,
-                     FALSE,
-                     FALSE,
-                     0);
-  
-  button = gtk_button_new_with_label(_("Ok"));
-  gtk_signal_connect(GTK_OBJECT (button),
-                     "clicked",
-                     GTK_SIGNAL_FUNC(destroyWidget),
-                     window);
-  gtk_box_pack_start(GTK_BOX(box),
-                     button,
-                     FALSE,
-                     FALSE,
-                     0);  
-  gtk_window_set_position(GTK_WINDOW(window),
-                          GTK_WIN_POS_MOUSE);
-  gtk_widget_show_all(window);
-  gtk_widget_grab_focus(button);
-}
-
-/** 
- * Displays an informative message to the user in a fresh window 
- */
-void guiMessage(const char * format,
-                ...) {
-  va_list args;
-  gchar *note;
-
-  va_start(args, format);
-  note = g_strdup_vprintf(format, args);
-  va_end(args);  
-  gtkSaveCall(&doGuiMessage, note);
-  free(note);
-}
-
 static void hideWindow(GtkWidget * widget,
                        gpointer data) {
   if (widget != NULL)
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index 7dd342fa..ee3e53c4 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -42,19 +42,13 @@ const char * getGladeFileName(void);
 GladeXML * getMainXML(void);
 
 /**
- * Displays an informative message to the user
- * in a new popup window.
- */
-void guiMessage(const char * format,
-                ...);
-
-/**
  * Appends a message to the info window 
  * @param doPopup if YES, the info window will
  *   be opened
  */
 void infoMessage(int doPopup, 
-                 const char * format, ...);
+                 const char * format, 
+                 ...);
 
 /** 
  * Appends a log entry to the info window
diff --git a/src/plugins/about/about.c b/src/plugins/about/about.c
index 0b05f3e2..74163aad 100644
--- a/src/plugins/about/about.c
+++ b/src/plugins/about/about.c
@@ -1,5 +1,6 @@
 /*
      This file is part of GNUnet
+     (C) 2005 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index e6b1d833..b366fdb5 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -122,7 +122,16 @@ void on_stopDaemon_clicked(GtkWidget * widget,
   
   if (OK == checkGNUnetDaemonRunning() ) {
     if (OK != stopGNUnetDaemon()) {
-      guiMessage(_("Error requesting shutdown by gnunetd."));
+      GtkWidget * dialog;
+
+      dialog = gtk_message_dialog_new 
+        (NULL,
+         GTK_DIALOG_MODAL,
+         GTK_MESSAGE_ERROR,
+         GTK_BUTTONS_CLOSE,
+         _("Error requesting shutdown of gnunetd."));
+      gtk_dialog_run(GTK_DIALOG(dialog));
+      gtk_widget_destroy(dialog);  
     } else {
       addLogEntry(_("Terminating gnunetd..."));
     }
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 9947a2ef..b6679b05 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -168,12 +168,22 @@ static void initiateDownload(GtkTreeModel *model,
     pfx[strlen(pfx)-1] = '\0';
   if (0 == STAT(pfx,
                 &sbuf)) {
-    guiMessage(_("File '%s' exists in '%s',\n"
-                 "will store download under its GNUnet URI '%s' instead.\n"),
-               name,
-               fn,
-               &filename[strlen(ECRS_URI_PREFIX) +
-                         strlen(ECRS_FILE_INFIX)]);              
+    GtkWidget * dialog;
+    
+    dialog = gtk_message_dialog_new 
+      (NULL,
+       GTK_DIALOG_MODAL,
+       GTK_MESSAGE_WARNING,
+       GTK_BUTTONS_CLOSE,
+       _("File '%s' exists in '%s',\n"
+         "will store download under its"
+         " GNUnet URI '%s' instead.\n"),
+       name,
+       fn,
+       &filename[strlen(ECRS_URI_PREFIX) +
+                 strlen(ECRS_FILE_INFIX)]);
+    gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy(dialog);  
     strcpy(pfx, fn);
     strcat(pfx, 
            DIR_SEPARATOR_STR);
@@ -198,7 +208,8 @@ static void initiateDownload(GtkTreeModel *model,
                      DOWNLOAD_PROGRESS, 0, /* progress */
                      DOWNLOAD_URISTRING, filename,
                      DOWNLOAD_URI, ECRS_dupUri(uri),
-                     DOWNLOAD_TREEPATH, list->rr, /* internal: row reference! */
+                     DOWNLOAD_TREEPATH, list->rr, 
+                     /* internal: row reference! */
                      -1);
   FREE(filename);
   FREE(name);