Attachment 7847 Details for Bug 35347 – патч с исправлением отображения иконки

[patch] патч с исправлением отображения иконки

xsane-0.999-alt-fix-broken-icon.patch (text/plain), 1.29 KB, created by Ivan on 2018-11-08 10:32:38 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan

Created: 2018-11-08 10:32:38 MSK

Size: 1.29 KB

patch

obsolete

>diff --git a/xsane/src/xsane-back-gtk.c b/xsane/src/xsane-back-gtk.c
>index bca9eb2..5cc66b7 100644
>--- a/xsane/src/xsane-back-gtk.c
>+++ b/xsane/src/xsane-back-gtk.c
>@@ -2707,7 +2707,7 @@ void xsane_back_gtk_destroy_dialog(void)
> 
> void xsane_set_window_icon(GtkWidget *gtk_window, gchar **xpm_d)
> {
>- GdkPixmap *pixmap;
>+ GdkPixbuf *pixbuf;
>  GdkBitmap *mask;
> 
>   DBG(DBG_proc, "xsane_set_window_icon\n");
>@@ -2715,22 +2715,14 @@ void xsane_set_window_icon(GtkWidget *gtk_window, gchar **xpm_d)
>   gtk_widget_realize(gtk_window);
>   if (xpm_d)
>   {
>-    pixmap = gdk_pixmap_create_from_xpm_d(gtk_window->window, &mask, xsane.bg_trans, xpm_d);
>+    pixbuf = gdk_pixbuf_new_from_xpm_data(xpm_d);
>   }
>   else
>   {
>-    if (xsane.window_icon_pixmap)
>-    {
>-      pixmap = xsane.window_icon_pixmap;
>-      mask   = xsane.window_icon_mask;
>-    }
>-    else
>-    {
>-      pixmap = gdk_pixmap_create_from_xpm_d(gtk_window->window, &mask, xsane.bg_trans, (gchar **) xsane_window_icon_xpm);
>-    }
>+    pixbuf = gdk_pixbuf_new_from_xpm_data((gchar **) xsane_window_icon_xpm);
>   }
> 
>-  gdk_window_set_icon(gtk_window->window, 0, pixmap, mask);
>+  gtk_window_set_icon(GTK_WINDOW(gtk_window), pixbuf);
> }
> 
> /* ---------------------------------------------------------------------------------------------------------------------- */

Actions: View | Diff

Attachments on bug 35347: 7743 | 7847 | 7851