r34845 - in /desktop/unstable/libwnck3/debian: changelog patches/01_tasklist_orientation.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon May 14 17:35:28 2012
New Revision: 34845

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34845
Log:
Refresh debian/patches/01_tasklist_orientation.patch.

Modified:
    desktop/unstable/libwnck3/debian/changelog
    desktop/unstable/libwnck3/debian/patches/01_tasklist_orientation.patch

Modified: desktop/unstable/libwnck3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/changelog?rev=34845&op=diff
==============================================================================
--- desktop/unstable/libwnck3/debian/changelog [utf-8] (original)
+++ desktop/unstable/libwnck3/debian/changelog [utf-8] Mon May 14 17:35:28 2012
@@ -1,6 +1,7 @@
 libwnck3 (3.4.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh debian/patches/01_tasklist_orientation.patch.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 28 Mar 2012 15:41:26 +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=34845&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] Mon May 14 17:35:28 2012
@@ -1,10 +1,10 @@
 Debian #524117
 GNOME #513347 and #86382
 
-Index: libwnck3-3.1.5/libwnck/tasklist.c
+Index: libwnck-3.4.2/libwnck/tasklist.c
 ===================================================================
---- 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
+--- libwnck-3.4.2.orig/libwnck/tasklist.c	2012-05-14 19:29:15.105044384 +0200
++++ libwnck-3.4.2/libwnck/tasklist.c	2012-05-14 19:29:17.501044299 +0200
 @@ -228,6 +228,8 @@
    GtkReliefStyle relief;
  
@@ -22,7 +22,7 @@
  					     int            *n_cols_out,
  					     int            *n_rows_out);
  
-@@ -892,6 +895,20 @@
+@@ -901,6 +904,20 @@
  }
  
  /**
@@ -43,7 +43,7 @@
   * wnck_tasklist_set_switch_workspace_on_unminimize:
   * @tasklist: a #WnckTasklist.
   * @switch_workspace_on_unminimize: whether to activate the #WnckWorkspace a
-@@ -1003,6 +1020,7 @@
+@@ -1012,6 +1029,7 @@
  		      int            max_width,
  		      int            max_height,
  		      int            n_buttons,
@@ -51,7 +51,7 @@
  		      int           *n_cols_out,
  		      int           *n_rows_out)
  {
-@@ -1014,7 +1032,7 @@
+@@ -1023,7 +1041,7 @@
        *n_rows_out = 0;
        return 0;
      }
@@ -60,7 +60,7 @@
    /* How many rows fit in the allocation */
    n_rows = allocation->height / max_height;
  
-@@ -1032,6 +1050,14 @@
+@@ -1041,6 +1059,14 @@
  
    *n_cols_out = n_cols;
    *n_rows_out = n_rows;
@@ -75,7 +75,7 @@
  
    return allocation->width / n_cols;
  }
-@@ -1233,19 +1259,31 @@
+@@ -1242,19 +1268,31 @@
  			tasklist->priv->max_button_width,
  			tasklist->priv->max_button_height,
  			n_windows + n_startup_sequences,
@@ -114,7 +114,7 @@
      }
  
    while (ungrouped_class_groups != NULL &&
-@@ -1265,29 +1303,56 @@
+@@ -1274,29 +1312,56 @@
  			    tasklist->priv->max_button_width,
  			    tasklist->priv->max_button_height,
  			    n_startup_sequences + n_windows - n_grouped_buttons,
@@ -193,7 +193,7 @@
      }
  
    g_list_free (ungrouped_class_groups);
-@@ -1309,8 +1374,13 @@
+@@ -1318,8 +1383,13 @@
  
    tasklist->priv->size_hints = (int *)g_array_free (array, FALSE);
  
@@ -209,7 +209,7 @@
  }
  
  static void
-@@ -1435,6 +1505,7 @@
+@@ -1444,6 +1514,7 @@
  				       tasklist->priv->max_button_width,
  				       tasklist->priv->max_button_height,
  				       n_startup_sequences + n_windows,
@@ -217,7 +217,7 @@
  				       &n_cols, &n_rows);
    while (ungrouped_class_groups != NULL &&
  	 ((tasklist->priv->grouping == WNCK_TASKLIST_ALWAYS_GROUP) ||
-@@ -1480,6 +1551,7 @@
+@@ -1489,6 +1560,7 @@
  					   tasklist->priv->max_button_width,
  					   tasklist->priv->max_button_height,
  					   n_startup_sequences + n_windows - n_grouped_buttons,
@@ -225,7 +225,7 @@
  					   &n_cols, &n_rows);
      }
  
-@@ -1977,6 +2049,7 @@
+@@ -1990,6 +2062,7 @@
    WnckTasklist *tasklist;
  
    tasklist = g_object_new (WNCK_TYPE_TASKLIST, NULL);
@@ -233,7 +233,7 @@
  
    return GTK_WIDGET (tasklist);
  }
-@@ -4033,7 +4106,6 @@
+@@ -4062,7 +4135,6 @@
    WnckTask *task;
  
    task = g_object_new (WNCK_TYPE_TASK, NULL);
@@ -241,10 +241,10 @@
    task->type = WNCK_TASK_WINDOW;
    task->window = g_object_ref (window);
    task->class_group = g_object_ref (wnck_window_get_class_group (window));
-Index: libwnck3-3.1.5/libwnck/tasklist.h
+Index: libwnck-3.4.2/libwnck/tasklist.h
 ===================================================================
---- 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
+--- libwnck-3.4.2.orig/libwnck/tasklist.h	2012-05-14 19:29:15.105044384 +0200
++++ libwnck-3.4.2/libwnck/tasklist.h	2012-05-14 19:29:17.501044299 +0200
 @@ -103,6 +103,10 @@
  					       gboolean      include_all_workspaces);
  void wnck_tasklist_set_button_relief (WnckTasklist *tasklist,