diff --git a/ChangeLog b/ChangeLog index 3156157cdc..65d5ba01d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-02-12 Matthias Clasen + + * gtk/gtkfilesystemmodel.c: + * gtk/gtkprinter.c: + * gtk/gtkwidget.c: Use g_value_set_static_string() where + appropriate. (#515042, Christian Persch) + 2008-02-12 Matthias Clasen * tests/prop-editor.c: Fix a memory leak (#515039, Christian Persch) diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index 4330e28d27..11ee1d2fd3 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -376,7 +376,7 @@ gtk_file_system_model_get_value (GtkTreeModel *tree_model, g_value_init (value, G_TYPE_STRING); if (model->has_editable && node == model->roots) - g_value_set_string (value, ""); + g_value_set_static_string (value, ""); else { const GtkFileInfo *info = file_model_node_get_info (model, node); diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c index 3c20f28aba..15c866f8a1 100644 --- a/gtk/gtkprinter.c +++ b/gtk/gtkprinter.c @@ -292,7 +292,7 @@ gtk_printer_get_property (GObject *object, if (priv->name) g_value_set_string (value, priv->name); else - g_value_set_string (value, ""); + g_value_set_static_string (value, ""); break; case PROP_BACKEND: g_value_set_object (value, priv->backend); @@ -301,19 +301,19 @@ gtk_printer_get_property (GObject *object, if (priv->state_message) g_value_set_string (value, priv->state_message); else - g_value_set_string (value, ""); + g_value_set_static_string (value, ""); break; case PROP_LOCATION: if (priv->location) g_value_set_string (value, priv->location); else - g_value_set_string (value, ""); + g_value_set_static_string (value, ""); break; case PROP_ICON_NAME: if (priv->icon_name) g_value_set_string (value, priv->icon_name); else - g_value_set_string (value, ""); + g_value_set_static_string (value, ""); break; case PROP_JOB_COUNT: g_value_set_int (value, priv->job_count); diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index fec929f6e5..9d54a01e6f 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -2478,7 +2478,7 @@ gtk_widget_get_property (GObject *object, if (widget->name) g_value_set_string (value, widget->name); else - g_value_set_string (value, ""); + g_value_set_static_string (value, ""); break; case PROP_PARENT: if (widget->parent)