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

[Jan Djärv]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.646 emacs/src/xfns.c:1.647
*** emacs/src/xfns.c:1.646      Wed Nov 16 16:38:48 2005
--- emacs/src/xfns.c    Fri Dec  2 14:55:14 2005
***************
*** 608,614 ****
  
    if (! had_errors)
      {
!       int ign;
        Window child, rootw;
  
        /* Get the real coordinates for the WM window upper left corner */
--- 608,614 ----
  
    if (! had_errors)
      {
!       unsigned int ign;
        Window child, rootw;
  
        /* Get the real coordinates for the WM window upper left corner */
***************
*** 794,802 ****
      {
        GdkPixbuf *pixbuf;
        GError *err = NULL;
!       char *filename;
! 
!       filename = SDATA (found);
        BLOCK_INPUT;
  
        pixbuf = gdk_pixbuf_new_from_file (filename, &err);
--- 794,800 ----
      {
        GdkPixbuf *pixbuf;
        GError *err = NULL;
!       char *filename = (char *) SDATA (found);
        BLOCK_INPUT;
  
        pixbuf = gdk_pixbuf_new_from_file (filename, &err);
***************
*** 825,841 ****
      char **data;
  {
    int result = 0;
!   GError *err = NULL;
!   GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (data);
  
    if (!pixbuf)
!     {
!       g_error_free (err);
!       return 0;
!     }
  
!   gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
!                      pixbuf);
    g_object_unref (pixbuf);
    return 1;
  }
--- 823,834 ----
      char **data;
  {
    int result = 0;
!   GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) data);
  
    if (!pixbuf)
!     return 0;
  
!   gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), pixbuf);
    g_object_unref (pixbuf);
    return 1;
  }
***************
*** 1649,1655 ****
  
  #ifdef USE_GTK
          gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
!                               SDATA (ENCODE_UTF_8 (name)));
  #else /* not USE_GTK */
        XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
  #endif /* not USE_GTK */
--- 1642,1648 ----
  
  #ifdef USE_GTK
          gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
!                               (char *) SDATA (ENCODE_UTF_8 (name)));
  #else /* not USE_GTK */
        XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
  #endif /* not USE_GTK */
***************
*** 3376,3382 ****
                         FRAME_OUTER_WINDOW (f),
                         dpyinfo->Xatom_wm_client_leader,
                         XA_WINDOW, 32, PropModeReplace,
!                        (char *) &dpyinfo->client_leader_window, 1);
        UNBLOCK_INPUT;
      }
  
--- 3369,3375 ----
                         FRAME_OUTER_WINDOW (f),
                         dpyinfo->Xatom_wm_client_leader,
                         XA_WINDOW, 32, PropModeReplace,
!                        (unsigned char *) &dpyinfo->client_leader_window, 1);
        UNBLOCK_INPUT;
      }
  
***************
*** 4941,4946 ****
--- 4934,4942 ----
    if (INTEGERP (top))
      *root_y = XINT (top);
    else if (*root_y + XINT (dy) - height < 0)
+     *root_y -= XINT (dy);
+   else if (*root_y + XINT (dy) >= FRAME_X_DISPLAY_INFO (f)->height)
+     /* Put tip above the pointer.  */
      *root_y -= XINT (dy);
    else
      {