diff options
author | Daniel Boles <dboles.src@gmail.com> | 2018-04-17 20:03:07 +0100 |
---|---|---|
committer | Daniel Boles <dboles.src@gmail.com> | 2018-04-17 21:07:18 +0100 |
commit | 0c46d94ec3f93c2b43bc8629d7c064d6c9732ac7 (patch) | |
tree | 19b7c3068e2698109c4740fd3487a0c2e295f4b1 | |
parent | a7a4a459ea8ee74efa638ba603616ffa3cffc1b0 (diff) | |
download | gtk+-0c46d94ec3f93c2b43bc8629d7c064d6c9732ac7.tar.gz |
Menu|Item: Fix FIXME re non-const interned strings
These are members of the private struct, so it hurts no one to fix this.
-rw-r--r-- | gtk/gtkmenu.c | 3 | ||||
-rw-r--r-- | gtk/gtkmenuitem.c | 4 | ||||
-rw-r--r-- | gtk/gtkmenuitemprivate.h | 2 | ||||
-rw-r--r-- | gtk/gtkmenuprivate.h | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index e0dc2c9fbe..e87c624390 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -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); } diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 7ad1d196cb..66be91332a 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -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); diff --git a/gtk/gtkmenuitemprivate.h b/gtk/gtkmenuitemprivate.h index cb213d9edb..319a2e743d 100644 --- a/gtk/gtkmenuitemprivate.h +++ b/gtk/gtkmenuitemprivate.h @@ -36,7 +36,7 @@ struct _GtkMenuItemPrivate guint timer; - gchar *accel_path; + const char *accel_path; GtkAction *action; GtkActionHelper *action_helper; diff --git a/gtk/gtkmenuprivate.h b/gtk/gtkmenuprivate.h index 92c4de63c1..e838d4e0d1 100644 --- a/gtk/gtkmenuprivate.h +++ b/gtk/gtkmenuprivate.h @@ -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; |