changeset 3471:95d8ceb5e1d7 trunk

Automated merge with ssh://hg.atheme.org//hg/audacious

--- a/.hgtags	Sun Sep 09 22:58:43 2007 +0300
+++ b/.hgtags	Sun Sep 09 22:59:36 2007 +0300
@@ -2,3 +2,5 @@
 40b4b64dfb42c81a6677532097c41037026b0b86 audacious-1.4.0-DR1
 91a5f34b07803a8bae1e162446e40c08ddf33273 audacious-1.4.0-dr2
 e0d1499b428724311766c06e69a288cb10a42b32 audacious-1.4.0-dr3
+e00e1ab06ba63ac4122d2b122b072e299f2ab3f9 audacious-1.4.0-dr3
+45f44e987b127ce4610d9b0c9c3a6463c496f67d audacious-1.4.0-dr3

--- a/src/audacious/dock.c	Sun Sep 09 22:58:43 2007 +0300
+++ b/src/audacious/dock.c	Sun Sep 09 22:59:36 2007 +0300
@@ -224,7 +224,6 @@
     for (node = list; node; node = g_list_next(node)) {
         dw = node->data;
         gtk_window_move(dw->w, x + dw->offset_x, y + dw->offset_y);
-        gdk_flush();
     }
 }
 
@@ -471,7 +470,8 @@
         return;
 
     gtk_window_present(w);
-    gdk_window_get_pointer(GTK_WIDGET(w)->window, &mx, &my, NULL);
+    mx = event->x;
+    my = event->y;
     gtk_object_set_data(GTK_OBJECT(w), "move_offset_x", GINT_TO_POINTER(mx));
     gtk_object_set_data(GTK_OBJECT(w), "move_offset_y", GINT_TO_POINTER(my));
     if (move_list)
@@ -490,12 +490,10 @@
 void
 dock_move_motion(GtkWindow * w, GdkEventMotion * event)
 {
-    gint offset_x, offset_y, win_x, win_y, x, y, mx, my;
+    gint offset_x, offset_y, win_x, win_y, x, y;
     GList *dlist;
     GList *window_list;
 
-    gdk_flush();
-
     if (!gtk_object_get_data(GTK_OBJECT(w), "is_moving"))
         return;
 
@@ -508,10 +506,8 @@
 
     gtk_window_get_position(w, &win_x, &win_y);
 
-    gdk_window_get_pointer(NULL, &mx, &my, NULL);
-
-    x = mx - offset_x;
-    y = my - offset_y;
+    x = event->x_root - offset_x;
+    y = event->y_root - offset_y;
 
     calc_snap_offset(dlist, window_list, x, y, &offset_x, &offset_y);
     x += offset_x;

--- a/src/audacious/ui_playlist_manager.c	Sun Sep 09 22:58:43 2007 +0300
+++ b/src/audacious/ui_playlist_manager.c	Sun Sep 09 22:59:36 2007 +0300
@@ -207,7 +207,7 @@
         GtkWidget *pmenu = (GtkWidget*)g_object_get_data( G_OBJECT(lv) , "menu" );
         gtk_menu_popup( GTK_MENU(pmenu) , NULL , NULL , NULL , NULL ,
                         (event != NULL) ? event->button : 0,
-                        gdk_event_get_time((GdkEvent*)event));
+                        event->time);
         return TRUE;
     }