Remove an unused variable and cast to gchar to avoid a compiler warning.
2008-06-19 Johan Dahlin <jdahlin@async.com.br> * gtk/gtkmenu.c (gtk_menu_set_accel_path): Remove an unused variable and cast to gchar to avoid a compiler warning. svn path=/trunk/; revision=20467
This commit is contained in:
committed by
Johan Dahlin
parent
8b4277dc9a
commit
6ef2f57450
@ -1,3 +1,9 @@
|
|||||||
|
2008-06-19 Johan Dahlin <jdahlin@async.com.br>
|
||||||
|
|
||||||
|
* gtk/gtkmenu.c (gtk_menu_set_accel_path):
|
||||||
|
Remove an unused variable and cast to gchar to avoid a compiler
|
||||||
|
warning.
|
||||||
|
|
||||||
2008-06-19 Christian Persch <chpe@gnome.org>
|
2008-06-19 Christian Persch <chpe@gnome.org>
|
||||||
|
|
||||||
* docs/reference/gtk/gtk-sections.txt:
|
* docs/reference/gtk/gtk-sections.txt:
|
||||||
@ -51,7 +57,7 @@
|
|||||||
* gtk/gtkctree.c (gtk_ctree_new_with_titles):
|
* gtk/gtkctree.c (gtk_ctree_new_with_titles):
|
||||||
* gtk/gtkitemfactory.c (gtk_item_factory_construct),
|
* gtk/gtkitemfactory.c (gtk_item_factory_construct),
|
||||||
(gtk_item_factory_create_item):
|
(gtk_item_factory_create_item):
|
||||||
* gtk/gtkmenu.c (gtk_menu_set_tearoff_state):
|
* gtk/gtkmenu.c (gtk_menu_set_tearoff_state)
|
||||||
* gtk/gtkprogressbar.c (gtk_progress_bar_new),
|
* gtk/gtkprogressbar.c (gtk_progress_bar_new),
|
||||||
(gtk_progress_bar_new_with_adjustment):
|
(gtk_progress_bar_new_with_adjustment):
|
||||||
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_new):
|
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_new):
|
||||||
|
|||||||
@ -1645,13 +1645,12 @@ void
|
|||||||
gtk_menu_set_accel_path (GtkMenu *menu,
|
gtk_menu_set_accel_path (GtkMenu *menu,
|
||||||
const gchar *accel_path)
|
const gchar *accel_path)
|
||||||
{
|
{
|
||||||
gchar *old_accel_path;
|
|
||||||
|
|
||||||
g_return_if_fail (GTK_IS_MENU (menu));
|
g_return_if_fail (GTK_IS_MENU (menu));
|
||||||
if (accel_path)
|
if (accel_path)
|
||||||
g_return_if_fail (accel_path[0] == '<' && strchr (accel_path, '/')); /* simplistic check */
|
g_return_if_fail (accel_path[0] == '<' && strchr (accel_path, '/')); /* simplistic check */
|
||||||
|
|
||||||
menu->accel_path = g_intern_string (accel_path);
|
/* FIXME: accel_path should be defined as const gchar* */
|
||||||
|
menu->accel_path = (gchar*)g_intern_string (accel_path);
|
||||||
if (menu->accel_path)
|
if (menu->accel_path)
|
||||||
_gtk_menu_refresh_accel_paths (menu, FALSE);
|
_gtk_menu_refresh_accel_paths (menu, FALSE);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user