use-libwnck.patch

   1 --- mate-panel-1.5.5/applets/wncklet/showdesktop.c.0026 2013-02-08 09:43:14.000000000 +0100
   2 +++ mate-panel-1.5.5/applets/wncklet/showdesktop.c      2013-02-16 00:55:45.699384966 +0100
   3 @@ -30,7 +30,7 @@
   4  #include <gtk/gtk.h>
   5  #include <gdk/gdkx.h>
   6
   7 -#include <libmatewnck/screen.h>
   8 +#include <libwnck/screen.h>
   9
  10  #include "wncklet.h"
  11  #include "showdesktop.h"
  12 @@ -50,7 +50,7 @@ typedef struct {
  13         GtkOrientation orient;
  14         int size;
  15
  16 -       MatewnckScreen* matewnck_screen;
  17 +       WnckScreen* wnck_screen;
  18
  19         guint showing_desktop: 1;
  20         guint button_activate;
  21 @@ -68,7 +68,7 @@ static void update_button_display(ShowDe
  22  static void theme_changed_callback(GtkIconTheme* icon_theme, ShowDesktopData* sdd);
  23
  24  static void button_toggled_callback(GtkWidget* button, ShowDesktopData* sdd);
  25 -static void show_desktop_changed_callback(MatewnckScreen* screen, ShowDesktopData* sdd);
  26 +static void show_desktop_changed_callback(WnckScreen* screen, ShowDesktopData* sdd);
  27
  28  /* this is when the panel orientation changes */
  29
  30 @@ -279,10 +279,10 @@ static void applet_destroyed(GtkWidget*
  31                 sdd->button_activate = 0;
  32         }
  33
  34 -       if (sdd->matewnck_screen != NULL)
  35 +       if (sdd->wnck_screen != NULL)
  36         {
  37 -               g_signal_handlers_disconnect_by_func(sdd->matewnck_screen, show_desktop_changed_callback, sdd);
  38 -               sdd->matewnck_screen = NULL;
  39 +               g_signal_handlers_disconnect_by_func(sdd->wnck_screen, show_desktop_changed_callback, sdd);
  40 +               sdd->wnck_screen = NULL;
  41         }
  42
  43         if (sdd->icon_theme != NULL)
  44 @@ -341,21 +341,21 @@ static void show_desktop_applet_realized
  45
  46         sdd = (ShowDesktopData*) data;
  47
  48 -       if (sdd->matewnck_screen != NULL)
  49 -               g_signal_handlers_disconnect_by_func(sdd->matewnck_screen, show_desktop_changed_callback, sdd);
  50 +       if (sdd->wnck_screen != NULL)
  51 +               g_signal_handlers_disconnect_by_func(sdd->wnck_screen, show_desktop_changed_callback, sdd);
  52
  53         if (sdd->icon_theme != NULL)
  54                 g_signal_handlers_disconnect_by_func(sdd->icon_theme, theme_changed_callback, sdd);
  55
  56         screen = gtk_widget_get_screen(sdd->applet);
  57 -       sdd->matewnck_screen = matewnck_screen_get(gdk_screen_get_number (screen));
  58 +       sdd->wnck_screen = wnck_screen_get(gdk_screen_get_number (screen));
  59
  60 -       if (sdd->matewnck_screen != NULL)
  61 -               wncklet_connect_while_alive(sdd->matewnck_screen, "showing_desktop_changed", G_CALLBACK(show_desktop_changed_callback), sdd, sdd->applet);
  62 +       if (sdd->wnck_screen != NULL)
  63 +               wncklet_connect_while_alive(sdd->wnck_screen, "showing_desktop_changed", G_CALLBACK(show_desktop_changed_callback), sdd, sdd->applet);
  64         else
  65 -               g_warning("Could not get MatewnckScreen!");
  66 +               g_warning("Could not get WnckScreen!");
  67
  68 -       show_desktop_changed_callback(sdd->matewnck_screen, sdd);
  69 +       show_desktop_changed_callback(sdd->wnck_screen, sdd);
  70
  71         sdd->icon_theme = gtk_icon_theme_get_for_screen (screen);
  72         wncklet_connect_while_alive(sdd->icon_theme, "changed", G_CALLBACK(theme_changed_callback), sdd, sdd->applet);
  73 @@ -520,16 +520,16 @@ static void button_toggled_callback(GtkW
  74                 return;
  75         }
  76
  77 -       if (sdd->matewnck_screen != NULL)
  78 -               matewnck_screen_toggle_showing_desktop(sdd->matewnck_screen, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
  79 +       if (sdd->wnck_screen != NULL)
  80 +               wnck_screen_toggle_showing_desktop(sdd->wnck_screen, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
  81
  82         update_button_display (sdd);
  83  }
  84
  85 -static void show_desktop_changed_callback(MatewnckScreen* screen, ShowDesktopData* sdd)
  86 +static void show_desktop_changed_callback(WnckScreen* screen, ShowDesktopData* sdd)
  87  {
  88 -       if (sdd->matewnck_screen != NULL)
  89 -               sdd->showing_desktop = matewnck_screen_get_showing_desktop(sdd->matewnck_screen);
  90 +       if (sdd->wnck_screen != NULL)
  91 +               sdd->showing_desktop = wnck_screen_get_showing_desktop(sdd->wnck_screen);
  92
  93         update_button_state (sdd);
  94  }
  95 --- mate-panel-1.5.5/applets/wncklet/window-list.c.0026 2013-02-08 09:43:14.000000000 +0100
  96 +++ mate-panel-1.5.5/applets/wncklet/window-list.c      2013-02-16 19:11:23.712812046 +0100
  97 @@ -1,6 +1,6 @@
  98  /* -*- mode: C; c-file-style: "linux" -*- */
  99  /*
 100 - * libmatewnck based tasklist applet.
 101 + * libwnck based tasklist applet.
 102   * (C) 2001 Red Hat, Inc
 103   * (C) 2001 Alexander Larsson
 104   *
 105 @@ -19,7 +19,8 @@
 106
 107  #include <glib/gi18n.h>
 108  #include <gtk/gtk.h>
 109 -#include <libmatewnck/libmatewnck.h>
 110 +#define WNCK_I_KNOW_THIS_IS_UNSTABLE
 111 +#include <libwnck/libwnck.h>
 112  #include <gio/gio.h>
 113
 114  #include "wncklet.h"
 115 @@ -33,7 +34,7 @@ typedef struct {
 116         GtkWidget* tasklist;
 117
 118         gboolean include_all_workspaces;
 119 -       MatewnckTasklistGroupingType grouping;
 120 +       WnckTasklistGroupingType grouping;
 121         gboolean move_unminimized_windows;
 122
 123         GtkOrientation orientation;
 124 @@ -71,9 +72,9 @@ static void tasklist_update(TasklistData
 125                 gtk_widget_set_size_request(GTK_WIDGET(tasklist->tasklist), tasklist->size, -1);
 126         }
 127
 128 -       matewnck_tasklist_set_grouping(MATEWNCK_TASKLIST(tasklist->tasklist), tasklist->grouping);
 129 -       matewnck_tasklist_set_include_all_workspaces(MATEWNCK_TASKLIST(tasklist->tasklist), tasklist->include_all_workspaces);
 130 -       matewnck_tasklist_set_switch_workspace_on_unminimize(MATEWNCK_TASKLIST(tasklist->tasklist), tasklist->move_unminimized_windows);
 131 +       wnck_tasklist_set_grouping(WNCK_TASKLIST(tasklist->tasklist), tasklist->grouping);
 132 +       wnck_tasklist_set_include_all_workspaces(WNCK_TASKLIST(tasklist->tasklist), tasklist->include_all_workspaces);
 133 +       wnck_tasklist_set_switch_workspace_on_unminimize(WNCK_TASKLIST(tasklist->tasklist), tasklist->move_unminimized_windows);
 134  }
 135
 136  static void response_cb(GtkWidget* widget, int id, TasklistData* tasklist)
 137 @@ -115,7 +116,7 @@ static void applet_change_orient(MatePan
 138
 139         tasklist->orientation = new_orient;
 140
 141 -       matewnck_tasklist_set_orientation (tasklist->tasklist, new_orient);
 142 +       wnck_tasklist_set_orientation (tasklist->tasklist, new_orient);
 143         tasklist_update(tasklist);
 144  }
 145
 146 @@ -124,11 +125,11 @@ static void applet_change_background(Mat
 147         switch (type)
 148         {
 149                 case PANEL_NO_BACKGROUND:
 150 -                       matewnck_tasklist_set_button_relief(MATEWNCK_TASKLIST(tasklist->tasklist), GTK_RELIEF_NORMAL);
 151 +                       wnck_tasklist_set_button_relief(WNCK_TASKLIST(tasklist->tasklist), GTK_RELIEF_NORMAL);
 152                         break;
 153                 case PANEL_COLOR_BACKGROUND:
 154                 case PANEL_PIXMAP_BACKGROUND:
 155 -                       matewnck_tasklist_set_button_relief(MATEWNCK_TASKLIST(tasklist->tasklist), GTK_RELIEF_NONE);
 156 +                       wnck_tasklist_set_button_relief(WNCK_TASKLIST(tasklist->tasklist), GTK_RELIEF_NONE);
 157                         break;
 158         }
 159  }
 160 @@ -231,18 +232,18 @@ static void display_all_workspaces_chang
 161         tasklist_properties_update_content_radio(tasklist);
 162  }
 163
 164 -static GtkWidget* get_grouping_button(TasklistData* tasklist, MatewnckTasklistGroupingType type)
 165 +static GtkWidget* get_grouping_button(TasklistData* tasklist, WnckTasklistGroupingType type)
 166  {
 167         switch (type)
 168         {
 169                 default:
 170 -               case MATEWNCK_TASKLIST_NEVER_GROUP:
 171 +               case WNCK_TASKLIST_NEVER_GROUP:
 172                         return tasklist->never_group_radio;
 173                         break;
 174 -               case MATEWNCK_TASKLIST_AUTO_GROUP:
 175 +               case WNCK_TASKLIST_AUTO_GROUP:
 176                         return tasklist->auto_group_radio;
 177                         break;
 178 -               case MATEWNCK_TASKLIST_ALWAYS_GROUP:
 179 +               case WNCK_TASKLIST_ALWAYS_GROUP:
 180                         return tasklist->always_group_radio;
 181                         break;
 182         }
 183 @@ -250,7 +251,7 @@ static GtkWidget* get_grouping_button(Ta
 184
 185  static void group_windows_changed(GSettings* settings, gchar* key, TasklistData* tasklist)
 186  {
 187 -       MatewnckTasklistGroupingType type;
 188 +       WnckTasklistGroupingType type;
 189         GtkWidget* button;
 190
 191         type = g_settings_get_enum (settings, key);
 192 @@ -322,11 +323,11 @@ static void applet_size_request(GtkWidge
 193         int len;
 194         const int* size_hints;
 195         GtkRequisition child_req;
 196 -       MatewnckTasklist* matewncktl = MATEWNCK_TASKLIST(tasklist->tasklist);
 197 +       WnckTasklist* wncktl = WNCK_TASKLIST(tasklist->tasklist);
 198
 199         gtk_widget_get_child_requisition(tasklist->applet, &child_req);
 200
 201 -       size_hints = matewnck_tasklist_get_size_hint_list(matewncktl, &len);
 202 +       size_hints = wnck_tasklist_get_size_hint_list(wncktl, &len);
 203         g_assert(len % 2 == 0);
 204
 205         mate_panel_applet_set_size_hints(MATE_PANEL_APPLET(tasklist->applet), size_hints, len, 0);
 206 @@ -413,11 +414,11 @@ gboolean window_list_applet_fill(MatePan
 207                         break;
 208         }
 209
 210 -       tasklist->tasklist = matewnck_tasklist_new(NULL);
 211 +       tasklist->tasklist = wnck_tasklist_new(NULL);
 212
 213 -       matewnck_tasklist_set_orientation (tasklist->tasklist, tasklist->orientation);
 214 +       wnck_tasklist_set_orientation (tasklist->tasklist, tasklist->orientation);
 215
 216 -       matewnck_tasklist_set_icon_loader(MATEWNCK_TASKLIST(tasklist->tasklist), icon_loader_func, tasklist, NULL);
 217 +       wnck_tasklist_set_icon_loader(WNCK_TASKLIST(tasklist->tasklist), icon_loader_func, tasklist, NULL);
 218
 219         g_signal_connect(G_OBJECT(tasklist->tasklist), "destroy", G_CALLBACK(destroy_tasklist), tasklist);
 220
 221 --- mate-panel-1.5.5/applets/wncklet/window-menu.c.0026 2013-02-08 09:43:14.000000000 +0100
 222 +++ mate-panel-1.5.5/applets/wncklet/window-menu.c      2013-02-16 00:55:45.731384647 +0100
 223 @@ -35,7 +35,7 @@
 224  #include <glib/gi18n.h>
 225  #include <gdk/gdkkeysyms.h>
 226
 227 -#include <libmatewnck/selector.h>
 228 +#include <libwnck/selector.h>
 229
 230  #include "wncklet.h"
 231  #include "window-menu.h"
 232 @@ -181,7 +181,7 @@ static void window_menu_size_allocate(Ma
 233  static gboolean window_menu_key_press_event(GtkWidget* widget, GdkEventKey* event, WindowMenu* window_menu)
 234  {
 235         GtkMenuShell* menu_shell;
 236 -       MatewnckSelector* selector;
 237 +       WnckSelector* selector;
 238
 239         switch (event->keyval)
 240         {
 241 @@ -191,7 +191,7 @@ static gboolean window_menu_key_press_ev
 242                 case GDK_Return:
 243                 case GDK_space:
 244                 case GDK_KP_Space:
 245 -                       selector = MATEWNCK_SELECTOR(window_menu->selector);
 246 +                       selector = WNCK_SELECTOR(window_menu->selector);
 247                         /*
 248                          * We need to call _gtk_menu_shell_activate() here as is done in
 249                          * window_key_press_handler in gtkmenubar.c which pops up menu
 250 @@ -251,7 +251,7 @@ gboolean window_menu_applet_fill(MatePan
 251         g_free(ui_path);
 252         g_object_unref(action_group);
 253
 254 -       window_menu->selector = matewnck_selector_new();
 255 +       window_menu->selector = wnck_selector_new();
 256         gtk_container_add(GTK_CONTAINER(window_menu->applet), window_menu->selector);
 257
 258         mate_panel_applet_set_background_widget(MATE_PANEL_APPLET(window_menu->applet), GTK_WIDGET(window_menu->selector));
 259 --- mate-panel-1.5.5/applets/wncklet/wncklet.c.0026     2013-02-08 09:43:14.000000000 +0100
 260 +++ mate-panel-1.5.5/applets/wncklet/wncklet.c  2013-02-16 00:55:45.741384547 +0100
 261 @@ -30,8 +30,8 @@
 262
 263  #include <glib/gi18n.h>
 264  #include <gtk/gtk.h>
 265 -#include <libmatewnck/screen.h>
 266 -#include <libmatewnck/util.h>
 267 +#include <libwnck/screen.h>
 268 +#include <libwnck/util.h>
 269
 270  #include "wncklet.h"
 271  #include "window-menu.h"
 272 @@ -92,16 +92,16 @@ void wncklet_display_help(GtkWidget* wid
 273         }
 274  }
 275
 276 -MatewnckScreen* wncklet_get_screen(GtkWidget* applet)
 277 +WnckScreen* wncklet_get_screen(GtkWidget* applet)
 278  {
 279         int screen_num;
 280
 281         if (!gtk_widget_has_screen(applet))
 282 -               return matewnck_screen_get_default();
 283 +               return wnck_screen_get_default();
 284
 285         screen_num = gdk_screen_get_number(gtk_widget_get_screen(applet));
 286
 287 -       return matewnck_screen_get(screen_num);
 288 +       return wnck_screen_get(screen_num);
 289  }
 290
 291  void wncklet_connect_while_alive(gpointer object, const char* signal, GCallback func, gpointer func_data, gpointer alive_object)
 292 @@ -120,7 +120,7 @@ static gboolean wncklet_factory(MatePane
 293
 294         if (!type_registered)
 295         {
 296 -               matewnck_set_client_type(MATEWNCK_CLIENT_TYPE_PAGER);
 297 +               wnck_set_client_type(WNCK_CLIENT_TYPE_PAGER);
 298                 type_registered = TRUE;
 299         }
 300
 301 --- mate-panel-1.5.5/applets/wncklet/wncklet.h.0026     2013-02-08 09:43:14.000000000 +0100
 302 +++ mate-panel-1.5.5/applets/wncklet/wncklet.h  2013-02-16 00:55:45.751384448 +0100
 303 @@ -24,7 +24,7 @@
 304  #ifndef __WNCKLET_H__
 305  #define __WNCKLET_H__
 306
 307 -#include <libmatewnck/screen.h>
 308 +#include <libwnck/screen.h>
 309
 310  #include <glib.h>
 311  #include <gtk/gtk.h>
 312 @@ -36,7 +36,7 @@ extern "C" {
 313
 314  void wncklet_display_help(GtkWidget* widget, const char* doc_id, const char* link_id, const char* icon_name);
 315
 316 -MatewnckScreen* wncklet_get_screen(GtkWidget* applet);
 317 +WnckScreen* wncklet_get_screen(GtkWidget* applet);
 318
 319  void wncklet_connect_while_alive(gpointer object, const char* signal, GCallback func, gpointer func_data, gpointer alive_object);
 320
 321 --- mate-panel-1.5.5/applets/wncklet/workspace-switcher.c.0026  2013-02-08 09:43:14.000000000 +0100
 322 +++ mate-panel-1.5.5/applets/wncklet/workspace-switcher.c       2013-02-16 00:55:45.763384328 +0100
 323 @@ -1,6 +1,6 @@
 324  /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
 325  /*
 326 - * libmatewnck based pager applet.
 327 + * libwnck based pager applet.
 328   * (C) 2001 Alexander Larsson
 329   * (C) 2001 Red Hat, Inc
 330   *
 331 @@ -21,7 +21,8 @@
 332
 333  #include <glib/gi18n.h>
 334  #include <gtk/gtk.h>
 335 -#include <libmatewnck/libmatewnck.h>
 336 +#define WNCK_I_KNOW_THIS_IS_UNSTABLE
 337 +#include <libwnck/libwnck.h>
 338  #include <gio/gio.h>
 339
 340  #include "workspace-switcher.h"
 341 @@ -53,7 +54,7 @@ typedef struct {
 342
 343         GtkWidget* pager;
 344
 345 -       MatewnckScreen* screen;
 346 +       WnckScreen* screen;
 347         PagerWM wm;
 348
 349         /* Properties: */
 350 @@ -72,7 +73,7 @@ typedef struct {
 351
 352         GtkOrientation orientation;
 353         int n_rows;                             /* for vertical layout this is cols */
 354 -       MatewnckPagerDisplayMode display_mode;
 355 +       WnckPagerDisplayMode display_mode;
 356         gboolean display_all;
 357
 358         GSettings* settings;
 359 @@ -84,14 +85,14 @@ static void display_about_dialog(GtkActi
 360
 361  static void pager_update(PagerData* pager)
 362  {
 363 -       matewnck_pager_set_orientation(MATEWNCK_PAGER(pager->pager), pager->orientation);
 364 -       matewnck_pager_set_n_rows(MATEWNCK_PAGER(pager->pager), pager->n_rows);
 365 -       matewnck_pager_set_show_all(MATEWNCK_PAGER(pager->pager), pager->display_all);
 366 +       wnck_pager_set_orientation(WNCK_PAGER(pager->pager), pager->orientation);
 367 +       wnck_pager_set_n_rows(WNCK_PAGER(pager->pager), pager->n_rows);
 368 +       wnck_pager_set_show_all(WNCK_PAGER(pager->pager), pager->display_all);
 369
 370         if (pager->wm == PAGER_WM_MARCO)
 371 -               matewnck_pager_set_display_mode(MATEWNCK_PAGER(pager->pager), pager->display_mode);
 372 +               wnck_pager_set_display_mode(WNCK_PAGER(pager->pager), pager->display_mode);
 373         else
 374 -               matewnck_pager_set_display_mode(MATEWNCK_PAGER(pager->pager), MATEWNCK_PAGER_DISPLAY_CONTENT);
 375 +               wnck_pager_set_display_mode(WNCK_PAGER(pager->pager), WNCK_PAGER_DISPLAY_CONTENT);
 376  }
 377
 378  static void update_properties_for_wm(PagerData* pager)
 379 @@ -130,11 +131,11 @@ static void update_properties_for_wm(Pag
 380                 gtk_window_reshow_with_initial_size(GTK_WINDOW(pager->properties_dialog));
 381  }
 382
 383 -static void window_manager_changed(MatewnckScreen* screen, PagerData* pager)
 384 +static void window_manager_changed(WnckScreen* screen, PagerData* pager)
 385  {
 386         const char *wm_name;
 387
 388 -       wm_name = matewnck_screen_get_window_manager_name(screen);
 389 +       wm_name = wnck_screen_get_window_manager_name(screen);
 390
 391         if (!wm_name)
 392                 pager->wm = PAGER_WM_UNKNOWN;
 393 @@ -195,13 +196,13 @@ static void applet_change_background(Mat
 394         switch (type)
 395         {
 396                 case PANEL_NO_BACKGROUND:
 397 -                       matewnck_pager_set_shadow_type(MATEWNCK_PAGER(pager->pager), GTK_SHADOW_IN);
 398 +                       wnck_pager_set_shadow_type(WNCK_PAGER(pager->pager), GTK_SHADOW_IN);
 399                         break;
 400                 case PANEL_COLOR_BACKGROUND:
 401 -                       matewnck_pager_set_shadow_type(MATEWNCK_PAGER(pager->pager), GTK_SHADOW_NONE);
 402 +                       wnck_pager_set_shadow_type(WNCK_PAGER(pager->pager), GTK_SHADOW_NONE);
 403                         break;
 404                 case PANEL_PIXMAP_BACKGROUND:
 405 -                       matewnck_pager_set_shadow_type(MATEWNCK_PAGER(pager->pager), GTK_SHADOW_NONE);
 406 +                       wnck_pager_set_shadow_type(WNCK_PAGER(pager->pager), GTK_SHADOW_NONE);
 407                         break;
 408         }
 409  }
 410 @@ -217,8 +218,8 @@ static gboolean applet_scroll(MatePanelA
 411         if (event->type != GDK_SCROLL)
 412                 return FALSE;
 413
 414 -       index = matewnck_workspace_get_number(matewnck_screen_get_active_workspace(pager->screen));
 415 -       n_workspaces = matewnck_screen_get_workspace_count(pager->screen);
 416 +       index = wnck_workspace_get_number(wnck_screen_get_active_workspace(pager->screen));
 417 +       n_workspaces = wnck_screen_get_workspace_count(pager->screen);
 418         n_columns = n_workspaces / pager->n_rows;
 419
 420         if (n_workspaces % pager->n_rows != 0)
 421 @@ -285,7 +286,7 @@ static gboolean applet_scroll(MatePanelA
 422                         break;
 423         }
 424
 425 -       matewnck_workspace_activate(matewnck_screen_get_workspace(pager->screen, index), event->time);
 426 +       wnck_workspace_activate(wnck_screen_get_workspace(pager->screen, index), event->time);
 427
 428         return TRUE;
 429  }
 430 @@ -350,11 +351,11 @@ static void display_workspace_names_chan
 431
 432         if (value)
 433         {
 434 -               pager->display_mode = MATEWNCK_PAGER_DISPLAY_NAME;
 435 +               pager->display_mode = WNCK_PAGER_DISPLAY_NAME;
 436         }
 437         else
 438         {
 439 -               pager->display_mode = MATEWNCK_PAGER_DISPLAY_CONTENT;
 440 +               pager->display_mode = WNCK_PAGER_DISPLAY_CONTENT;
 441         }
 442
 443         pager_update(pager);
 444 @@ -435,11 +436,11 @@ gboolean workspace_switcher_applet_fill(
 445
 446         if (display_names)
 447         {
 448 -               pager->display_mode = MATEWNCK_PAGER_DISPLAY_NAME;
 449 +               pager->display_mode = WNCK_PAGER_DISPLAY_NAME;
 450         }
 451         else
 452         {
 453 -               pager->display_mode = MATEWNCK_PAGER_DISPLAY_CONTENT;
 454 +               pager->display_mode = WNCK_PAGER_DISPLAY_CONTENT;
 455         }
 456
 457         pager->display_all = g_settings_get_boolean(pager->settings, "display-all-workspaces");
 458 @@ -457,10 +458,10 @@ gboolean workspace_switcher_applet_fill(
 459                         break;
 460         }
 461
 462 -       pager->pager = matewnck_pager_new(NULL);
 463 +       pager->pager = wnck_pager_new(NULL);
 464         pager->screen = NULL;
 465         pager->wm = PAGER_WM_UNKNOWN;
 466 -       matewnck_pager_set_shadow_type(MATEWNCK_PAGER(pager->pager), GTK_SHADOW_IN);
 467 +       wnck_pager_set_shadow_type(WNCK_PAGER(pager->pager), GTK_SHADOW_IN);
 468
 469         g_signal_connect(G_OBJECT(pager->pager), "destroy", G_CALLBACK(destroy_pager), pager);
 470
 471 @@ -556,10 +557,10 @@ static void num_rows_value_changed(GtkSp
 472  static void update_workspaces_model(PagerData* pager)
 473  {
 474         int nr_ws, i;
 475 -       MatewnckWorkspace* workspace;
 476 +       WnckWorkspace* workspace;
 477         GtkTreeIter iter;
 478
 479 -       nr_ws = matewnck_screen_get_workspace_count(pager->screen);
 480 +       nr_ws = wnck_screen_get_workspace_count(pager->screen);
 481
 482         if (pager->properties_dialog)
 483         {
 484 @@ -570,36 +571,36 @@ static void update_workspaces_model(Page
 485
 486                 for (i = 0; i < nr_ws; i++)
 487                 {
 488 -                       workspace = matewnck_screen_get_workspace(pager->screen, i);
 489 +                       workspace = wnck_screen_get_workspace(pager->screen, i);
 490                         gtk_list_store_append(pager->workspaces_store, &iter);
 491 -                       gtk_list_store_set(pager->workspaces_store, &iter, 0, matewnck_workspace_get_name(workspace), -1);
 492 +                       gtk_list_store_set(pager->workspaces_store, &iter, 0, wnck_workspace_get_name(workspace), -1);
 493                 }
 494         }
 495  }
 496
 497 -static void workspace_renamed(MatewnckWorkspace* space, PagerData* pager)
 498 +static void workspace_renamed(WnckWorkspace* space, PagerData* pager)
 499  {
 500         int i;
 501         GtkTreeIter iter;
 502
 503 -       i = matewnck_workspace_get_number(space);
 504 +       i = wnck_workspace_get_number(space);
 505
 506         if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(pager->workspaces_store), &iter, NULL, i))
 507 -               gtk_list_store_set(pager->workspaces_store, &iter, 0, matewnck_workspace_get_name(space), -1);
 508 +               gtk_list_store_set(pager->workspaces_store, &iter, 0, wnck_workspace_get_name(space), -1);
 509  }
 510
 511 -static void workspace_created(MatewnckScreen* screen, MatewnckWorkspace* space, PagerData* pager)
 512 +static void workspace_created(WnckScreen* screen, WnckWorkspace* space, PagerData* pager)
 513  {
 514 -       g_return_if_fail(MATEWNCK_IS_SCREEN(screen));
 515 +       g_return_if_fail(WNCK_IS_SCREEN(screen));
 516
 517         update_workspaces_model(pager);
 518
 519         wncklet_connect_while_alive(space, "name_changed", G_CALLBACK(workspace_renamed), pager, pager->properties_dialog);
 520  }
 521
 522 -static void workspace_destroyed(MatewnckScreen* screen, MatewnckWorkspace* space, PagerData* pager)
 523 +static void workspace_destroyed(WnckScreen* screen, WnckWorkspace* space, PagerData* pager)
 524  {
 525 -       g_return_if_fail(MATEWNCK_IS_SCREEN(screen));
 526 +       g_return_if_fail(WNCK_IS_SCREEN(screen));
 527         update_workspaces_model(pager);
 528  }
 529
 530 @@ -610,7 +611,7 @@ static void num_workspaces_value_changed
 531          * FIXME: remove this if bug 410520 gets fixed. */
 532         button->timer_step = 0.2;
 533
 534 -       matewnck_screen_change_workspace_count(pager->screen, gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(pager->num_workspaces_spin)));
 535 +       wnck_screen_change_workspace_count(pager->screen, gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(pager->num_workspaces_spin)));
 536  }
 537
 538  static gboolean workspaces_tree_focused_out(GtkTreeView* treeview, GdkEventFocus* event, PagerData* pager)
 539 @@ -625,18 +626,18 @@ static gboolean workspaces_tree_focused_
 540  static void workspace_name_edited(GtkCellRendererText* cell_renderer_text, const gchar* path, const gchar* new_text, PagerData* pager)
 541  {
 542         const gint* indices;
 543 -       MatewnckWorkspace* workspace;
 544 +       WnckWorkspace* workspace;
 545         GtkTreePath* p;
 546
 547         p = gtk_tree_path_new_from_string(path);
 548         indices = gtk_tree_path_get_indices(p);
 549 -       workspace = matewnck_screen_get_workspace(pager->screen, indices[0]);
 550 +       workspace = wnck_screen_get_workspace(pager->screen, indices[0]);
 551
 552         if (workspace != NULL)
 553         {
 554                 gchar* temp_name = g_strdup(new_text);
 555
 556 -               matewnck_workspace_change_name(workspace, g_strstrip(temp_name));
 557 +               wnck_workspace_change_name(workspace, g_strstrip(temp_name));
 558
 559                 g_free(temp_name);
 560         }
 561 @@ -772,7 +773,7 @@ static void setup_dialog(GtkBuilder* bui
 562
 563         g_signal_connect(G_OBJECT(pager->display_workspaces_toggle), "toggled", (GCallback) display_workspace_names_toggled, pager);
 564
 565 -       if (pager->display_mode == MATEWNCK_PAGER_DISPLAY_NAME)
 566 +       if (pager->display_mode == WNCK_PAGER_DISPLAY_NAME)
 567         {
 568                 value = TRUE;
 569         }
 570 @@ -813,7 +814,7 @@ static void setup_dialog(GtkBuilder* bui
 571
 572         g_signal_connect(WID("done_button"), "clicked", (GCallback) close_dialog, pager);
 573
 574 -       gtk_spin_button_set_value(GTK_SPIN_BUTTON(pager->num_workspaces_spin), matewnck_screen_get_workspace_count(pager->screen));
 575 +       gtk_spin_button_set_value(GTK_SPIN_BUTTON(pager->num_workspaces_spin), wnck_screen_get_workspace_count(pager->screen));
 576         g_signal_connect(G_OBJECT(pager->num_workspaces_spin), "value_changed", (GCallback) num_workspaces_value_changed, pager);
 577
 578         wncklet_connect_while_alive(pager->screen, "workspace_created", G_CALLBACK(workspace_created), pager, pager->properties_dialog);
 579 @@ -833,11 +834,11 @@ static void setup_dialog(GtkBuilder* bui
 580         gtk_tree_view_append_column(GTK_TREE_VIEW(pager->workspaces_tree), column);
 581         g_signal_connect(cell, "edited", (GCallback) workspace_name_edited, pager);
 582
 583 -       nr_ws = matewnck_screen_get_workspace_count(pager->screen);
 584 +       nr_ws = wnck_screen_get_workspace_count(pager->screen);
 585
 586         for (i = 0; i < nr_ws; i++)
 587         {
 588 -               wncklet_connect_while_alive(G_OBJECT(matewnck_screen_get_workspace(pager->screen, i)), "name_changed", G_CALLBACK(workspace_renamed), pager, pager->properties_dialog);
 589 +               wncklet_connect_while_alive(G_OBJECT(wnck_screen_get_workspace(pager->screen, i)), "name_changed", G_CALLBACK(workspace_renamed), pager, pager->properties_dialog);
 590         }
 591
 592         update_properties_for_wm(pager);
 593 --- mate-panel-1.5.5/configure.ac.0026  2013-02-08 09:43:15.000000000 +0100
 594 +++ mate-panel-1.5.5/configure.ac       2013-02-16 19:10:22.952411470 +0100
 595 @@ -61,7 +61,7 @@ GDK_PIXBUF_REQUIRED=2.7.1
 596  PANGO_REQUIRED=1.15.4
 597  GLIB_REQUIRED=2.26
 598  GTK_REQUIRED=2.19.7
 599 -LIBMATEWNCK_REQUIRED=1.5.1
 600 +LIBMATEWNCK_REQUIRED=2.30.0
 601  LIBMATE_MENU_REQUIRED=1.1.0
 602  CAIRO_REQUIRED=1.0.0
 603  MATEWEATHER_REQUIRED=1.5.0
 604 @@ -100,7 +100,7 @@ PKG_CHECK_MODULES(NOTIFICATION_AREA, gtk
 605  AC_SUBST(NOTIFICATION_AREA_CFLAGS)
 606  AC_SUBST(NOTIFICATION_AREA_LIBS)
 607
 608 -PKG_CHECK_MODULES(WNCKLET, gtk+-2.0 >= $GTK_REQUIRED libmatewnck >= $LIBMATEWNCK_REQUIRED)
 609 +PKG_CHECK_MODULES(WNCKLET, gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBMATEWNCK_REQUIRED)
 610  AC_SUBST(WNCKLET_CFLAGS)
 611  AC_SUBST(WNCKLET_LIBS)
 612