← Back to branch summary

~ubuntu-branches/ubuntu/vivid/compiz/vivid

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Chris Townsend, Alberts Muktupāvels
  • Date: 2014-07-07 11:42:19 UTC
  • mfrom: (3248.176.40)
  • Revision ID: package-import@ubuntu.com-20140707114219-ipum407fkn7ed64h
Tags: 1:0.9.11+14.10.20140707-0ubuntu1
https://launchpad.net/bugs/1330198
[ Chris Townsend ]
* Release version 0.9.11
* Bump VERSION to 0.9.12
* Add more button ungrab keymasks, so unfocused Gtk window scrolling
  will work when NumLock is off and CapsLock is on and any combination
  thereof. (LP: #1330198)
* Remove the need to check the viewport we are painting the maximized
  window in while in Expo mode and only scale maximized windows that
  are not being dragged. Fixes a regression caused in r3868. (LP:
  #1333277)

[ Alberts Muktupāvels ]
* This is some preparation work to port gtk-window-decorator to gtk+-
  3.0. Changed gtk_object_destroy to gtk_widget_destory. Removed
  support for old metacity versions. Removed support for old wnck
  versions. .

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/window-decorator/events.c
44
44
 
45
45
    if (action_menu_mapped)
46
46
    {
47
 
        gtk_object_destroy (GTK_OBJECT (action_menu));
 
47
        gtk_widget_destroy (action_menu);
48
48
        return;
49
49
    }
50
50
 
134
134
 
135
135
    if (action_menu_mapped && gtkwd_type == GButtonPress)
136
136
    {
137
 
        gtk_object_destroy (GTK_OBJECT (action_menu));
 
137
        gtk_widget_destroy (action_menu);
138
138
    }
139
139
 
140
140
    common_button_event (win, gtkwd_event, gtkwd_type,
161
161
 
162
162
    if (action_menu_mapped && gtkwd_type == GButtonPress)
163
163
    {
164
 
        gtk_object_destroy (GTK_OBJECT (action_menu));
 
164
        gtk_widget_destroy (action_menu);
165
165
    }
166
166
 
167
167
    if (wnck_window_is_maximized (win))
220
220
 
221
221
    if (action_menu_mapped && gtkwd_type == GButtonPress)
222
222
    {
223
 
        gtk_object_destroy (GTK_OBJECT (action_menu));
 
223
        gtk_widget_destroy (action_menu);
224
224
    }
225
225
 
226
226
    common_button_event (win, gtkwd_event, gtkwd_type,
297
297
    case GButtonRelease:
298
298
        if (gtkwd_event->button == 1)
299
299
            if (state == BUTTON_EVENT_ACTION_STATE)
300
 
#ifdef HAVE_LIBWNCK_2_18_1
301
300
                wnck_window_make_above (win);
302
 
#endif
303
301
        break;
304
302
    default:
305
303
        break;
365
363
    case GButtonRelease:
366
364
        if (gtkwd_event->button == 1)
367
365
            if (state == BUTTON_EVENT_ACTION_STATE)
368
 
#ifdef HAVE_LIBWNCK_2_18_1
369
366
                wnck_window_unmake_above (win);
370
 
#endif
371
367
        break;
372
368
    default:
373
369
        break;