← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-panel/trusty-updates

« back to all changes in this revision

Viewing changes to gnome-panel/applet.c

  • Committer: Package Import Robot
  • Author(s): Dmitry Shachnev
  • Date: 2014-02-24 09:50:50 UTC
  • Revision ID: package-import@ubuntu.com-20140224095050-4voujr65att1tq0o
Tags: 1:3.8.0-1ubuntu8
Backport upstream commit to fix moving applets in panel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome-panel/applet.c
557
557
{
558
558
        GtkAllocation   allocation;
559
559
        GtkRequisition  requisition;
560
 
        GdkModifierType modifier_mask;
 
560
        GdkDevice      *device;
561
561
        GdkScreen      *screen;
562
562
        GtkWidget      *parent;
563
563
        int             menu_x = 0;
574
574
        gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL);
575
575
 
576
576
        gdk_window_get_origin (gtk_widget_get_window (applet), &menu_x, &menu_y);
577
 
        gdk_window_get_device_position(gtk_widget_get_window (applet), gtk_get_current_event_device (), &pointer_x, &pointer_y, &modifier_mask);
 
577
        device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (applet)));
 
578
        gdk_window_get_device_position(gtk_widget_get_window (applet), device, &pointer_x, &pointer_y, NULL);
578
579
 
579
580
        gtk_widget_get_allocation (applet, &allocation);
580
581