Commit 0c46d94e authored by Daniel Boles's avatar Daniel Boles

Menu|Item: Fix FIXME re non-const interned strings

These are members of the private struct, so it hurts no one to fix this.
parent a7a4a459
Pipeline #9111 passed with stage
in 10 minutes and 26 seconds
......@@ -2763,8 +2763,7 @@ gtk_menu_set_accel_path (GtkMenu *menu,
if (accel_path)
g_return_if_fail (accel_path[0] == '<' && strchr (accel_path, '/')); /* simplistic check */
/* FIXME: accel_path should be defined as const gchar* */
priv->accel_path = (gchar*)g_intern_string (accel_path);
priv->accel_path = g_intern_string (accel_path);
if (priv->accel_path)
_gtk_menu_refresh_accel_paths (menu, FALSE);
}
......
......@@ -2345,7 +2345,7 @@ _gtk_menu_item_refresh_accel_path (GtkMenuItem *menu_item,
if (postfix)
{
new_path = g_strconcat (prefix, "/", postfix, NULL);
path = priv->accel_path = (char*)g_intern_string (new_path);
path = priv->accel_path = g_intern_string (new_path);
g_free (new_path);
}
}
......@@ -2397,7 +2397,7 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
widget = GTK_WIDGET (menu_item);
/* store new path */
priv->accel_path = (char*)g_intern_string (accel_path);
priv->accel_path = g_intern_string (accel_path);
/* forget accelerators associated with old path */
gtk_widget_set_accel_path (widget, NULL, NULL);
......
......@@ -36,7 +36,7 @@ struct _GtkMenuItemPrivate
guint timer;
gchar *accel_path;
const char *accel_path;
GtkAction *action;
GtkActionHelper *action_helper;
......
......@@ -45,7 +45,7 @@ struct _GtkMenuPrivate
GtkWidget *old_active_menu_item;
GtkAccelGroup *accel_group;
gchar *accel_path;
const char *accel_path;
GtkMenuPositionFunc position_func;
gpointer position_func_data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment