gtk+ r20473 - in trunk: . gtk

[johan svn gnome org]

Author: johan
Date: Thu Jun 19 19:09:50 2008
New Revision: 20473
URL: http://svn.gnome.org/viewvc/gtk+?rev=20473&view=rev

Log:
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



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkmenuitem.c

Modified: trunk/gtk/gtkmenuitem.c
==============================================================================
--- trunk/gtk/gtkmenuitem.c	(original)
+++ trunk/gtk/gtkmenuitem.c	Thu Jun 19 19:09:50 2008
@@ -1565,7 +1565,7 @@
           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 @@
 			      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 @@
   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);