r24975 - in /desktop/unstable/libwnck/debian: changelog patches/01_tasklist_orientation.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Aug 16 14:05:08 2010
New Revision: 24975

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24975
Log:
Revert changes to 01_tasklist_orientation.patch with Emilio’s approval;

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

Modified: desktop/unstable/libwnck/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck/debian/changelog?rev=24975&op=diff
==============================================================================
--- desktop/unstable/libwnck/debian/changelog [utf-8] (original)
+++ desktop/unstable/libwnck/debian/changelog [utf-8] Mon Aug 16 14:05:08 2010
@@ -1,8 +1,5 @@
 libwnck (2.30.0-5) UNRELEASED; urgency=low
 
-  * debian/patches/01_tasklist_orientation.patch:
-    - Remove wnck_tasklist_set_orientation(), it's not needed and we better
-      avoid to add public API downstream.
   * debian/control.in:
     - Standards-Version is 3.9.0, no changes needed.
 

Modified: desktop/unstable/libwnck/debian/patches/01_tasklist_orientation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck/debian/patches/01_tasklist_orientation.patch?rev=24975&op=diff
==============================================================================
--- desktop/unstable/libwnck/debian/patches/01_tasklist_orientation.patch [utf-8] (original)
+++ desktop/unstable/libwnck/debian/patches/01_tasklist_orientation.patch [utf-8] Mon Aug 16 14:05:08 2010
@@ -22,6 +22,27 @@
  					     int            *n_cols_out,
  					     int            *n_rows_out);
  
+@@ -976,6 +979,20 @@ wnck_tasklist_set_button_relief (WnckTas
+ }
+ 
+ /**
++ * wnck_tasklist_set_orientation:
++ * @tasklist: a #WnckTasklist.
++ * @orient: a GtkOrientation.
++ *
++ * Set the orientation of the @taskluist.  The main use of this function is
++ * proper integration of #WnckTasklist in vertical panels.
++ */
++ 
++void wnck_tasklist_set_orientation(WnckTasklist *tasklist, GtkOrientation orient)
++{
++    tasklist->priv->orientation = orient;
++}
++
++/**
+  * wnck_tasklist_set_switch_workspace_on_unminimize:
+  * @tasklist: a #WnckTasklist.
+  * @switch_workspace_on_unminimize: whether to activate the #WnckWorkspace a
 @@ -1147,29 +1164,38 @@ wnck_tasklist_layout (GtkAllocation *all
  		      int            max_width,
  		      int            max_height,
@@ -242,3 +263,16 @@
    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.30.0/libwnck/tasklist.h
+===================================================================
+--- libwnck-2.30.0.orig/libwnck/tasklist.h	2009-04-19 19:40:32.000000000 +0200
++++ libwnck-2.30.0/libwnck/tasklist.h	2010-07-13 19:29:18.489245060 +0200
+@@ -99,6 +99,8 @@ void wnck_tasklist_set_include_all_works
+ 					       gboolean      include_all_workspaces);
+ void wnck_tasklist_set_button_relief (WnckTasklist *tasklist,
+                                       GtkReliefStyle relief);
++void wnck_tasklist_set_orientation(WnckTasklist *tasklist, GtkOrientation orient);
++
+ #ifndef WNCK_DISABLE_DEPRECATED
+ void wnck_tasklist_set_minimum_width (WnckTasklist *tasklist, gint size);
+ gint wnck_tasklist_get_minimum_width (WnckTasklist *tasklist);