[Emacs-diffs] Changes to emacs/src/xfns.c

[Jan Djärv]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.573 emacs/src/xfns.c:1.574
*** emacs/src/xfns.c:1.573      Tue Feb  4 09:03:17 2003
--- emacs/src/xfns.c    Fri Feb  7 11:38:54 2003
***************
*** 2552,2573 ****
            icon.format = 8;
            icon.nitems = bytes;
          }
- #ifdef USE_X_TOOLKIT
-       XSetWMName (FRAME_X_DISPLAY (f),
-                   XtWindow (f->output_data.x->widget), &text);
-       XSetWMIconName (FRAME_X_DISPLAY (f), XtWindow 
(f->output_data.x->widget),
-                       &icon);
- #else /* not USE_X_TOOLKIT */
  #ifdef USE_GTK
          gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
                                SDATA (name));
-       XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
-                         &icon);
  #else /* not USE_GTK */
!       XSetWMName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), &text);
!       XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), &icon);
  #endif /* not USE_GTK */
! #endif /* not USE_X_TOOLKIT */
        if (!NILP (f->icon_name)
            && icon.value != (unsigned char *) SDATA (f->icon_name))
          xfree (icon.value);
--- 2552,2566 ----
            icon.format = 8;
            icon.nitems = bytes;
          }
  #ifdef USE_GTK
          gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
                                SDATA (name));
  #else /* not USE_GTK */
!       XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
  #endif /* not USE_GTK */
! 
!       XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &icon);
! 
        if (!NILP (f->icon_name)
            && icon.value != (unsigned char *) SDATA (f->icon_name))
          xfree (icon.value);
***************
*** 2666,2687 ****
            icon.format = 8;
            icon.nitems = bytes;
          }
! #ifdef USE_X_TOOLKIT
!       XSetWMName (FRAME_X_DISPLAY (f),
!                   XtWindow (f->output_data.x->widget), &text);
!       XSetWMIconName (FRAME_X_DISPLAY (f), XtWindow 
(f->output_data.x->widget),
!                       &icon);
! #else /* not USE_X_TOOLKIT */
  #ifdef USE_GTK
          gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
                                SDATA (name));
-       XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
-                         &icon);
  #else /* not USE_GTK */
!       XSetWMName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), &text);
!       XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), &icon);
  #endif /* not USE_GTK */
! #endif /* not USE_X_TOOLKIT */
        if (!NILP (f->icon_name)
            && icon.value != (unsigned char *) SDATA (f->icon_name))
          xfree (icon.value);
--- 2659,2675 ----
            icon.format = 8;
            icon.nitems = bytes;
          }
! 
  #ifdef USE_GTK
          gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
                                SDATA (name));
  #else /* not USE_GTK */
!       XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
  #endif /* not USE_GTK */
! 
!       XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
!                         &icon);
! 
        if (!NILP (f->icon_name)
            && icon.value != (unsigned char *) SDATA (f->icon_name))
          xfree (icon.value);