AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-19 21:40:22 +00:00
Code Issues Projects Releases Wiki Activity

Merged from gtk-2-10:

Browse Source 
2006-12-15  Federico Mena Quintero  <federico@novell.com>

	Merged from gtk-2-10:

	* gtk/gtkmenu.c (gtk_menu_set_title): Don't try to optimize for
	the case where the new title is the same as the old title, to
	preserve the behavior from GTK+ 2.8 (NULL and "" titles are not
	equivalent).  Handle the case where title == priv->title.  This
	was found by the LSB compatibility tests:
	https://bugzilla.novell.com/show_bug.cgi?id=223882

2006-12-15  Dom Lachowicz <domlachowicz@gmail.com>
This commit is contained in:
Federico Mena Quintero 2006-12-15 20:13:01 +00:00 committed by Federico Mena Quintero
parent 36fa058fa2
commit 8387869a5d
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2006-12-15 Federico Mena Quintero <federico@novell.com>
Merged from gtk-2-10:
* gtk/gtkmenu.c (gtk_menu_set_title): Don't try to optimize for
the case where the new title is the same as the old title, to
preserve the behavior from GTK+ 2.8 (NULL and "" titles are not
equivalent). Handle the case where title == priv->title. This
was found by the LSB compatibility tests:
https://bugzilla.novell.com/show_bug.cgi?id=223882
2006-12-15 Dom Lachowicz <domlachowicz@gmail.com>
* gtk/gtkcombobox.c: Make GtkComboBox in "appears-as-list" mode

19
gtk/gtkmenu.c
View File

@ -1913,26 +1913,27 @@ gtk_menu_get_tearoff_state (GtkMenu *menu)
* @title: a string containing the title for the menu.
*
* Sets the title string for the menu. The title is displayed when the menu
* is shown as a tearoff menu.
* is shown as a tearoff menu. If @title is %NULL, the menu will see if it is
* attached to a parent menu item, and if so it will try to use the same text as
* that menu item's label.
**/
void
void
gtk_menu_set_title (GtkMenu *menu,
const gchar *title)
{
GtkMenuPrivate *priv;
char *old_title;
g_return_if_fail (GTK_IS_MENU (menu));
priv = gtk_menu_get_private (menu);
if (strcmp (title ? title : "", priv->title ? priv->title : "") != 0)
{
g_free (priv->title);
priv->title = g_strdup (title);
old_title = priv->title;
priv->title = g_strdup (title);
g_free (old_title);
gtk_menu_update_title (menu);
g_object_notify (G_OBJECT (menu), "tearoff-title");
}
gtk_menu_update_title (menu);
g_object_notify (G_OBJECT (menu), "tearoff-title");
}
/**