callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the default value of the tearoff-title property

Browse Source 
svn path=/trunk/; revision=19257
This commit is contained in:
Matthias Clasen
2007-12-28 05:49:21 +00:00
parent 1312be0dd5
commit f78277f0a3
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2007-12-27 Matthias Clasen <mclasen@redhat.com> 2007-12-27 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcombobox.c: Correct the default value for the
tearoff-title property.
* gtk/gtkcellrenderertext.c: Fix the default value for the * gtk/gtkcellrenderertext.c: Fix the default value for the
wrap-mode and font-scale properties. wrap-mode and font-scale properties.

12
gtk/gtkcombobox.c
View File

@ -802,7 +802,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
g_param_spec_string ("tearoff-title", g_param_spec_string ("tearoff-title",
P_("Tearoff Title"), P_("Tearoff Title"),
P_("A title that may be displayed by the window manager when the popup is torn-off"), P_("A title that may be displayed by the window manager when the popup is torn-off"),
"", NULL,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE));
@ -5523,13 +5523,17 @@ void
gtk_combo_box_set_title (GtkComboBox *combo_box, gtk_combo_box_set_title (GtkComboBox *combo_box,
const gchar *title) const gchar *title)
{ {
GtkComboBoxPrivate *priv;
g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
priv = combo_box->priv;
if (strcmp (title ? title : "", if (strcmp (title ? title : "",
combo_box->priv->tearoff_title ? combo_box->priv->tearoff_title : "") != 0) priv->tearoff_title ? priv->tearoff_title : "") != 0)
{ {
g_free (combo_box->priv->tearoff_title); g_free (priv->tearoff_title);
combo_box->priv->tearoff_title = g_strdup (title); priv->tearoff_title = g_strdup (title);
gtk_combo_box_update_title (combo_box); gtk_combo_box_update_title (combo_box);