libgimp/gimp.c quell warning to g_set_message_handler

* libgimp/gimp.c
* app/main.c: quell warning to g_set_message_handler

* app/about_dialog.c: fix off-by-one error for space for the about text

-Yosh

ChangeLog

+Sat Aug 29 15:32:32 PDT 1998 Manish Singh <yosh@gimp.org>
+
+	* libgimp/gimp.c
+	* app/main.c: quell warning to g_set_message_handler
+
+	* app/about_dialog.c: fix off-by-one error for space for the about
+	text
+
 Fri Aug 28 15:56:41 PDT 1998 Manish Singh <yosh@gimp.org>
 
 	* acconfig.h

app/about_dialog.c

@@ -193,9 +193,8 @@ about_dialog_create (int timeout)
       style->font = gdk_font_load (_("-Adobe-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*"));
       gtk_widget_push_style (style);
 
-      label_text=g_malloc(strlen(_("Version ")) + strlen(GIMP_VERSION) + 
-			  strlen(_(" brought to you by")) * sizeof(gchar));
-      sprintf(label_text, "%s%s%s", _("Version "), GIMP_VERSION, _(" brought to you by"));
+      label_text = g_strdup_printf("%s%s%s", _("Version "), GIMP_VERSION,
+					     _(" brought to you by"));
       label = gtk_label_new (label_text);
       g_free(label_text); label_text=NULL;
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);

app/dialogs/about-dialog.c

@@ -193,9 +193,8 @@ about_dialog_create (int timeout)
       style->font = gdk_font_load (_("-Adobe-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*"));
       gtk_widget_push_style (style);
 
-      label_text=g_malloc(strlen(_("Version ")) + strlen(GIMP_VERSION) + 
-			  strlen(_(" brought to you by")) * sizeof(gchar));
-      sprintf(label_text, "%s%s%s", _("Version "), GIMP_VERSION, _(" brought to you by"));
+      label_text = g_strdup_printf("%s%s%s", _("Version "), GIMP_VERSION,
+					     _(" brought to you by"));
       label = gtk_label_new (label_text);
       g_free(label_text); label_text=NULL;
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);

app/gui/about-dialog.c

@@ -193,9 +193,8 @@ about_dialog_create (int timeout)
       style->font = gdk_font_load (_("-Adobe-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*"));
       gtk_widget_push_style (style);
 
-      label_text=g_malloc(strlen(_("Version ")) + strlen(GIMP_VERSION) + 
-			  strlen(_(" brought to you by")) * sizeof(gchar));
-      sprintf(label_text, "%s%s%s", _("Version "), GIMP_VERSION, _(" brought to you by"));
+      label_text = g_strdup_printf("%s%s%s", _("Version "), GIMP_VERSION,
+					     _(" brought to you by"));
       label = gtk_label_new (label_text);
       g_free(label_text); label_text=NULL;
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);

app/main.c

@@ -269,7 +269,7 @@ main (int argc, char **argv)
   if (show_version || show_help)
     exit (0);
 
-  g_set_message_handler (&message_func);
+  g_set_message_handler ((GPrintFunc) message_func);
 
   /* Handle some signals */
   signal (SIGHUP, on_signal);

libgimp/gimp.c

@@ -121,7 +121,7 @@ gimp_main (int   argc,
       return 0;
     }
 
-  g_set_message_handler (&gimp_message_func);
+  g_set_message_handler ((GPrintFunc) gimp_message_func);
 
   temp_proc_ht = g_hash_table_new (&g_str_hash, &g_str_equal);