msg is not const

[claws.git] / src / gtk / gtkutils.c

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 4eabff0556363e3c9b2de949445ff965c730114e..b30a46b288a271faeb5630e0c9e61729a644d648 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -451,7 +451,7 @@ static gboolean gtkut_text_buffer_find(GtkTextBuffer *buffer, const GtkTextIter
 
        wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
        if (error != NULL) {
-               g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s\n",
+               g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s",
                          error->message);
                g_error_free(error);
        }
@@ -487,7 +487,7 @@ static gboolean gtkut_text_buffer_find_backward(GtkTextBuffer *buffer,
 
        wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
        if (error != NULL) {
-               g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s\n",
+               g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s",
                          error->message);
                g_error_free(error);
        }
@@ -1087,7 +1087,7 @@ GtkWidget *xface_get_from_header(const gchar *o_xface)
        xface[sizeof(xface) - 1] = '\0';
 
        if (uncompface(xface) < 0) {
-               g_warning("uncompface failed\n");
+               g_warning("uncompface failed");
                return NULL;
        }
 
@@ -1131,7 +1131,7 @@ GtkWidget *face_get_from_header(const gchar *o_face)
 
        if (!gdk_pixbuf_loader_write (loader, face_png, pngsize, &error) ||
            !gdk_pixbuf_loader_close (loader, &error)) {
-               g_warning("loading face failed\n");
+               g_warning("loading face failed");
                g_object_unref(loader);
                g_free(face_png);
                return NULL;
@@ -1144,7 +1144,7 @@ GtkWidget *face_get_from_header(const gchar *o_face)
 
        if ((gdk_pixbuf_get_width(pixbuf) != 48) || (gdk_pixbuf_get_height(pixbuf) != 48)) {
                g_object_unref(pixbuf);
-               g_warning("wrong_size\n");
+               g_warning("wrong_size");
                return NULL;
        }
 
@@ -1250,7 +1250,7 @@ GtkWidget *gtkut_get_link_btn(GtkWidget *window, const gchar *url, const gchar *
                gtk_widget_set_style(btn_label, style);
 #if !GTK_CHECK_VERSION(3, 0, 0)
        } else
-               g_warning("color allocation failed\n");
+               g_warning("color allocation failed");
 #endif
 
        g_signal_connect(G_OBJECT(btn), "enter",
@@ -1915,7 +1915,19 @@ static void auto_configure_done(const gchar *hostname, gint port, gboolean ssl,
 
                gtk_label_set_text(data->info_label, _("Done."));
        } else {
-       gtk_label_set_text(data->info_label, _("Failed."));
+               gchar *msg;
+               switch (data->resolver_error) {
+               case G_RESOLVER_ERROR_NOT_FOUND:
+                       msg = g_strdup(_("Failed: no service record found."));
+                       break;
+               case G_RESOLVER_ERROR_TEMPORARY_FAILURE:
+                       msg = g_strdup(_("Failed: network error."));
+                       break;
+               default:
+                       msg = g_strdup_printf(_("Failed: unknown error (%d)."), data->resolver_error);
+               }
+               gtk_label_set_text(data->info_label, msg);
+               g_free(msg);
        }
        gtk_widget_show(GTK_WIDGET(data->configure_button));
        gtk_widget_hide(GTK_WIDGET(data->cancel_button));
@@ -1951,6 +1963,8 @@ static void resolve_done(GObject *source, GAsyncResult *result, gpointer user_da
        } else if (error) {
                if (error->code == G_IO_ERROR_CANCELLED)
                        abort = TRUE;
+               else
+                       data->resolver_error = error->code;
                debug_print("error %s\n", error->message);
                g_error_free(error);
        }