Mercurial > pidgin.yaz
diff pidgin/gtkblist.c @ 15586:1dfa6945e13f
Add some braces to eliminate a compiler warning about an ambiguous else.
With the indentation, it wasn't really too ambiguous, but I like braces.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 08 Feb 2007 16:29:26 +0000 |
| parents | ad1ddb31202d |
| children | b74a3bec8dcb |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Thu Feb 08 12:35:14 2007 +0000 +++ b/pidgin/gtkblist.c Thu Feb 08 16:29:26 2007 +0000 @@ -2350,6 +2350,7 @@ struct tooltip_data *td = l->data; if (td->avatar && pidgin_gdk_pixbuf_is_opaque(td->avatar)) + { if (dir == GTK_TEXT_DIR_RTL) gtk_paint_flat_box(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, gtkblist->tipwindow, "tooltip", @@ -2359,6 +2360,7 @@ NULL, gtkblist->tipwindow, "tooltip", max_width - (td->avatar_width+ TOOLTIP_BORDER)-1, current_height-1,td->avatar_width+2, td->avatar_height+2); + } #if GTK_CHECK_VERSION(2,2,0) if (dir == GTK_TEXT_DIR_RTL) @@ -2368,6 +2370,7 @@ gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->status_icon, 0, 0, TOOLTIP_BORDER, current_height, -1 , -1, GDK_RGB_DITHER_NONE, 0, 0); if(td->avatar) + { if (dir == GTK_TEXT_DIR_RTL) gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->avatar, 0, 0, TOOLTIP_BORDER, current_height, -1, -1, GDK_RGB_DITHER_NONE, 0, 0); @@ -2375,6 +2378,8 @@ gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->avatar, 0, 0, max_width - (td->avatar_width + TOOLTIP_BORDER), current_height, -1 , -1, GDK_RGB_DITHER_NONE, 0, 0); + } + if (!td->avatar_is_prpl_icon) gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->prpl_icon, 0, 0,