Fix the default value of the ui property. (#314532, Yong Wang)

Fix the default
	value of the ui property. (#314532, Yong Wang)

diff --git a/ChangeLog b/ChangeLog
index ee6a14a7b20b5a843a7c84185937292bd0386231..c9b4e11131612e3877c87123fa7f0e5f42a43cc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Fix the default
+       value of the ui property. (#314532, Yong Wang)
+
        * 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 ee6a14a7b20b5a843a7c84185937292bd0386231..c9b4e11131612e3877c87123fa7f0e5f42a43cc6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-08-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Fix the default
+       value of the ui property. (#314532, Yong Wang)
+
        * 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 7823c93d793a76ef46a5d73df3afff587cad543b..8cf0c1a7c857e2c509cf0ceac5ea2c8b6a32c983 100644 (file)
--- 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,
+                                                       "<ui>\n</ui>",
                                                        GTK_PARAM_READABLE));