diff -u libwnck-2.26.0/debian/changelog libwnck-2.26.0/debian/changelog --- libwnck-2.26.0/debian/changelog +++ libwnck-2.26.0/debian/changelog @@ -1,3 +1,10 @@ +libwnck (2.26.0-0ubuntu2) karmic; urgency=low + + * debian/patches/02_disable_scroll_event.patch: disable mousewheel + capability in tasklist. (LP: #39328) + + -- Andy Matteson Fri, 12 Jun 2009 09:55:37 -0400 + libwnck (2.26.0-0ubuntu1) jaunty; urgency=low * New upstream version only in patch2: unchanged: --- libwnck-2.26.0.orig/debian/patches/02_disable_scroll_event.patch +++ libwnck-2.26.0/debian/patches/02_disable_scroll_event.patch @@ -0,0 +1,153 @@ +diff -Nur -x '*.orig' -x '*~' libwnck-2.26.0/libwnck/tasklist.c libwnck-2.26.0.new/libwnck/tasklist.c +--- libwnck-2.26.0/libwnck/tasklist.c 2009-06-12 12:13:34.563711514 -0400 ++++ libwnck-2.26.0.new/libwnck/tasklist.c 2009-06-12 12:14:36.518436918 -0400 +@@ -307,9 +307,6 @@ + gpointer callback_data); + static void wnck_tasklist_remove (GtkContainer *container, + GtkWidget *widget); +-static gboolean wnck_tasklist_scroll_cb (WnckTasklist *tasklist, +- GdkEventScroll *event, +- gpointer user_data); + static void wnck_tasklist_free_tasks (WnckTasklist *tasklist); + static void wnck_tasklist_update_lists (WnckTasklist *tasklist); + static int wnck_tasklist_layout (GtkAllocation *allocation, +@@ -829,10 +826,6 @@ + type, + n_construct_properties, + construct_properties); +- +- g_signal_connect (obj, "scroll-event", +- G_CALLBACK (wnck_tasklist_scroll_cb), NULL); +- + return obj; + } + +@@ -1987,128 +1980,6 @@ + { + } + +-static gboolean +-wnck_tasklist_scroll_cb (WnckTasklist *tasklist, +- GdkEventScroll *event, +- gpointer user_data) +-{ +- /* use the fact that tasklist->priv->windows is sorted +- * see wnck_tasklist_size_allocate() */ +- GtkTextDirection ltr; +- GList *window; +- gint row = 0; +- gint col = 0; +- +- window = g_list_find (tasklist->priv->windows, +- tasklist->priv->active_task); +- if (window) +- { +- row = WNCK_TASK (window->data)->row; +- col = WNCK_TASK (window->data)->col; +- } +- else +- if (tasklist->priv->activate_timeout_id) +- /* There is no active_task yet, but there will be one after the timeout. +- * It occurs if we change the active task too fast. */ +- return TRUE; +- +- ltr = (gtk_widget_get_direction (GTK_WIDGET (tasklist)) != GTK_TEXT_DIR_RTL); +- +- switch (event->direction) +- { +- case GDK_SCROLL_UP: +- if (!window) +- window = g_list_last (tasklist->priv->windows); +- else +- window = window->prev; +- break; +- +- case GDK_SCROLL_DOWN: +- if (!window) +- window = tasklist->priv->windows; +- else +- window = window->next; +- break; +- +-#define TASKLIST_GET_MOST_LEFT(ltr, window, tasklist) \ +- do \ +- { \ +- if (ltr) \ +- window = tasklist->priv->windows; \ +- else \ +- window = g_list_last (tasklist->priv->windows); \ +- } while (0) +- +-#define TASKLIST_GET_MOST_RIGHT(ltr, window, tasklist) \ +- do \ +- { \ +- if (ltr) \ +- window = g_list_last (tasklist->priv->windows); \ +- else \ +- window = tasklist->priv->windows; \ +- } while (0) +- +- case GDK_SCROLL_LEFT: +- if (!window) +- TASKLIST_GET_MOST_RIGHT (ltr, window, tasklist); +- else +- { +- /* Search the first window on the previous colomn at same row */ +- if (ltr) +- { +- while (window && (WNCK_TASK(window->data)->row != row || +- WNCK_TASK(window->data)->col != col-1)) +- window = window->prev; +- } +- else +- { +- while (window && (WNCK_TASK(window->data)->row != row || +- WNCK_TASK(window->data)->col != col-1)) +- window = window->next; +- } +- /* If no window found, select the top/bottom left one */ +- if (!window) +- TASKLIST_GET_MOST_LEFT (ltr, window, tasklist); +- } +- break; +- +- case GDK_SCROLL_RIGHT: +- if (!window) +- TASKLIST_GET_MOST_LEFT (ltr, window, tasklist); +- else +- { +- /* Search the first window on the next colomn at same row */ +- if (ltr) +- { +- while (window && (WNCK_TASK(window->data)->row != row || +- WNCK_TASK(window->data)->col != col+1)) +- window = window->next; +- } +- else +- { +- while (window && (WNCK_TASK(window->data)->row != row || +- WNCK_TASK(window->data)->col != col+1)) +- window = window->prev; +- } +- /* If no window found, select the top/bottom right one */ +- if (!window) +- TASKLIST_GET_MOST_RIGHT (ltr, window, tasklist); +- } +- break; +- +-#undef TASKLIST_GET_MOST_LEFT +-#undef TASKLIST_GET_MOST_RIGHT +- +- default: +- g_assert_not_reached (); +- } +- +- if (window) +- wnck_tasklist_activate_task_window (window->data, event->time); +- +- return TRUE; +-} +- + /** + * wnck_tasklist_new: + * @screen: deprecated argument, can be %NULL. only in patch2: unchanged: --- libwnck-2.26.0.orig/libwnck/tasklist.loT +++ libwnck-2.26.0/libwnck/tasklist.loT @@ -0,0 +1,7 @@ +# tasklist.lo - a libtool object file +# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.492 2008/01/30 06:40:56) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object.