From cf598407e162ab2b3d0a79135075534b730e0392 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Thu, 28 Feb 2008 20:23:02 +0000
Subject: [PATCH] (gtk) make verrmsg_full() private

---
 gtk/tr-core.c |   2 +-
 gtk/util.c    | 102 ++++++++++++++++++++++++--------------------------
 gtk/util.h    |   5 ---
 3 files changed, 49 insertions(+), 60 deletions(-)

diff --git a/gtk/tr-core.c b/gtk/tr-core.c
index 16877deaf..3a920b265 100644
--- a/gtk/tr-core.c
+++ b/gtk/tr-core.c
@@ -28,7 +28,7 @@
 #include <glib/gi18n.h>
 
 #include <libtransmission/transmission.h>
-#include <libtransmission/utils.h> /* tr_strcmp */
+#include <libtransmission/utils.h> /* tr_free */
 
 #include "conf.h"
 #include "tr-core.h"
diff --git a/gtk/util.c b/gtk/util.c
index 24f8e085d..62276d1c2 100644
--- a/gtk/util.c
+++ b/gtk/util.c
@@ -22,27 +22,21 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <signal.h>
 #include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <stdlib.h> /* free() */
+#include <string.h> /* strcmp() */
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include <libevent/evhttp.h>
 
+#include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
+
 #include "conf.h"
 #include "tr-prefs.h"
-#include "tr-torrent.h"
 #include "util.h"
 
-static void
-errcb(GtkWidget *wind, int resp, gpointer data);
-
 int
 tr_strcmp( const char * a, const char * b )
 {
@@ -266,6 +260,50 @@ sizingmagic( GtkWindow         * wind,
     gtk_scrolled_window_set_policy( scroll, hscroll, vscroll );
 }
 
+static void
+errcb(GtkWidget *widget, int resp UNUSED, gpointer data) {
+  GList *funcdata;
+  callbackfunc_t func;
+
+  if(NULL != data) {
+    funcdata = g_list_first(data);
+    func = (callbackfunc_t) funcdata->data;
+    data = funcdata->next->data;
+    func(data);
+    g_list_free(funcdata);
+  }
+
+  gtk_widget_destroy(widget);
+}
+
+static GtkWidget *
+verrmsg_full( GtkWindow * wind, callbackfunc_t func, void * data,
+              const char * format, va_list ap )
+{
+  GtkWidget *dialog;
+  char *msg;
+  GList *funcdata;
+
+  msg = g_strdup_vprintf(format, ap);
+
+  if(NULL == wind)
+    dialog = gtk_message_dialog_new(
+      NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", msg);
+  else
+    dialog = gtk_message_dialog_new(wind,
+      GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+      GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", msg);
+
+  if(NULL == func)
+    funcdata = NULL;
+  else
+      funcdata = g_list_append(g_list_append(NULL, (void *) func), data);
+  g_signal_connect(dialog, "response", G_CALLBACK(errcb), funcdata);
+  g_free(msg);
+
+  return dialog;
+}
+
 void
 errmsg( GtkWindow * wind, const char * format, ... )
 {
@@ -301,50 +339,6 @@ errmsg_full( GtkWindow * wind, callbackfunc_t func, void * data,
     return dialog;
 }
 
-GtkWidget *
-verrmsg_full( GtkWindow * wind, callbackfunc_t func, void * data,
-              const char * format, va_list ap )
-{
-  GtkWidget *dialog;
-  char *msg;
-  GList *funcdata;
-
-  msg = g_strdup_vprintf(format, ap);
-
-  if(NULL == wind)
-    dialog = gtk_message_dialog_new(
-      NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", msg);
-  else
-    dialog = gtk_message_dialog_new(wind,
-      GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-      GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", msg);
-
-  if(NULL == func)
-    funcdata = NULL;
-  else
-      funcdata = g_list_append(g_list_append(NULL, (void *) func), data);
-  g_signal_connect(dialog, "response", G_CALLBACK(errcb), funcdata);
-  g_free(msg);
-
-  return dialog;
-}
-
-static void
-errcb(GtkWidget *widget, int resp UNUSED, gpointer data) {
-  GList *funcdata;
-  callbackfunc_t func;
-
-  if(NULL != data) {
-    funcdata = g_list_first(data);
-    func = (callbackfunc_t) funcdata->data;
-    data = funcdata->next->data;
-    func(data);
-    g_list_free(funcdata);
-  }
-
-  gtk_widget_destroy(widget);
-}
-
 typedef void (PopupFunc)(GtkWidget*, GdkEventButton*); 
 
 /* pop up the context menu if a user right-clicks.
diff --git a/gtk/util.h b/gtk/util.h
index 30a092361..661d545ee 100644
--- a/gtk/util.h
+++ b/gtk/util.h
@@ -101,11 +101,6 @@ GtkWidget *
 errmsg_full( GtkWindow * wind, callbackfunc_t func, void * data,
              const char * format, ... ) G_GNUC_PRINTF(4,5);
 
-/* varargs version of errmsg_full() */
-GtkWidget *
-verrmsg_full( GtkWindow * wind, callbackfunc_t func, void * data,
-              const char * format, va_list ap );
-
 /* pop up the context menu if a user right-clicks.
    if the row they right-click on isn't selected, select it. */
 gboolean