Index: gtk/gtkmessagedialog.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkmessagedialog.c,v
retrieving revision 1.46
diff -p -u -u -p -r1.46 gtkmessagedialog.c
--- gtk/gtkmessagedialog.c	14 May 2006 04:25:29 -0000	1.46
+++ gtk/gtkmessagedialog.c	19 Jun 2006 19:06:16 -0000
@@ -73,7 +73,8 @@ enum {
   PROP_USE_MARKUP,
   PROP_SECONDARY_TEXT,
   PROP_SECONDARY_USE_MARKUP,
-  PROP_IMAGE
+  PROP_IMAGE,
+  PROP_WRAP_MODE
 };
 
 G_DEFINE_TYPE (GtkMessageDialog, gtk_message_dialog, GTK_TYPE_DIALOG)
@@ -216,6 +217,22 @@ gtk_message_dialog_class_init (GtkMessag
                                                         GTK_TYPE_WIDGET,
                                                         GTK_PARAM_READWRITE));
 
+  /**
+   * GtkMessageDialog:wrap-mode:
+   *
+   * This controls how the line wrapping is done. The default is
+   * %PANGO_WRAP_WORD which means wrap on word boundaries.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_WRAP_MODE,
+                                   g_param_spec_enum ("wrap-mode",
+                                                      P_("Line wrap mode"),
+                                                      P_("Controls how linewrapping is done"),
+                                                      PANGO_TYPE_WRAP_MODE,
+                                                      PANGO_WRAP_WORD,
+                                                      GTK_PARAM_READWRITE));
   g_type_class_add_private (gobject_class,
 			    sizeof (GtkMessageDialogPrivate));
 }
@@ -405,6 +422,9 @@ gtk_message_dialog_set_property (GObject
     case PROP_IMAGE:
       gtk_message_dialog_set_image (dialog, (GtkWidget *)g_value_get_object (value));
       break;
+    case PROP_WRAP_MODE:
+      gtk_message_dialog_set_line_wrap_mode (dialog, g_value_get_enum (value));
+      break;
 
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -452,6 +472,10 @@ gtk_message_dialog_get_property (GObject
     case PROP_IMAGE:
       g_value_set_object (value, dialog->image);
       break;
+    case PROP_WRAP_MODE:
+      g_value_set_enum (value, gtk_label_get_line_wrap_mode (GTK_LABEL (priv->secondary_label)));
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -764,6 +788,31 @@ gtk_message_dialog_format_secondary_mark
     }
 
   setup_primary_label_font (message_dialog);
+}
+
+/**
+ * gtk_message_dialog_set_line_wrap_mode:
+ * @dialog: a #GtkMessageDialog
+ * @wrap: the line wrapping mode
+ *
+ * This controls how the line wrapping of @dialog's labels is done.
+ * The default is %PANGO_WRAP_WORD which means to wrap on word boundaries.
+ *
+ * Since: 2.10
+ **/
+void
+gtk_message_dialog_set_line_wrap_mode (GtkMessageDialog *dialog,
+				       PangoWrapMode     mode)
+{
+  GtkMessageDialogPrivate *priv;
+
+  g_return_if_fail (GTK_IS_MESSAGE_DIALOG (dialog));
+
+  priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (dialog);
+  gtk_label_set_line_wrap_mode (GTK_LABEL (dialog->label), mode);
+  gtk_label_set_line_wrap_mode (GTK_LABEL (priv->secondary_label), mode);
+
+  g_object_notify (G_OBJECT (dialog), "wrap-mode");
 }
 
 static void
Index: gtk/gtkmessagedialog.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkmessagedialog.h,v
retrieving revision 1.10
diff -p -u -u -p -r1.10 gtkmessagedialog.h
--- gtk/gtkmessagedialog.h	9 May 2006 04:36:42 -0000	1.10
+++ gtk/gtkmessagedialog.h	19 Jun 2006 19:06:16 -0000
@@ -112,6 +112,9 @@ void       gtk_message_dialog_format_sec
                                                        const gchar      *message_format,
                                                        ...) G_GNUC_PRINTF (2, 3);
 
+void       gtk_message_dialog_set_line_wrap_mode (GtkMessageDialog *dialog,
+						  PangoWrapMode     mode);
+
 G_END_DECLS
 
 #endif /* __GTK_MESSAGE_DIALOG_H__ */
