← Back to branch summary

~noskcaj/ubuntu/trusty/xfce4-session/4.10.1-3

« back to all changes in this revision

Viewing changes to engines/simple/simple.c

  • Committer: Package Import Robot
  • Author(s): Lionel Le Folgoc
  • Date: 2011-09-15 00:05:42 UTC
  • mfrom: (1.1.22 upstream)
  • Revision ID: package-import@ubuntu.com-20110915000542-o9jzfqe68gaaj4tu
Tags: 4.8.2-1ubuntu1
https://launchpad.net/bugs/831772
https://launchpad.net/bugs/781056
* Merge from Debian unstable, remaining Ubuntu changes:
  - debian/control: build-depends on libgconf2-dev and libgnome-keyring-dev
    to enable GNOME services support.
  - debian/rules: pass --enable-gnome --enable-libgnome-keyring to
    dh_auto_configure.
  - debian/patches:
    + 0001-Do-not-always-save-session-with-xfce4-logout-plugin-.patch: let the
      logout panel plugin use the /general/SaveOnExit property. lp: #831772
    + xubuntu_lock-the-screen-on-hibernate-suspend.patch: copy the behavior
      of xfce4-power-manager for consistency.
    + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's
      already an xsession script to do that, and $GDM_LANG might not contain
      a valid locale code.
    + series: apply these patches.
* debian/patches/xubuntu_ignore-gdm-lang.patch: refreshed to apply cleanly.
* This new bugfix release includes updated translations. lp: #781056

Show diffs side-by-side

added added

removed removed

Lines of Context:
engines/simple/simple.c
213
213
simple_next (XfsmSplashEngine *engine, const gchar *text)
214
214
{
215
215
  Simple *simple = (Simple *) engine->user_data;
 
216
  GdkColor shcolor;
216
217
  gint tw, th, tx, ty;
217
218
 
218
219
  pango_layout_set_text (simple->layout, text, -1);
230
231
 
231
232
  gdk_gc_set_clip_rectangle (simple->gc, &simple->textbox);
232
233
 
 
234
  /* draw shadow */
 
235
  shcolor.red = (simple->fgcolor.red + simple->bgcolor.red) / 2;
 
236
  shcolor.green = (simple->fgcolor.green + simple->bgcolor.green) / 2;
 
237
  shcolor.blue = (simple->fgcolor.blue + simple->bgcolor.blue) / 2;
 
238
  shcolor.red = (shcolor.red + shcolor.green + shcolor.blue) / 3;
 
239
  shcolor.green = shcolor.red;
 
240
  shcolor.blue = shcolor.red;
 
241
 
 
242
  gdk_gc_set_rgb_fg_color (simple->gc, &shcolor);
233
243
  gdk_draw_layout (simple->pixmap, simple->gc,
234
244
                   tx + 2, ty + 2, simple->layout);
235
245