← Back to branch summary

~sil2100/compiz-core/fglrx_decor_fix

« back to all changes in this revision

Viewing changes to gtk/window-decorator/wnck.c

  • Committer: Daniel van Vugt
  • Date: 2012-03-30 07:31:56 UTC
  • mfrom: (3076.1.1 revert-lim)
  • Revision ID: daniel.van.vugt@canonical.com-20120330073156-zkf1b676o3m2vur2
https://launchpad.net/bugs/962085
Revert locally integrated menus support because it is not being used and
is apparently causing a regression (LP: #962085)

This reverts LP: #931245 and LP: #682788. It is a pure revert of
lp:compiz-core r3036.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/window-decorator/wnck.c
24
24
 */
25
25
 
26
26
#include "gtk-window-decorator.h"
27
 
#include "local-menus.h"
28
27
 
29
28
const gchar *
30
29
get_frame_type (WnckWindow *win)
376
375
                if (cursor[i][j].cursor)
377
376
                    XDefineCursor (xdisplay, d->event_windows[i][j].window,
378
377
                    cursor[i][j].cursor);
379
 
 
380
 
                XGrabButton (xdisplay,
381
 
                             Button1Mask,
382
 
                             AnyModifier,
383
 
                             d->event_windows[i][j].window,
384
 
                             FALSE,
385
 
                             ButtonPressMask |
386
 
                             ButtonReleaseMask |
387
 
                             PointerMotionMask,
388
 
                             GrabModeAsync,
389
 
                             GrabModeAsync,
390
 
                             None,
391
 
                             None);
392
378
            }
393
379
        }
394
380
 
403
389
                           CopyFromParent, CopyFromParent, CopyFromParent,
404
390
                           CWOverrideRedirect | CWEventMask, &attr);
405
391
 
406
 
 
407
 
            XGrabButton (xdisplay,
408
 
                         Button1Mask,
409
 
                         AnyModifier,
410
 
                         d->button_windows[i].window,
411
 
                         FALSE,
412
 
                         ButtonPressMask |
413
 
                         ButtonReleaseMask |
414
 
                         PointerMotionMask,
415
 
                         GrabModeAsync,
416
 
                         GrabModeAsync,
417
 
                         None,
418
 
                         None);
419
 
 
420
392
            d->button_states[i] = 0;
421
393
        }
422
394
    }
770
742
        stick_button_event,
771
743
        unshade_button_event,
772
744
        unabove_button_event,
773
 
        unstick_button_event,
774
 
        window_menu_button_event
 
745
        unstick_button_event
775
746
    };
776
747
 
777
748
    d = calloc (1, sizeof (decor_t));
817
788
window_closed (WnckScreen *screen,
818
789
               WnckWindow *win)
819
790
{
820
 
    local_menu_cache_notify_window_destroyed (wnck_window_get_xid (win));
821
 
 
822
791
    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
823
792
 
824
793
    if (d)