all: Remove deprecated API and change API that had deprecated arguments

The following deprecated API got removed:
 wnck_screen_get_workspace_index
 wnck_screen_get_workspace_neighbor
 wnck_pager_set_screen
 wnck_tasklist_set_minimum_width
 wnck_tasklist_get_minimum_width
 wnck_tasklist_set_minimum_height
 wnck_tasklist_get_minimum_height
 wnck_tasklist_set_screen
 wnck_gtk_window_set_dock_type
 wnck_create_window_action_menu

The following API don't take a WnckScreen argument anymore:
 wnck_pager_new
 wnck_tasklist_new

17 files changed, 10 insertions, 383 deletions

diff --git a/doc/tmpl/misc.sgml b/doc/tmpl/misc.sgml
index 5949d05..6fbc3cf 100644
--- a/doc/tmpl/misc.sgml
+++ b/doc/tmpl/misc.sgml
@@ -20,14 +20,6 @@ Miscellaneous Functions
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### FUNCTION wnck_gtk_window_set_dock_type ##### -->
-<para>
-
-</para>
-
-@window: 
-
-
 <!-- ##### ENUM WnckClientType ##### -->
 <para>
 
diff --git a/doc/tmpl/pager.sgml b/doc/tmpl/pager.sgml
index c709812..8d100a4 100644
--- a/doc/tmpl/pager.sgml
+++ b/doc/tmpl/pager.sgml
@@ -31,19 +31,10 @@ WnckPager
 
 </para>
 
-@screen: 
+@void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION wnck_pager_set_screen ##### -->
-<para>
-
-</para>
-
-@pager: 
-@screen: 
-
-
 <!-- ##### FUNCTION wnck_pager_set_orientation ##### -->
 <para>
 
diff --git a/doc/tmpl/screen.sgml b/doc/tmpl/screen.sgml
index bcc1848..062ce2a 100644
--- a/doc/tmpl/screen.sgml
+++ b/doc/tmpl/screen.sgml
@@ -286,16 +286,6 @@ WnckScreen
 @Returns: 
 
 
-<!-- ##### FUNCTION wnck_screen_get_workspace_index ##### -->
-<para>
-
-</para>
-
-@screen: 
-@space: 
-@Returns: 
-
-
 <!-- ##### ENUM WnckMotionDirection ##### -->
 <para>
 
@@ -306,17 +296,6 @@ WnckScreen
 @WNCK_MOTION_LEFT: 
 @WNCK_MOTION_RIGHT: 
 
-<!-- ##### FUNCTION wnck_screen_get_workspace_neighbor ##### -->
-<para>
-
-</para>
-
-@screen: 
-@space: 
-@direction: 
-@Returns: 
-
-
 <!-- ##### FUNCTION wnck_screen_get_workspace_count ##### -->
 <para>
 
diff --git a/doc/tmpl/tasklist.sgml b/doc/tmpl/tasklist.sgml
index bbd87ef..2950f70 100644
--- a/doc/tmpl/tasklist.sgml
+++ b/doc/tmpl/tasklist.sgml
@@ -51,19 +51,10 @@ WnckTasklist
 
 </para>
 
-@screen: 
+@void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION wnck_tasklist_set_screen ##### -->
-<para>
-
-</para>
-
-@tasklist: 
-@screen: 
-
-
 <!-- ##### ENUM WnckTasklistGroupingType ##### -->
 <para>
 
@@ -118,42 +109,6 @@ WnckTasklist
 @relief: 
 
 
-<!-- ##### FUNCTION wnck_tasklist_get_minimum_width ##### -->
-<para>
-
-</para>
-
-@tasklist: 
-@Returns: 
-
-
-<!-- ##### FUNCTION wnck_tasklist_set_minimum_width ##### -->
-<para>
-
-</para>
-
-@tasklist: 
-@size: 
-
-
-<!-- ##### FUNCTION wnck_tasklist_get_minimum_height ##### -->
-<para>
-
-</para>
-
-@tasklist: 
-@Returns: 
-
-
-<!-- ##### FUNCTION wnck_tasklist_set_minimum_height ##### -->
-<para>
-
-</para>
-
-@tasklist: 
-@size: 
-
-
 <!-- ##### USER_FUNCTION WnckLoadIconFunction ##### -->
 <para>
 
diff --git a/doc/tmpl/window-action-menu.sgml b/doc/tmpl/window-action-menu.sgml
index b9448d5..776b4f8 100644
--- a/doc/tmpl/window-action-menu.sgml
+++ b/doc/tmpl/window-action-menu.sgml
@@ -40,12 +40,3 @@ WnckActionMenu
 @Returns: 
 
 
-<!-- ##### FUNCTION wnck_create_window_action_menu ##### -->
-<para>
-
-</para>
-
-@window: 
-@Returns: 
-
-
diff --git a/libwnck/pager.c b/libwnck/pager.c
index 2f28bf4..27aabb8 100644
--- a/libwnck/pager.c
+++ b/libwnck/pager.c
@@ -24,8 +24,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#undef WNCK_DISABLE_DEPRECATED
-
 #include <config.h>
 
 #include <math.h>
@@ -1920,22 +1918,6 @@ wnck_pager_focus (GtkWidget        *widget,
   return GTK_WIDGET_CLASS (wnck_pager_parent_class)->focus (widget, direction);
 }
 
-/**
- * wnck_pager_set_screen:
- * @pager: a #WnckPager.
- * @screen: a #WnckScreen.
- *
- * Does nothing.
- *
- * Since: 2.2
- * Deprecated:2.20:
- */
-void
-wnck_pager_set_screen (WnckPager  *pager,
-		       WnckScreen *screen)
-{
-}
-
 static gboolean
 wnck_pager_query_tooltip (GtkWidget  *widget,
                           gint        x,
@@ -1991,16 +1973,14 @@ wnck_pager_query_tooltip (GtkWidget  *widget,
 
 /**
  * wnck_pager_new:
- * @screen: deprecated argument, can be %NULL.
  *
  * Creates a new #WnckPager. The #WnckPager will show the #WnckWorkspace of the
  * #WnckScreen it is on.
  *
  * Return value: a newly created #WnckPager.
  */
-/* TODO: when we break API again, remove the screen from here */
 GtkWidget*
-wnck_pager_new (WnckScreen *screen)
+wnck_pager_new (void)
 {
   WnckPager *pager;
 
diff --git a/libwnck/pager.h b/libwnck/pager.h
index 9104755..1234cff 100644
--- a/libwnck/pager.h
+++ b/libwnck/pager.h
@@ -80,7 +80,7 @@ typedef enum {
 
 GType wnck_pager_get_type (void) G_GNUC_CONST;
 
-GtkWidget* wnck_pager_new (WnckScreen *screen);
+GtkWidget* wnck_pager_new (void);
 
 gboolean wnck_pager_set_orientation (WnckPager         *pager,
 				     GtkOrientation     orientation);
@@ -93,14 +93,6 @@ void wnck_pager_set_show_all     (WnckPager            *pager,
 void wnck_pager_set_shadow_type  (WnckPager	       *pager,
 				  GtkShadowType		shadow_type);
 
-
-#ifndef WNCK_DISABLE_DEPRECATED
-void wnck_pager_set_screen       (WnckPager            *pager,
-				  WnckScreen           *screen);
-#endif /* WNCK_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* WNCK_PAGER_H */
-
-
diff --git a/libwnck/screen.c b/libwnck/screen.c
index f11dd7f..d51b472 100644
--- a/libwnck/screen.c
+++ b/libwnck/screen.c
@@ -795,42 +795,6 @@ wnck_screen_get_workspace (WnckScreen *screen,
 }
 
 /**
- * wnck_screen_get_workspace_index:
- * @screen: a #WnckScreen.
- * @space: a #WnckWorkspace.
- *
- * Gets the index of @space on @screen. The first #WnckWorkspace has an
- * index of 0. See also wnck_workspace_get_number().
- *
- * Return value: the index of @space on @screen, or -1 on errors.
- *
- * Since: 2.14
- * Deprecated:2.20: Use wnck_workspace_get_number() instead.
- **/
-int
-wnck_screen_get_workspace_index (WnckScreen    *screen,
-                                 WnckWorkspace *space)
-{
-  GList *tmp;
-  int i;
-
-  g_return_val_if_fail (WNCK_IS_SCREEN (screen), -1);
-
-  i = 0;
-  tmp = screen->priv->workspaces;
-  while (tmp != NULL)
-    {
-      if (tmp->data == space)
-        return i;
-
-      ++i;
-
-      tmp = tmp->next;
-    }
-  return -1; /* compiler warnings */
-}
-
-/**
  * wnck_screen_get_active_workspace:
  * @screen: a #WnckScreen.
  *
@@ -851,72 +815,6 @@ wnck_screen_get_active_workspace (WnckScreen *screen)
 }
 
 /**
- * wnck_screen_get_workspace_neighbor:
- * @screen: a #WnckScreen.
- * @space: a #WnckWorkspace.
- * @direction: direction in which to search the neighbor.
- *
- * Gets the neighbor #WnckWorkspace of @space in the @direction direction on
- * @screen.
- *
- * Return value: (transfer none): the neighbor #WnckWorkspace of @space in the
- * @direction direction on @screen, or %NULL if no such neighbor #WnckWorkspace
- * exists. The returned #WnckWorkspace is owned by libwnck and must not be
- * referenced or unreferenced.
- *
- * Since: 2.14
- * Deprecated:2.20: Use wnck_workspace_get_neighbor() instead.
- **/
-WnckWorkspace*
-wnck_screen_get_workspace_neighbor (WnckScreen         *screen,
-                                    WnckWorkspace      *space,
-                                    WnckMotionDirection direction)
-{
-  WnckWorkspaceLayout layout;
-  int i, space_index;
-
-  g_return_val_if_fail (WNCK_IS_SCREEN (screen), NULL);
-
-  space_index = wnck_screen_get_workspace_index (screen, space);
-
-  wnck_screen_calc_workspace_layout (screen, -1,
-                                     space_index, &layout);
-
-  switch (direction)
-    {
-    case WNCK_MOTION_LEFT:
-      layout.current_col -= 1;
-      break;
-    case WNCK_MOTION_RIGHT:
-      layout.current_col += 1;
-      break;
-    case WNCK_MOTION_UP:
-      layout.current_row -= 1;
-      break;
-    case WNCK_MOTION_DOWN:
-      layout.current_row += 1;
-      break;
-    }
-
-  if (layout.current_col < 0)
-    layout.current_col = 0;
-  if (layout.current_col >= layout.cols)
-    layout.current_col = layout.cols - 1;
-  if (layout.current_row < 0)
-    layout.current_row = 0;
-  if (layout.current_row >= layout.rows)
-    layout.current_row = layout.rows - 1;
-
-  i = layout.grid[layout.current_row * layout.cols + layout.current_col];
-
-  if (i < 0)
-    i = space_index;
-
-  wnck_screen_free_workspace_layout (&layout);
-  return wnck_screen_get_workspace (screen, i);
-}
-
-/**
  * wnck_screen_get_active_window:
  * @screen: a #WnckScreen.
  *
diff --git a/libwnck/screen.h b/libwnck/screen.h
index ee95a17..23e9cff 100644
--- a/libwnck/screen.h
+++ b/libwnck/screen.h
@@ -222,13 +222,6 @@ WnckScreen*    wnck_screen_get_for_root             (gulong      root_window_id)
 int            wnck_screen_get_number               (WnckScreen *screen);
 WnckWorkspace* wnck_screen_get_workspace            (WnckScreen *screen,
                                                      int         workspace);
-#ifndef WNCK_DISABLE_DEPRECATED
-int            wnck_screen_get_workspace_index      (WnckScreen    *screen,
-                                                     WnckWorkspace *space);
-WnckWorkspace* wnck_screen_get_workspace_neighbor   (WnckScreen         *screen,
-                                                     WnckWorkspace      *space,
-                                                     WnckMotionDirection direction);
-#endif /* WNCK_DISABLE_DEPRECATED */
 WnckWorkspace* wnck_screen_get_active_workspace     (WnckScreen *screen);
 GList*         wnck_screen_get_workspaces           (WnckScreen *screen);
 WnckWindow*    wnck_screen_get_active_window        (WnckScreen *screen);
diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
index d3cbeb4..740618a 100644
--- a/libwnck/tasklist.c
+++ b/libwnck/tasklist.c
@@ -23,8 +23,6 @@
  * Boston, MA 02111-1307, USA.
 */
 
-#undef WNCK_DISABLE_DEPRECATED
-
 #include <config.h>
 
 #include <math.h>
@@ -994,66 +992,6 @@ wnck_tasklist_set_grouping_limit (WnckTasklist *tasklist,
 }
 
 /**
- * wnck_tasklist_set_minimum_width:
- * @tasklist: a #WnckTasklist.
- * @size: a minimum width in pixels.
- *
- * Does nothing.
- *
- * Deprecated:2.20:
- */
-void
-wnck_tasklist_set_minimum_width (WnckTasklist *tasklist, gint size)
-{
-}
-
-/**
- * wnck_tasklist_get_minimum_width:
- * @tasklist: a #WnckTasklist.
- *
- * Returns -1.
- *
- * Return value: -1.
- *
- * Deprecated:2.20:
- */
-gint
-wnck_tasklist_get_minimum_width (WnckTasklist *tasklist)
-{
-  return -1;
-}
-
-/**
- * wnck_tasklist_set_minimum_height:
- * @tasklist: a #WnckTasklist.
- * @size: a minimum height in pixels.
- *
- * Does nothing.
- *
- * Deprecated:2.20:
- */
-void
-wnck_tasklist_set_minimum_height (WnckTasklist *tasklist, gint size)
-{
-}
-
-/**
- * wnck_tasklist_get_minimum_height:
- * @tasklist: a #WnckTasklist.
- *
- * Returns -1.
- *
- * Return value: -1.
- *
- * Deprecated:2.20:
- */
-gint
-wnck_tasklist_get_minimum_height (WnckTasklist *tasklist)
-{
-  return -1;
-}
-
-/**
  * wnck_tasklist_set_icon_loader:
  * @tasklist: a #WnckTasklist
  * @load_icon_func: icon loader function
@@ -1911,22 +1849,6 @@ wnck_tasklist_disconnect_screen (WnckTasklist *tasklist)
 #endif
 }
 
-/**
- * wnck_tasklist_set_screen:
- * @tasklist: a #WnckTasklist.
- * @screen: a #WnckScreen.
- *
- * Does nothing.
- *
- * Since: 2.2
- * Deprecated:2.20:
- */
-void
-wnck_tasklist_set_screen (WnckTasklist *tasklist,
-			  WnckScreen   *screen)
-{
-}
-
 static gboolean
 wnck_tasklist_scroll_cb (WnckTasklist *tasklist,
                          GdkEventScroll *event,
@@ -2051,16 +1973,14 @@ wnck_tasklist_scroll_cb (WnckTasklist *tasklist,
 
 /**
  * wnck_tasklist_new:
- * @screen: deprecated argument, can be %NULL.
  *
  * Creates a new #WnckTasklist. The #WnckTasklist will list #WnckWindow of the
  * #WnckScreen it is on.
  *
  * Return value: a newly created #WnckTasklist.
  */
-/* TODO: when we break API again, remove the screen from here */
 GtkWidget*
-wnck_tasklist_new (WnckScreen *screen)
+wnck_tasklist_new (void)
 {
   WnckTasklist *tasklist;
 
diff --git a/libwnck/tasklist.h b/libwnck/tasklist.h
index fca3011..0b9f9ca 100644
--- a/libwnck/tasklist.h
+++ b/libwnck/tasklist.h
@@ -85,7 +85,7 @@ typedef enum {
 
 GType wnck_tasklist_get_type (void) G_GNUC_CONST;
 
-GtkWidget *wnck_tasklist_new (WnckScreen *screen);
+GtkWidget *wnck_tasklist_new (void);
 const int *wnck_tasklist_get_size_hint_list (WnckTasklist  *tasklist,
 					      int           *n_elements);
 
@@ -99,12 +99,6 @@ void wnck_tasklist_set_include_all_workspaces (WnckTasklist *tasklist,
 					       gboolean      include_all_workspaces);
 void wnck_tasklist_set_button_relief (WnckTasklist *tasklist,
                                       GtkReliefStyle relief);
-#ifndef WNCK_DISABLE_DEPRECATED
-void wnck_tasklist_set_minimum_width (WnckTasklist *tasklist, gint size);
-gint wnck_tasklist_get_minimum_width (WnckTasklist *tasklist);
-void wnck_tasklist_set_minimum_height (WnckTasklist *tasklist, gint size);
-gint wnck_tasklist_get_minimum_height (WnckTasklist *tasklist);
-#endif /* WNCK_DISABLE_DEPRECATED */
 
 /**
  * WnckLoadIconFunction:
@@ -133,14 +127,6 @@ void wnck_tasklist_set_icon_loader (WnckTasklist         *tasklist,
                                     void                 *data,
                                     GDestroyNotify        free_data_func);
 
-
-#ifndef WNCK_DISABLE_DEPRECATED
-void       wnck_tasklist_set_screen (WnckTasklist *tasklist,
-				     WnckScreen   *screen);
-#endif /* WNCK_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* WNCK_TASKLIST_H */
-
-
diff --git a/libwnck/test-pager.c b/libwnck/test-pager.c
index 0d11422..5977d88 100644
--- a/libwnck/test-pager.c
+++ b/libwnck/test-pager.c
@@ -19,8 +19,7 @@ static GOptionEntry entries[] = {
 };
 
 static void
-create_pager_window (WnckScreen *screen,
-                     GtkOrientation orientation,
+create_pager_window (GtkOrientation orientation,
 		     gboolean       show_all,
 		     WnckPagerDisplayMode mode,
 		     int n_rows)
@@ -45,7 +44,7 @@ create_pager_window (WnckScreen *screen,
                     G_CALLBACK (gtk_main_quit),
                     NULL);
 
-  pager = wnck_pager_new (screen);
+  pager = wnck_pager_new ();
 
   wnck_pager_set_show_all (WNCK_PAGER (pager), show_all);
   wnck_pager_set_display_mode (WNCK_PAGER (pager), mode);
@@ -93,7 +92,7 @@ main (int argc, char **argv)
   else
 	  mode = WNCK_PAGER_DISPLAY_CONTENT;
 
-  create_pager_window (screen, orientation, !only_current, mode, n_rows);
+  create_pager_window (orientation, !only_current, mode, n_rows);
 
   gtk_main ();
 
diff --git a/libwnck/test-tasklist.c b/libwnck/test-tasklist.c
index 19f38f7..359da4c 100644
--- a/libwnck/test-tasklist.c
+++ b/libwnck/test-tasklist.c
@@ -82,7 +82,7 @@ main (int argc, char **argv)
                     G_CALLBACK (gtk_main_quit),
                     NULL);
 
-  tasklist = wnck_tasklist_new (screen);
+  tasklist = wnck_tasklist_new ();
 
   wnck_tasklist_set_include_all_workspaces (WNCK_TASKLIST (tasklist), display_all);
   if (always_group)
diff --git a/libwnck/util.c b/libwnck/util.c
index b32793e..be7f9af 100644
--- a/libwnck/util.c
+++ b/libwnck/util.c
@@ -21,8 +21,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#undef WNCK_DISABLE_DEPRECATED
-
 #include <config.h>
 
 #include <glib/gi18n-lib.h>
@@ -56,23 +54,6 @@
  * libwcnk users.
  */
 
-/**
- * wnck_gtk_window_set_dock_type:
- * @window: a <classname>GtkWindow</classname>.
- *
- * Sets the semantic type of @window to %WNCK_WINDOW_DOCK.
- *
- * Deprecated:2.20: Use gdk_window_set_type_hint() instead.
- */
-void
-wnck_gtk_window_set_dock_type (GtkWindow *window)
-{
-  g_return_if_fail (GTK_IS_WINDOW (window));
-
-  gdk_window_set_type_hint (gtk_widget_get_window (GTK_WIDGET (window)),
-		  	    GDK_WINDOW_TYPE_HINT_DOCK);
-}
-
 typedef enum
 {
   WNCK_EXT_UNKNOWN = 0,
diff --git a/libwnck/util.h b/libwnck/util.h
index f1c5e5b..e438386 100644
--- a/libwnck/util.h
+++ b/libwnck/util.h
@@ -106,11 +106,4 @@ void wnck_pid_read_resource_usage (GdkDisplay        *gdk_display,
                                    gulong             pid,
                                    WnckResourceUsage *usage);
 
-
-#ifndef WNCK_DISABLE_DEPRECATED
-void wnck_gtk_window_set_dock_type (GtkWindow *window);
-#endif /* WNCK_DISABLE_DEPRECATED */
-
 #endif /* WNCK_UTIL_H */
-
-
diff --git a/libwnck/window-action-menu.c b/libwnck/window-action-menu.c
index 38fdcba..a37f438 100644
--- a/libwnck/window-action-menu.c
+++ b/libwnck/window-action-menu.c
@@ -21,8 +21,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#undef WNCK_DISABLE_DEPRECATED
-
 #include <config.h>
 
 #include <string.h>
@@ -1225,20 +1223,3 @@ wnck_action_menu_new (WnckWindow *window)
                        "window", window,
                        NULL);
 }
-
-/**
- * wnck_create_window_action_menu:
- * @window: the #WnckWindow for which a menu will be created.
- *
- * Creates a new #WnckActionMenu. The #WnckActionMenu will be filled with menu
- * items for window operations on @window.
- *
- * Return value: a newly created #WnckActionMenu.
- *
- * Deprecated:2.22: Use wnck_action_menu_new() instead.
- */
-GtkWidget*
-wnck_create_window_action_menu (WnckWindow *window)
-{
-	return wnck_action_menu_new (window);
-}
diff --git a/libwnck/window-action-menu.h b/libwnck/window-action-menu.h
index cf5b066..a378055 100644
--- a/libwnck/window-action-menu.h
+++ b/libwnck/window-action-menu.h
@@ -68,10 +68,6 @@ GType wnck_action_menu_get_type (void) G_GNUC_CONST;
 
 GtkWidget* wnck_action_menu_new (WnckWindow *window);
 
-#ifndef WNCK_DISABLE_DEPRECATED
-GtkWidget* wnck_create_window_action_menu (WnckWindow *window);
-#endif /* WNCK_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* WNCK_WINDOW_MENU_H */