diff options
| author | Jan Djärv | 2005-08-16 19:34:00 +0000 |
|---|---|---|
| committer | Jan Djärv | 2005-08-16 19:34:00 +0000 |
| commit | e76738f9622c1351364548c8326aa82190b17fd3 (patch) | |
| tree | 60528677910b37206ab723bfb39af6d4a4d2a7ce /src | |
| parent | 1001243b675d98e2d22636a5ac4628c80a3a84a6 (diff) | |
| download | emacs-e76738f9622c1351364548c8326aa82190b17fd3.tar.gz emacs-e76738f9622c1351364548c8326aa82190b17fd3.zip | |
* xterm.c (x_wm_set_icon_pixmap): Move GTK specific code to
xg_set_frame_icon and call it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/xterm.c b/src/xterm.c index 84b1dae3515..9fd511934a6 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -9253,12 +9253,7 @@ x_wm_set_icon_pixmap (f, pixmap_id) | |||
| 9253 | 9253 | ||
| 9254 | #ifdef USE_GTK | 9254 | #ifdef USE_GTK |
| 9255 | { | 9255 | { |
| 9256 | GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); | 9256 | xg_set_frame_icon (f, icon_pixmap, icon_mask); |
| 9257 | GdkPixmap *gpix = gdk_pixmap_foreign_new_for_display (gdpy, icon_pixmap); | ||
| 9258 | GdkPixmap *gmask = gdk_pixmap_foreign_new_for_display (gdpy, icon_mask); | ||
| 9259 | GdkPixbuf *gp = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, NULL); | ||
| 9260 | |||
| 9261 | gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), gp); | ||
| 9262 | return; | 9257 | return; |
| 9263 | } | 9258 | } |
| 9264 | 9259 | ||