From b9e87239a8c5dfced706d7ac128c14716ae107a8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 27 Aug 2005 04:29:46 +0000 Subject: [PATCH] Fix the default value of the ui property. 2005-08-27 Matthias Clasen * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Fix the default value of the ui property. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtkuimanager.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fc90fd3bf7..d80c77d018 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-08-27 Matthias Clasen + * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Fix the default + value of the ui property. + * gdk/x11/gdkproperty-x11.c (gdk_property_get): Don't warn when G_MAXLONG is passed as length. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fc90fd3bf7..d80c77d018 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-08-27 Matthias Clasen + * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Fix the default + value of the ui property. + * gdk/x11/gdkproperty-x11.c (gdk_property_get): Don't warn when G_MAXLONG is passed as length. diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 7823c93d79..8cf0c1a7c8 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -239,7 +239,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass) g_param_spec_string ("ui", P_("Merged UI definition"), P_("An XML string describing the merged UI"), - NULL, + "\n", GTK_PARAM_READABLE));