← 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/text-entry.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/text-entry.c
624
624
{
625
625
        GtkWidget *image;
626
626
        GdkPixmap *pixmap;
627
 
        GdkGC *color;
 
627
        cairo_t *context;
628
628
 
629
629
        pixmap = gdk_pixmap_new (NULL, 16, 16, 24);
630
630
 
631
 
        color = gdk_gc_new (GDK_DRAWABLE (pixmap));
632
 
        gdk_gc_set_foreground (color, &style->dark[GTK_STATE_NORMAL]);
633
 
        gdk_draw_rectangle (GDK_DRAWABLE (pixmap), color, TRUE, 0, 0, 16, 16);
634
 
        gdk_gc_set_foreground (color, &colors[c]);
635
 
        gdk_draw_rectangle (GDK_DRAWABLE (pixmap), color, TRUE, 1, 1, 14, 14);
636
 
        g_object_unref (color);
 
631
        context = gdk_cairo_create (GDK_DRAWABLE (pixmap));
 
632
        gdk_cairo_set_source_color (context, &style->dark[GTK_STATE_NORMAL]);
 
633
        cairo_rectangle (context, 0, 0, 16, 16);
 
634
        cairo_fill (context);
 
635
        gdk_cairo_set_source_color (context, &colors[c]);
 
636
        cairo_rectangle (context, 1, 1, 14, 14);
 
637
        cairo_fill (context);
 
638
        cairo_destroy (context);
637
639
 
638
640
        image = gtk_image_new_from_pixmap (pixmap, NULL);
639
641
        g_object_unref (pixmap);
 
642
 
640
643
        return image;
641
644
}
642
645