aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.1.1199: gvim uses hardcoded xpm icon file

Browse Source 
Problem:  Many X11/Wayland desktops support icon themes, and many themes
          provide a gvim icon, but this icon is ignored for the window
          itself because it is hardcoded in the source code.
Solution: Read the icon from the theme instead (Aurelien Gateau).

closes: #16859

Signed-off-by: Aurelien Gateau <mail@agateau.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Aurelien Gateau
2025-03-12 23:16:42 +01:00
committed by Christian Brabandt
parent 54c88d0cf8
commit 0adbe639a5
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui_gtk_x11.c
View File

@@ -2704,10 +2704,6 @@ global_event_filter(GdkXEvent *xev,
static void static void
mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED) mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED)
{ {
#include "../runtime/vim32x32.xpm"
#include "../runtime/vim16x16.xpm"
#include "../runtime/vim48x48.xpm"
GdkWindow * const mainwin_win = gtk_widget_get_window(gui.mainwin); GdkWindow * const mainwin_win = gtk_widget_get_window(gui.mainwin);
// When started with "--echo-wid" argument, write window ID on stdout. // When started with "--echo-wid" argument, write window ID on stdout.
@@ -2725,17 +2721,7 @@ mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED)
/* /*
* Add an icon to the main window. For fun and convenience of the user. * Add an icon to the main window. For fun and convenience of the user.
*/ */
GList *icons = NULL; gtk_window_set_icon_name(GTK_WINDOW(gui.mainwin), "gvim");
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);
// TODO: is this type cast OK?
g_list_foreach(icons, (GFunc)(void *)&g_object_unref, NULL);
g_list_free(icons);
} }
#if !defined(USE_GNOME_SESSION) #if !defined(USE_GNOME_SESSION)

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1199,
/**/ /**/
1198, 1198,
/**/ /**/