From a2f11a70fe9bd3ef519b15c4bf4e908dbae55886 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Tue, 31 Jan 2012 14:26:15 +0000 Subject: [PATCH] 2012-01-31 [wwp] 3.8.0cvs19 * src/gtk/gtkutils.c Fix warnings in gtkutils: wrong function name, missing newline, typo and long line wrapping. --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/gtkutils.c | 9 +++++---- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4441cd8b4..662873828 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-01-31 [wwp] 3.8.0cvs19 + + * src/gtk/gtkutils.c + Fix warnings in gtkutils: wrong function name, missing newline, typo and + long line wrapping. + 2012-01-31 [wwp] 3.8.0cvs18 * src/gtk/progressdialog.c diff --git a/PATCHSETS b/PATCHSETS index 503bbfcdd..a80b71ca1 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4335,3 +4335,4 @@ ( cvs diff -u -r 1.22.2.26 -r 1.22.2.27 src/addrbook.c; cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/exportldif.c; ) > 3.8.0cvs16.patchset ( cvs diff -u -r 1.27.2.59 -r 1.27.2.60 src/addr_compl.c; ) > 3.8.0cvs17.patchset ( cvs diff -u -r 1.1.4.28 -r 1.1.4.29 src/gtk/progressdialog.c; cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/gtk/progressdialog.h; cvs diff -u -r 1.149.2.104 -r 1.149.2.105 src/inc.c; cvs diff -u -r 1.17.2.61 -r 1.17.2.62 src/send_message.c; ) > 3.8.0cvs18.patchset +( cvs diff -u -r 1.5.2.101 -r 1.5.2.102 src/gtk/gtkutils.c; ) > 3.8.0cvs19.patchset diff --git a/configure.ac b/configure.ac index f038ab25a..ea6cc0cef 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=8 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=18 +EXTRA_VERSION=19 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c index a71fe95ee..764d08553 100644 --- 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 occured 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\n", error->message); g_error_free(error); } @@ -487,7 +487,8 @@ 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 occured while converting a string from UTF-8 to UCS-4: %s\n", error->message); + g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s\n", + error->message); g_error_free(error); } if (!wcs || items_written <= 0) return FALSE; @@ -1147,7 +1148,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"); + g_warning("wrong_size\n"); return NULL; } @@ -1253,7 +1254,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("about_create(): color allocation failed.\n"); + g_warning("color allocation failed\n"); #endif g_signal_connect(G_OBJECT(btn), "enter", -- 2.25.1