diff options
| author | Johan Dahlin <jdahlin@async.com.br> | 2008-06-19 19:09:50 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2008-06-19 19:09:50 +0000 |
| commit | 234dc3726f2887637bd02d122c4395592d27af96 (patch) | |
| tree | 238719f03390c309d39b6d65a3a83a9158c6a48c | |
| parent | e1c47e2ee0f8ee8cdd439d8c9615413ed11a14d0 (diff) | |
| download | gtk+-234dc3726f2887637bd02d122c4395592d27af96.tar.gz | |
remove an unused variable and cast accel_path to gchar, just like in
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gtk/gtkmenuitem.c | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -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 diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 73f1f17a98..aa2b27ad1a 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -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); |