diff options
| author | Drew Vogel <dvogel@github> | 2024-05-23 17:49:39 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-05-23 17:49:39 +0200 |
| commit | 742062f31faca14ae479f4688a5ad8add5d5c120 (patch) | |
| tree | 12f59f632314bb7f49ede81998b16b4a8a793b86 | |
| parent | 789679cfc4f39505b135220672b43a260d8ca3b4 (diff) | |
patch 9.1.0437: Motif requires non-const char pointer for XPM datav9.1.0437
Problem: Motif requires non-const char pointer for XPM data shared with
GTK (Tony Mechelynck, after v9.1.0432)
Solution: Cast non-const to const char pointer for GTK (Drew Vogel).
closes: #14834
Signed-off-by: Drew Vogel <dvogel@github>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/vim16x16.xpm | 2 | ||||
| -rw-r--r-- | runtime/vim32x32.xpm | 2 | ||||
| -rw-r--r-- | runtime/vim48x48.xpm | 2 | ||||
| -rw-r--r-- | src/gui_gtk_x11.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/runtime/vim16x16.xpm b/runtime/vim16x16.xpm index 9b55218cc0..cb75b71781 100644 --- a/runtime/vim16x16.xpm +++ b/runtime/vim16x16.xpm @@ -1,5 +1,5 @@ /* XPM */ -static const char * vim16x16[] = { +static char * vim16x16[] = { "16 16 8 1", " c None", ". c #000000", diff --git a/runtime/vim32x32.xpm b/runtime/vim32x32.xpm index 017b93b6f8..43a3a40c0b 100644 --- a/runtime/vim32x32.xpm +++ b/runtime/vim32x32.xpm @@ -1,5 +1,5 @@ /* XPM */ -static const char * vim32x32[] = { +static char * vim32x32[] = { "32 32 8 1", " c None", ". c #000000", diff --git a/runtime/vim48x48.xpm b/runtime/vim48x48.xpm index 8bd08bc5a3..b2fdd95924 100644 --- a/runtime/vim48x48.xpm +++ b/runtime/vim48x48.xpm @@ -1,5 +1,5 @@ /* XPM */ -static const char * vim48x48[] = { +static char * vim48x48[] = { "48 48 8 1", " c None", ". c #000000", diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 066aa17456..67ee531b6f 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -2727,9 +2727,9 @@ mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED) */ GList *icons = NULL; - icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data(vim16x16)); - icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data(vim32x32)); - icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data(vim48x48)); + icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char **)vim16x16)); + icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char **)vim32x32)); + icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char **)vim48x48)); gtk_window_set_icon_list(GTK_WINDOW(gui.mainwin), icons); diff --git a/src/version.c b/src/version.c index 98ec4754e5..7188cbd888 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 437, +/**/ 436, /**/ 435, |