AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

remove an unused variable and cast accel_path to gchar, just like in

Browse Source 
2008-06-19  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtkmenuitem.c: remove an unused variable and cast
    accel_path to gchar, just like in gtkmenu.c


svn path=/trunk/; revision=20473
This commit is contained in:
Johan Dahlin 2008-06-19 19:09:50 +00:00 committed by Johan Dahlin
parent e1c47e2ee0
commit 234dc3726f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-06-19 Johan Dahlin <jdahlin@async.com.br>
* gtk/gtkmenuitem.c: remove an unused variable and cast
accel_path to gchar, just like in gtkmenu.c
2008-06-19 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkrecentmanager.c (get_icon_for_mime_type): Use GIO

5
gtk/gtkmenuitem.c
View File

@ -1565,7 +1565,7 @@ _gtk_menu_item_refresh_accel_path (GtkMenuItem *menu_item,
if (postfix)
{
new_path = g_strconcat (prefix, "/", postfix, NULL);
path = menu_item->accel_path = g_intern_string (new_path);
path = menu_item->accel_path = (char*)g_intern_string (new_path);
g_free (new_path);
}
}
@ -1606,7 +1606,6 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
const gchar *accel_path)
{
GtkWidget *widget;
gchar *old_accel_path;
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
g_return_if_fail (accel_path == NULL ||
@ -1615,7 +1614,7 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
widget = GTK_WIDGET (menu_item);
/* store new path */
menu_item->accel_path = g_intern_string (accel_path);
menu_item->accel_path = (char*)g_intern_string (accel_path);
/* forget accelerators associated with old path */
gtk_widget_set_accel_path (widget, NULL, NULL);