View | Details | Raw Unified | Return to bug 35347
Collapse All | Expand All

(-)a/xsane/src/xsane-back-gtk.c (-12 / +4 lines)
Lines 2707-2713 void xsane_back_gtk_destroy_dialog(void) Link Here
2707
2707
2708
void xsane_set_window_icon(GtkWidget *gtk_window, gchar **xpm_d)
2708
void xsane_set_window_icon(GtkWidget *gtk_window, gchar **xpm_d)
2709
{
2709
{
2710
 GdkPixmap *pixmap;
2710
 GdkPixbuf *pixbuf;
2711
 GdkBitmap *mask;
2711
 GdkBitmap *mask;
2712
2712
2713
  DBG(DBG_proc, "xsane_set_window_icon\n");
2713
  DBG(DBG_proc, "xsane_set_window_icon\n");
Lines 2715-2736 void xsane_set_window_icon(GtkWidget *gtk_window, gchar **xpm_d) Link Here
2715
  gtk_widget_realize(gtk_window);
2715
  gtk_widget_realize(gtk_window);
2716
  if (xpm_d)
2716
  if (xpm_d)
2717
  {
2717
  {
2718
    pixmap = gdk_pixmap_create_from_xpm_d(gtk_window->window, &mask, xsane.bg_trans, xpm_d);
2718
    pixbuf = gdk_pixbuf_new_from_xpm_data(xpm_d);
2719
  }
2719
  }
2720
  else
2720
  else
2721
  {
2721
  {
2722
    if (xsane.window_icon_pixmap)
2722
    pixbuf = gdk_pixbuf_new_from_xpm_data((gchar **) xsane_window_icon_xpm);
2723
    {
2724
      pixmap = xsane.window_icon_pixmap;
2725
      mask   = xsane.window_icon_mask;
2726
    }
2727
    else
2728
    {
2729
      pixmap = gdk_pixmap_create_from_xpm_d(gtk_window->window, &mask, xsane.bg_trans, (gchar **) xsane_window_icon_xpm);
2730
    }
2731
  }
2723
  }
2732
2724
2733
  gdk_window_set_icon(gtk_window->window, 0, pixmap, mask);
2725
  gtk_window_set_icon(GTK_WINDOW(gtk_window), pixbuf);
2734
}
2726
}
2735
2727
2736
/* ---------------------------------------------------------------------------------------------------------------------- */ 
2728
/* ---------------------------------------------------------------------------------------------------------------------- */ 

Return to bug 35347