]> git.eshelyaron.com Git - emacs.git/commitdiff
* xterm.c (x_wm_set_icon_pixmap): Move GTK specific code to
authorJan Djärv <jan.h.d@swipnet.se>
Tue, 16 Aug 2005 19:34:00 +0000 (19:34 +0000)
committerJan Djärv <jan.h.d@swipnet.se>
Tue, 16 Aug 2005 19:34:00 +0000 (19:34 +0000)
xg_set_frame_icon and call it.

src/xterm.c

index 84b1dae3515ac700881c6eb714315c9152383fed..9fd511934a6ce5a197312f5a5aecebc25dc053bb 100644 (file)
@@ -9253,12 +9253,7 @@ x_wm_set_icon_pixmap (f, pixmap_id)
 
 #ifdef USE_GTK
   {
-    GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f));
-    GdkPixmap *gpix = gdk_pixmap_foreign_new_for_display (gdpy, icon_pixmap);
-    GdkPixmap *gmask = gdk_pixmap_foreign_new_for_display (gdpy, icon_mask);
-    GdkPixbuf *gp = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, NULL);
-
-    gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), gp);
+    xg_set_frame_icon (f, icon_pixmap, icon_mask);
     return;
   }