/[emacs]/emacs/src/xfns.c
ViewVC logotype

Diff of /emacs/src/xfns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.646 by cyd, Wed Nov 16 16:38:48 2005 UTC revision 1.647 by jhd, Fri Dec 2 14:55:14 2005 UTC
# Line 608  x_real_positions (f, xptr, yptr) Line 608  x_real_positions (f, xptr, yptr)
608    
609    if (! had_errors)    if (! had_errors)
610      {      {
611        int ign;        unsigned int ign;
612        Window child, rootw;        Window child, rootw;
613    
614        /* Get the real coordinates for the WM window upper left corner */        /* Get the real coordinates for the WM window upper left corner */
# Line 794  xg_set_icon (f, file) Line 794  xg_set_icon (f, file)
794      {      {
795        GdkPixbuf *pixbuf;        GdkPixbuf *pixbuf;
796        GError *err = NULL;        GError *err = NULL;
797        char *filename;        char *filename = (char *) SDATA (found);
   
       filename = SDATA (found);  
798        BLOCK_INPUT;        BLOCK_INPUT;
799    
800        pixbuf = gdk_pixbuf_new_from_file (filename, &err);        pixbuf = gdk_pixbuf_new_from_file (filename, &err);
# Line 825  xg_set_icon_from_xpm_data (f, data) Line 823  xg_set_icon_from_xpm_data (f, data)
823      char **data;      char **data;
824  {  {
825    int result = 0;    int result = 0;
826    GError *err = NULL;    GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) data);
   GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (data);  
827    
828    if (!pixbuf)    if (!pixbuf)
829      {      return 0;
       g_error_free (err);  
       return 0;  
     }  
830    
831    gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),    gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), pixbuf);
                        pixbuf);  
832    g_object_unref (pixbuf);    g_object_unref (pixbuf);
833    return 1;    return 1;
834  }  }
# Line 1649  x_set_name_internal (f, name) Line 1642  x_set_name_internal (f, name)
1642    
1643  #ifdef USE_GTK  #ifdef USE_GTK
1644          gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),          gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
1645                                SDATA (ENCODE_UTF_8 (name)));                                (char *) SDATA (ENCODE_UTF_8 (name)));
1646  #else /* not USE_GTK */  #else /* not USE_GTK */
1647          XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);          XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
1648  #endif /* not USE_GTK */  #endif /* not USE_GTK */
# Line 3376  This function is an internal primitive-- Line 3369  This function is an internal primitive--
3369                         FRAME_OUTER_WINDOW (f),                         FRAME_OUTER_WINDOW (f),
3370                         dpyinfo->Xatom_wm_client_leader,                         dpyinfo->Xatom_wm_client_leader,
3371                         XA_WINDOW, 32, PropModeReplace,                         XA_WINDOW, 32, PropModeReplace,
3372                         (char *) &dpyinfo->client_leader_window, 1);                         (unsigned char *) &dpyinfo->client_leader_window, 1);
3373        UNBLOCK_INPUT;        UNBLOCK_INPUT;
3374      }      }
3375    
# Line 4942  compute_tip_xy (f, parms, dx, dy, width, Line 4935  compute_tip_xy (f, parms, dx, dy, width,
4935      *root_y = XINT (top);      *root_y = XINT (top);
4936    else if (*root_y + XINT (dy) - height < 0)    else if (*root_y + XINT (dy) - height < 0)
4937      *root_y -= XINT (dy);      *root_y -= XINT (dy);
4938      else if (*root_y + XINT (dy) >= FRAME_X_DISPLAY_INFO (f)->height)
4939        /* Put tip above the pointer.  */
4940        *root_y -= XINT (dy);
4941    else    else
4942      {      {
4943        *root_y -= height;        *root_y -= height;

Legend:
Removed from v.1.646  
changed lines
  Added in v.1.647

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26