← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xchat-gnome/trusty-updates

« back to all changes in this revision

Viewing changes to src/fe-gnome/conversation-panel.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-07-05 12:27:58 UTC
  • mfrom: (1.1.19 upstream) (2.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20110705122758-bkl6xii0ebfddtmh
Tags: 1:0.30.0~git20100421.29cc76-1ubuntu1
https://launchpad.net/bugs/773847
https://launchpad.net/bugs/374686
* Merge with Debian unstable, remaining changes: (LP: #773847)
  - debian/control:
    - add Build-Depends on liblaunchpad-integration-dev.
    - xchat-gnome Suggests: xchat-gnome-indicator.
  - debian/patches/02_lpi.patch: add Launchpad integration items to the help
    menu
  - debian/patches/10_xchat-gnome-close-event.patch: add events for window
    close.
  - debian/patches/04_autojoin_ubuntu_chan.patch: add the Ubuntu network
    as default selection and default to autojoining #ubuntu.
  - debian/patches/20_add_gui_focus.patch: implement GUI focus from XChat.
  - debian/patches/51_freenode_default_port_8001.patch: Drop ports 666x
    for FreeNode to workaround a possible DCC exploit.
  - debian/patches/95_apturl-support.patch: support apt://-urls.
  - debian/watch: also look for unstable versions
  - debian/xchat-gnome.gconf-defaults: Set the default enabled plugins,
    indicator, netmonitor, and notifyosd.
* debian/patches/52_no_zero_width_pixmaps.patch: dropped, applied upstream.
* debian/patches/98_ice_depends_for_eggsmclient.patch: replaced by
  01_link_libice.patch.
* debian/control: remove duplicate entry in Build-Depends for intltool.
* debian/xchat-gnome.install: also install the xchat-gnome.desktop file from
  /usr/share/applications in xchat-gnome rather than xchat-gnome-common.
  (LP: #374686)
* debian/rules: update the xchat-gnome-common binary-install target to not
  keep a duplicate copy of the xchat-gnome.desktop file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/fe-gnome/conversation-panel.c
584
584
                        pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
585
585
                        if (pixbuf) {
586
586
                                gint width, height;
 
587
                                cairo_t *context;
587
588
                                GdkPixmap *image;
588
589
 
589
590
                                width  = gdk_pixbuf_get_width  (pixbuf);
590
591
                                height = gdk_pixbuf_get_height (pixbuf);
591
592
 
592
593
                                image = gdk_pixmap_new (NULL, width, height, 24);
593
 
                                gdk_draw_pixbuf (image, NULL, pixbuf, 0, 0, 0, 0, width, height, GDK_RGB_DITHER_NONE, 0, 0);
 
594
                                context = gdk_cairo_create (GDK_DRAWABLE (image));
 
595
                                gdk_cairo_set_source_pixbuf (context, pixbuf, 0, 0);
 
596
                                cairo_paint (context);
 
597
                                cairo_destroy (context);
594
598
 
595
599
                                gtk_xtext_set_background (GTK_XTEXT (panel->priv->xtext), image, FALSE);
596
600
                                g_object_unref (pixbuf);
602
606
                float transparency = gconf_client_get_float (client, "/apps/xchat/main_window/background_transparency", NULL);
603
607
                int value = 255 - ((int) (transparency * 255));
604
608
 
605
 
                if (gdk_drawable_get_visual (gui.main_window->window)->depth == 32) {
 
609
                if (gdk_drawable_get_depth (gui.main_window->window) == 32) {
606
610
                        gtk_xtext_set_tint (GTK_XTEXT (panel->priv->xtext), 0, 0, 0);
607
611
                        gtk_xtext_set_background (GTK_XTEXT (panel->priv->xtext), NULL, FALSE);
608
612
                        gtk_xtext_set_alpha (GTK_XTEXT (panel->priv->xtext), transparency);