r30583 - in /desktop/unstable/libwnck3/debian: changelog patches/01_tasklist_orientation.patch patches/02_moveresize_static_gravity.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sun Oct 16 07:55:34 UTC 2011
Author: biebl
Date: Sun Oct 16 07:55:34 2011
New Revision: 30583
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30583
Log:
Refesh patches.
Modified:
desktop/unstable/libwnck3/debian/changelog
desktop/unstable/libwnck3/debian/patches/01_tasklist_orientation.patch
desktop/unstable/libwnck3/debian/patches/02_moveresize_static_gravity.patch
Modified: desktop/unstable/libwnck3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/changelog?rev=30583&op=diff
==============================================================================
--- desktop/unstable/libwnck3/debian/changelog [utf-8] (original)
+++ desktop/unstable/libwnck3/debian/changelog [utf-8] Sun Oct 16 07:55:34 2011
@@ -18,6 +18,7 @@
- Bump Build-Depends on intltool to (>= 0.40.6).
* debian/libwnck-3-dev.install:
- Stop installing the .a static library. Disabled by default upstream.
+ * Refesh patches.
-- Michael Biebl <biebl at debian.org> Sun, 16 Oct 2011 09:51:38 +0200
Modified: desktop/unstable/libwnck3/debian/patches/01_tasklist_orientation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/patches/01_tasklist_orientation.patch?rev=30583&op=diff
==============================================================================
--- desktop/unstable/libwnck3/debian/patches/01_tasklist_orientation.patch [utf-8] (original)
+++ desktop/unstable/libwnck3/debian/patches/01_tasklist_orientation.patch [utf-8] Sun Oct 16 07:55:34 2011
@@ -1,11 +1,11 @@
Debian #524117
GNOME #513347 and #86382
-Index: libwnck-2.91.90/libwnck/tasklist.c
+Index: libwnck3-3.1.5/libwnck/tasklist.c
===================================================================
---- libwnck-2.91.90.orig/libwnck/tasklist.c 2011-02-03 16:35:32.000000000 +0100
-+++ libwnck-2.91.90/libwnck/tasklist.c 2011-03-16 20:52:29.663129664 +0100
-@@ -228,6 +228,8 @@ struct _WnckTasklistPrivate
+--- libwnck3-3.1.5.orig/libwnck/tasklist.c 2011-08-17 17:42:38.000000000 +0200
++++ libwnck3-3.1.5/libwnck/tasklist.c 2011-08-17 17:44:50.272788154 +0200
+@@ -228,6 +228,8 @@
GtkReliefStyle relief;
guint drag_start_time;
@@ -14,7 +14,7 @@
};
static GType wnck_task_get_type (void);
-@@ -308,6 +310,7 @@ static int wnck_tasklist_layout
+@@ -308,6 +310,7 @@
int max_width,
int max_height,
int n_buttons,
@@ -22,7 +22,7 @@
int *n_cols_out,
int *n_rows_out);
-@@ -892,6 +895,20 @@ wnck_tasklist_set_button_relief (WnckTas
+@@ -892,6 +895,20 @@
}
/**
@@ -43,53 +43,39 @@
* wnck_tasklist_set_switch_workspace_on_unminimize:
* @tasklist: a #WnckTasklist.
* @switch_workspace_on_unminimize: whether to activate the #WnckWorkspace a
-@@ -1003,25 +1020,35 @@ wnck_tasklist_layout (GtkAllocation *all
+@@ -1003,6 +1020,7 @@
int max_width,
int max_height,
int n_buttons,
-+ GtkOrientation orientation,
++ GtkOrientation orientation,
int *n_cols_out,
int *n_rows_out)
{
- int n_cols, n_rows;
-
-- /* How many rows fit in the allocation */
-- n_rows = allocation->height / max_height;
-+ if (orientation == GTK_ORIENTATION_HORIZONTAL) {
-+ /* How many rows fit in the allocation */
-+ n_rows = allocation->height / max_height;
-
-- /* Don't have more rows than buttons */
-- n_rows = MIN (n_rows, n_buttons);
-+ /* Don't have more rows than buttons */
-+ n_rows = MIN (n_rows, n_buttons);
-
-- /* At least one row */
-- n_rows = MAX (n_rows, 1);
-+ /* At least one row */
-+ n_rows = MAX (n_rows, 1);
-
-- /* We want to use as many rows as possible to limit the width */
-- n_cols = (n_buttons + n_rows - 1) / n_rows;
-+ /* We want to use as many rows as possible to limit the width */
-+ n_cols = (n_buttons + n_rows - 1) / n_rows;
-
-- /* At least one column */
-- n_cols = MAX (n_cols, 1);
-+ /* At least one column */
-+ n_cols = MAX (n_cols, 1);
-+ } else {
-+ n_cols = allocation->width / max_width;
-+ n_cols = MIN(n_cols, n_buttons);
-+ n_cols = MAX(n_cols, 1);
-+
-+ n_rows = (n_buttons + n_cols - 1) / n_cols;
-+ n_rows = MAX(n_rows, 1);
-+ }
+@@ -1014,7 +1032,7 @@
+ *n_rows_out = 0;
+ return 0;
+ }
+-
++ if (orientation == GTK_ORIENTATION_HORIZONTAL) {
+ /* How many rows fit in the allocation */
+ n_rows = allocation->height / max_height;
+
+@@ -1032,6 +1050,14 @@
*n_cols_out = n_cols;
*n_rows_out = n_rows;
-@@ -1226,19 +1253,31 @@ wnck_tasklist_size_request (GtkWidget
++ } else {
++ n_cols = allocation->width / max_width;
++ n_cols = MIN(n_cols, n_buttons);
++ n_cols = MAX(n_cols, 1);
++
++ n_rows = (n_buttons + n_cols - 1) / n_cols;
++ n_rows = MAX(n_rows, 1);
++ }
+
+ return allocation->width / n_cols;
+ }
+@@ -1233,19 +1259,31 @@
tasklist->priv->max_button_width,
tasklist->priv->max_button_height,
n_windows + n_startup_sequences,
@@ -128,7 +114,7 @@
}
while (ungrouped_class_groups != NULL &&
-@@ -1258,29 +1297,56 @@ wnck_tasklist_size_request (GtkWidget
+@@ -1265,29 +1303,56 @@
tasklist->priv->max_button_width,
tasklist->priv->max_button_height,
n_startup_sequences + n_windows - n_grouped_buttons,
@@ -207,7 +193,7 @@
}
g_list_free (ungrouped_class_groups);
-@@ -1302,8 +1368,13 @@ wnck_tasklist_size_request (GtkWidget
+@@ -1309,8 +1374,13 @@
tasklist->priv->size_hints = (int *)g_array_free (array, FALSE);
@@ -223,7 +209,7 @@
}
static void
-@@ -1428,6 +1499,7 @@ wnck_tasklist_size_allocate (GtkWidget
+@@ -1435,6 +1505,7 @@
tasklist->priv->max_button_width,
tasklist->priv->max_button_height,
n_startup_sequences + n_windows,
@@ -231,7 +217,7 @@
&n_cols, &n_rows);
while (ungrouped_class_groups != NULL &&
((tasklist->priv->grouping == WNCK_TASKLIST_ALWAYS_GROUP) ||
-@@ -1473,6 +1545,7 @@ wnck_tasklist_size_allocate (GtkWidget
+@@ -1480,6 +1551,7 @@
tasklist->priv->max_button_width,
tasklist->priv->max_button_height,
n_startup_sequences + n_windows - n_grouped_buttons,
@@ -239,7 +225,7 @@
&n_cols, &n_rows);
}
-@@ -1970,6 +2043,7 @@ wnck_tasklist_new (void)
+@@ -1977,6 +2049,7 @@
WnckTasklist *tasklist;
tasklist = g_object_new (WNCK_TYPE_TASKLIST, NULL);
@@ -247,7 +233,7 @@
return GTK_WIDGET (tasklist);
}
-@@ -4039,7 +4113,6 @@ wnck_task_new_from_window (WnckTasklist
+@@ -4033,7 +4106,6 @@
WnckTask *task;
task = g_object_new (WNCK_TYPE_TASK, NULL);
@@ -255,11 +241,11 @@
task->type = WNCK_TASK_WINDOW;
task->window = g_object_ref (window);
task->class_group = g_object_ref (wnck_window_get_class_group (window));
-Index: libwnck-2.91.90/libwnck/tasklist.h
+Index: libwnck3-3.1.5/libwnck/tasklist.h
===================================================================
---- libwnck-2.91.90.orig/libwnck/tasklist.h 2011-03-16 20:52:37.771631578 +0100
-+++ libwnck-2.91.90/libwnck/tasklist.h 2011-03-16 20:54:04.499131785 +0100
-@@ -103,6 +103,10 @@ void wnck_tasklist_set_include_all_works
+--- libwnck3-3.1.5.orig/libwnck/tasklist.h 2011-03-22 19:51:18.000000000 +0100
++++ libwnck3-3.1.5/libwnck/tasklist.h 2011-08-17 17:44:50.272788154 +0200
+@@ -103,6 +103,10 @@
gboolean include_all_workspaces);
void wnck_tasklist_set_button_relief (WnckTasklist *tasklist,
GtkReliefStyle relief);
Modified: desktop/unstable/libwnck3/debian/patches/02_moveresize_static_gravity.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/patches/02_moveresize_static_gravity.patch?rev=30583&op=diff
==============================================================================
--- desktop/unstable/libwnck3/debian/patches/02_moveresize_static_gravity.patch [utf-8] (original)
+++ desktop/unstable/libwnck3/debian/patches/02_moveresize_static_gravity.patch [utf-8] Sun Oct 16 07:55:34 2011
@@ -11,10 +11,10 @@
libwnck/window-action-menu.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
-Index: libwnck-2.91.6/libwnck/window-action-menu.c
+Index: libwnck-3.2.0/libwnck/window-action-menu.c
===================================================================
---- libwnck-2.91.6.orig/libwnck/window-action-menu.c 2011-02-01 00:12:48.000000000 +1100
-+++ libwnck-2.91.6/libwnck/window-action-menu.c 2011-02-09 16:10:44.111816001 +1100
+--- libwnck-3.2.0.orig/libwnck/window-action-menu.c 2011-10-16 01:08:13.574231724 +0200
++++ libwnck-3.2.0/libwnck/window-action-menu.c 2011-10-16 01:08:24.514094191 +0200
@@ -231,7 +231,7 @@
width = wnck_screen_get_width (screen);
wnck_window_get_geometry (window, &xw, &yw, &ww, &hw);
@@ -51,7 +51,7 @@
WNCK_WINDOW_CHANGE_X | WNCK_WINDOW_CHANGE_Y,
xw, yw + height,
ww, hw);
-@@ -338,7 +338,7 @@
+@@ -334,7 +334,7 @@
viewport_y = wnck_workspace_get_viewport_y (workspace);
wnck_window_unstick (window);
More information about the pkg-gnome-commits
mailing list