← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/compiz/jaunty-proposed

« back to all changes in this revision

Viewing changes to plugins/gconf.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2009-02-10 10:39:03 UTC
  • mfrom: (0.101.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090210103903-lbxs9kycjwydh5s8
Tags: 1:0.7.9+git20090211-0ubuntu1
https://launchpad.net/bugs/274407
https://launchpad.net/bugs/327793
* build from the 0.8 git branch
  - fixes focus problem (LP: #274407)
  - fixes problem with latest libmetacity decoration (LP: #327793)
  - enable new gnomecompat plugin by default
* debian/patches:
 - updated 013-add-cursor-theme-support.patch
 - updated 018_use_metacity_settings.patch
 - updated 029_default_options
 - updated 035_ignore_workspaces
 - updated 037_fullscreen_stacking_fixes.patch (mostly merged upstream
   just the move plugin changes remain)
 - dropped 027_default_to_gnome_terminal
 - dropped 040_resolve-animation-fade-conflict_from_upstream.patch
 - dropped 047_no_display_compiz_desktop.patch
 - dropped 048_from_git_fix_placement.patch
 - dropped 050-scale-keybinding-toggle.patch
 - dropped 051-new-kde4-plasma-api.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/gconf.c
691
691
}
692
692
 
693
693
static void
694
 
gconfSendGLibNotify (CompDisplay *d)
 
694
gconfSendGLibNotify (CompScreen *s)
695
695
{
696
 
    Display *dpy = d->display;
 
696
    Display *dpy = s->display->display;
697
697
    XEvent  xev;
698
698
 
699
699
    xev.xclient.type    = ClientMessage;
701
701
    xev.xclient.format  = 32;
702
702
 
703
703
    xev.xclient.message_type = XInternAtom (dpy, "_COMPIZ_GLIB_NOTIFY", 0);
704
 
    xev.xclient.window       = d->screens->root;
 
704
    xev.xclient.window       = s->root;
705
705
 
706
706
    memset (xev.xclient.data.l, 0, sizeof (xev.xclient.data.l));
707
707
 
708
708
    XSendEvent (dpy,
709
 
                d->screens->root,
 
709
                s->root,
710
710
                FALSE,
711
711
                SubstructureRedirectMask | SubstructureNotifyMask,
712
712
                &xev);
767
767
}
768
768
 
769
769
static Bool
770
 
gconfInitDisplay (CompPlugin  *p,
771
 
                  CompDisplay *d)
 
770
gconfInitScreen (CompPlugin *p,
 
771
                 CompScreen *s)
772
772
{
773
 
    gconfSendGLibNotify (d);
 
773
    gconfSendGLibNotify (s);
774
774
 
775
775
    return TRUE;
776
776
}
781
781
{
782
782
    static InitPluginObjectProc dispTab[] = {
783
783
        (InitPluginObjectProc) gconfInitCore,
784
 
        (InitPluginObjectProc) gconfInitDisplay
 
784
        (InitPluginObjectProc) 0, /* InitDisplay */
 
785
        (InitPluginObjectProc) gconfInitScreen
785
786
    };
786
787
 
787
788
    RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), TRUE, (p, o));