1 --- mate-netbook-1.6.0/configure.ac.orig 2013-04-01 16:05:35.000000000 +0200
2 +++ mate-netbook-1.6.0/configure.ac 2014-01-01 14:29:05.696093665 +0100
4 PKG_CHECK_MODULES(MAXIMUS_DEPS,
19 AC_SUBST(MATEWINDOWPICKER_DEPS_CFLAGS)
20 AC_SUBST(MATEWINDOWPICKER_DEPS_LIBS)
21 --- mate-netbook-1.6.0/mate-window-picker-applet/applet.c.orig 2014-01-01 14:42:12.359393985 +0100
22 +++ mate-netbook-1.6.0/mate-window-picker-applet/applet.c 2014-01-01 14:42:24.176060156 +0100
24 #include <glib/gi18n.h>
27 -#include <libmatewnck/libmatewnck.h>
28 +#define WNCK_I_KNOW_THIS_IS_UNSTABLE
29 +#include <libwnck/libwnck.h>
32 #include <mate-panel-applet.h>
33 @@ -138,7 +138,7 @@ cw_applet_fill (MatePanelApplet *applet,
37 - MatewnckScreen *screen;
40 GtkWidget *eb, *tasks, *title;
42 @@ -152,11 +152,11 @@ cw_applet_fill (MatePanelApplet *applet,
43 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
44 textdomain (GETTEXT_PACKAGE);
46 - matewnck_set_client_type (MATEWNCK_CLIENT_TYPE_PAGER);
47 + wnck_set_client_type (WNCK_CLIENT_TYPE_PAGER);
49 app = g_slice_new0 (WinPickerApp);
51 - screen = matewnck_screen_get_default ();
52 + screen = wnck_screen_get_default ();
54 /* prepare to disable Maximus */
55 object_class = G_OBJECT_GET_CLASS (G_OBJECT(applet));
56 --- mate-netbook-1.6.1/mate-window-picker-applet/task-item.c.orig 2014-01-01 19:27:09.000000000 +0100
57 +++ mate-netbook-1.6.1/mate-window-picker-applet/task-item.c 2014-01-02 20:04:54.174955583 +0100
58 @@ -35,8 +35,8 @@ G_DEFINE_TYPE (TaskItem, task_item, GTK_
60 struct _TaskItemPrivate
62 - MatewnckWindow *window;
63 - MatewnckScreen *screen;
69 @@ -66,13 +66,13 @@ update_hints (TaskItem *item)
73 - MatewnckWindow *window;
77 widget = GTK_WIDGET (item);
78 window = item->priv->window;
80 - if (!MATEWNCK_IS_WINDOW (window)) return;
81 + if (!WNCK_IS_WINDOW (window)) return;
82 if (!GTK_IS_WIDGET (widget)) return;
84 /* Skip invisible windows */
85 @@ -99,7 +99,7 @@ update_hints (TaskItem *item)
88 /* Set the minimize hint for the window */
89 - matewnck_window_set_icon_geometry (window, x, y,
90 + wnck_window_set_icon_geometry (window, x, y,
91 widget->allocation.width,
92 widget->allocation.height);
94 @@ -109,9 +109,9 @@ on_task_item_button_released (GtkWidget
95 GdkEventButton *event,
98 - MatewnckWindow *window;
99 - MatewnckScreen *screen;
100 - MatewnckWorkspace *workspace;
101 + WnckWindow *window;
102 + WnckScreen *screen;
103 + WnckWorkspace *workspace;
104 TaskItemPrivate *priv;
106 g_return_val_if_fail (TASK_IS_ITEM (item), TRUE);
107 @@ -119,25 +119,25 @@ on_task_item_button_released (GtkWidget
109 window = priv->window;
111 - g_return_val_if_fail (MATEWNCK_IS_WINDOW (window), TRUE);
112 + g_return_val_if_fail (WNCK_IS_WINDOW (window), TRUE);
114 screen = priv->screen;
115 - workspace = matewnck_window_get_workspace (window);
116 + workspace = wnck_window_get_workspace (window);
118 if (event->button == 1)
121 - if (MATEWNCK_IS_WORKSPACE (workspace) && workspace != matewnck_screen_get_active_workspace (screen))
122 + if (WNCK_IS_WORKSPACE (workspace) && workspace != wnck_screen_get_active_workspace (screen))
124 - matewnck_workspace_activate (workspace, GDK_CURRENT_TIME);
125 + wnck_workspace_activate (workspace, GDK_CURRENT_TIME);
127 - if (matewnck_window_is_active (window))
128 + if (wnck_window_is_active (window))
130 - matewnck_window_minimize (window);
131 + wnck_window_minimize (window);
135 - matewnck_window_activate (window, GDK_CURRENT_TIME);
136 + wnck_window_activate (window, GDK_CURRENT_TIME);
140 @@ -146,15 +146,15 @@ on_task_item_button_released (GtkWidget
142 task_item_set_visibility (TaskItem *item)
144 - MatewnckScreen *screen;
145 - MatewnckWindow *window;
146 - MatewnckWorkspace *workspace;
147 + WnckScreen *screen;
148 + WnckWindow *window;
149 + WnckWorkspace *workspace;
151 g_return_if_fail (TASK_IS_ITEM (item));
153 TaskItemPrivate *priv = item->priv;
155 - if (!MATEWNCK_IS_WINDOW (priv->window))
156 + if (!WNCK_IS_WINDOW (priv->window))
158 gtk_widget_hide (GTK_WIDGET (item));
160 @@ -163,20 +163,20 @@ task_item_set_visibility (TaskItem *item
161 window = priv->window;
163 screen = priv->screen;
164 - workspace = matewnck_screen_get_active_workspace (screen);
165 + workspace = wnck_screen_get_active_workspace (screen);
167 gboolean show_all = task_list_get_show_all_windows (TASK_LIST (task_list_get_default ()));
168 gboolean show_window = FALSE;
170 - if (!matewnck_window_is_skip_tasklist (window))
171 + if (!wnck_window_is_skip_tasklist (window))
173 - if (matewnck_workspace_is_virtual (workspace))
174 + if (wnck_workspace_is_virtual (workspace))
176 - show_window = matewnck_window_is_in_viewport (window, workspace);
177 + show_window = wnck_window_is_in_viewport (window, workspace);
181 - show_window = matewnck_window_is_on_workspace (window, workspace);
182 + show_window = wnck_window_is_on_workspace (window, workspace);
184 show_window = show_window || show_all;
186 @@ -202,16 +202,16 @@ task_item_size_request (GtkWidget *
189 task_item_sized_pixbuf_for_window (TaskItem *item,
190 - MatewnckWindow *window,
191 + WnckWindow *window,
194 GdkPixbuf *pbuf = NULL;
196 - g_return_val_if_fail (MATEWNCK_IS_WINDOW (window), NULL);
197 + g_return_val_if_fail (WNCK_IS_WINDOW (window), NULL);
199 - if (matewnck_window_has_icon_name (window))
200 + if (wnck_window_has_icon_name (window))
202 - const gchar *icon_name = matewnck_window_get_icon_name (window);
203 + const gchar *icon_name = wnck_window_get_icon_name (window);
204 GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
206 if (gtk_icon_theme_has_icon (icon_theme, icon_name))
207 @@ -228,7 +228,7 @@ task_item_sized_pixbuf_for_window (TaskI
211 - pbuf = gdk_pixbuf_copy (matewnck_window_get_icon (item->priv->window));
212 + pbuf = gdk_pixbuf_copy (wnck_window_get_icon (item->priv->window));
215 gint width = gdk_pixbuf_get_width (pbuf);
216 @@ -264,7 +264,7 @@ task_item_expose_event (GtkWidget *
217 item = TASK_ITEM (widget);
220 - g_return_val_if_fail (MATEWNCK_IS_WINDOW (priv->window), FALSE);
221 + g_return_val_if_fail (WNCK_IS_WINDOW (priv->window), FALSE);
224 cr = gdk_cairo_create (event->window);
225 @@ -273,8 +273,8 @@ task_item_expose_event (GtkWidget *
228 gint size = MIN (area.height, area.width);
229 - gboolean active = matewnck_window_is_active (priv->window);
230 - gboolean attention = matewnck_window_or_transient_needs_attention (priv->window);
231 + gboolean active = wnck_window_is_active (priv->window);
232 + gboolean attention = wnck_window_or_transient_needs_attention (priv->window);
234 if (GDK_IS_PIXBUF (pbuf) &&
235 gdk_pixbuf_get_width (pbuf) != size &&
236 @@ -385,14 +385,14 @@ on_button_pressed (GtkWidget *butto
237 GdkEventButton *event,
240 - MatewnckWindow *window;
241 + WnckWindow *window;
242 g_return_val_if_fail (TASK_IS_ITEM (item), FALSE);
243 window = item->priv->window;
244 - g_return_val_if_fail (MATEWNCK_IS_WINDOW (window), FALSE);
245 + g_return_val_if_fail (WNCK_IS_WINDOW (window), FALSE);
247 if (event->button == 3)
249 - GtkWidget *menu = matewnck_action_menu_new (window);
250 + GtkWidget *menu = wnck_action_menu_new (window);
251 gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
252 event->button, event->time);
254 @@ -408,11 +408,11 @@ on_query_tooltip (GtkWidget *widget,
258 - MatewnckWindow *window = item->priv->window;
259 - g_return_val_if_fail (MATEWNCK_IS_WINDOW (window), FALSE);
260 + WnckWindow *window = item->priv->window;
261 + g_return_val_if_fail (WNCK_IS_WINDOW (window), FALSE);
263 - gtk_tooltip_set_text (tooltip, matewnck_window_get_name(window));
264 - gtk_tooltip_set_icon (tooltip, matewnck_window_get_icon (window));
265 + gtk_tooltip_set_text (tooltip, wnck_window_get_name(window));
266 + gtk_tooltip_set_icon (tooltip, wnck_window_get_icon (window));
270 @@ -450,7 +450,7 @@ on_blink (TaskItem *item)
272 gtk_widget_queue_draw (GTK_WIDGET (item));
274 - if (matewnck_window_or_transient_needs_attention (item->priv->window))
275 + if (wnck_window_or_transient_needs_attention (item->priv->window))
279 @@ -462,17 +462,17 @@ on_blink (TaskItem *item)
283 -on_window_state_changed (MatewnckWindow *window,
284 - MatewnckWindowState changed_mask,
285 - MatewnckWindowState new_state,
286 +on_window_state_changed (WnckWindow *window,
287 + WnckWindowState changed_mask,
288 + WnckWindowState new_state,
291 - g_return_if_fail (MATEWNCK_IS_WINDOW (window));
292 + g_return_if_fail (WNCK_IS_WINDOW (window));
293 g_return_if_fail (TASK_IS_ITEM (item));
295 TaskItemPrivate *priv = item->priv;
297 - if (new_state & MATEWNCK_WINDOW_STATE_URGENT && !priv->timer)
298 + if (new_state & WNCK_WINDOW_STATE_URGENT && !priv->timer)
300 priv->timer = g_timeout_add (30, (GSourceFunc)on_blink, item);
301 g_get_current_time (&priv->urgent_time);
302 @@ -482,14 +482,14 @@ on_window_state_changed (MatewnckWindow
306 -on_window_workspace_changed (MatewnckWindow *window, TaskItem *item)
307 +on_window_workspace_changed (WnckWindow *window, TaskItem *item)
309 g_return_if_fail (TASK_IS_ITEM (item));
311 task_item_set_visibility (item);
314 -static void on_window_icon_changed (MatewnckWindow *window, TaskItem *item)
315 +static void on_window_icon_changed (WnckWindow *window, TaskItem *item)
317 TaskItemPrivate *priv;
319 @@ -507,11 +507,11 @@ static void on_window_icon_changed (Mate
323 -on_screen_active_window_changed (MatewnckScreen *screen,
324 - MatewnckWindow *old_window,
325 +on_screen_active_window_changed (WnckScreen *screen,
326 + WnckWindow *old_window,
329 - MatewnckWindow *window;
330 + WnckWindow *window;
331 TaskItemPrivate *priv;
333 g_return_if_fail (TASK_IS_ITEM (item));
334 @@ -519,10 +519,10 @@ on_screen_active_window_changed (Matewnc
336 window = priv->window;
338 - g_return_if_fail (MATEWNCK_IS_WINDOW (window));
339 + g_return_if_fail (WNCK_IS_WINDOW (window));
341 - if ((MATEWNCK_IS_WINDOW (old_window) && window == old_window) ||
342 - window == matewnck_screen_get_active_window (screen))
343 + if ((WNCK_IS_WINDOW (old_window) && window == old_window) ||
344 + window == wnck_screen_get_active_window (screen))
346 /* queue a draw to reflect that we are [no longer] the active window */
347 gtk_widget_queue_draw (GTK_WIDGET (item));
348 @@ -530,8 +530,8 @@ on_screen_active_window_changed (Matewnc
352 -on_screen_active_workspace_changed (MatewnckScreen *screen,
353 - MatewnckWorkspace *old_workspace,
354 +on_screen_active_workspace_changed (WnckScreen *screen,
355 + WnckWorkspace *old_workspace,
358 g_return_if_fail (TASK_IS_ITEM (item));
359 @@ -540,7 +540,7 @@ on_screen_active_workspace_changed (Mate
363 -on_screen_active_viewport_changed (MatewnckScreen *screen,
364 +on_screen_active_viewport_changed (WnckScreen *screen,
367 g_return_if_fail (TASK_IS_ITEM (item));
368 @@ -549,15 +549,15 @@ on_screen_active_viewport_changed (Matew
372 -on_screen_window_closed (MatewnckScreen *screen,
373 - MatewnckWindow *window,
374 +on_screen_window_closed (WnckScreen *screen,
375 + WnckWindow *window,
378 TaskItemPrivate *priv;
380 g_return_if_fail (TASK_IS_ITEM (item));
382 - g_return_if_fail (MATEWNCK_IS_WINDOW (priv->window));
383 + g_return_if_fail (WNCK_IS_WINDOW (priv->window));
385 if (priv->window == window)
387 @@ -583,17 +583,17 @@ activate_window (GtkWidget *widget)
389 priv = TASK_ITEM (widget)->priv;
391 - g_return_val_if_fail (MATEWNCK_IS_WINDOW (priv->window), FALSE);
392 + g_return_val_if_fail (WNCK_IS_WINDOW (priv->window), FALSE);
394 active = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "drag-true"));
398 - MatewnckWindow *window;
399 + WnckWindow *window;
401 window = priv->window;
402 - if (MATEWNCK_IS_WINDOW (window))
403 - matewnck_window_activate (window, time (NULL));
404 + if (WNCK_IS_WINDOW (window))
405 + wnck_window_activate (window, time (NULL));
408 g_object_set_data (G_OBJECT (widget), "drag-true", GINT_TO_POINTER (0));
409 @@ -636,7 +636,7 @@ task_item_setup_atk (TaskItem *item)
410 TaskItemPrivate *priv;
413 - MatewnckWindow *window;
414 + WnckWindow *window;
416 g_return_if_fail (TASK_IS_ITEM (item));
418 @@ -644,11 +644,11 @@ task_item_setup_atk (TaskItem *item)
420 window = priv->window;
422 - g_return_if_fail (MATEWNCK_IS_WINDOW (window));
423 + g_return_if_fail (WNCK_IS_WINDOW (window));
425 atk = gtk_widget_get_accessible (widget);
426 atk_object_set_name (atk, _("Window Task Button"));
427 - atk_object_set_description (atk, matewnck_window_get_name (window));
428 + atk_object_set_description (atk, wnck_window_get_name (window));
429 atk_object_set_role (atk, ATK_ROLE_PUSH_BUTTON);
432 @@ -703,14 +703,14 @@ task_item_init (TaskItem *item)
436 -task_item_new (MatewnckWindow *window)
437 +task_item_new (WnckWindow *window)
439 GtkWidget *item = NULL;
441 TaskItemPrivate *priv;
442 - MatewnckScreen *screen;
443 + WnckScreen *screen;
445 - g_return_val_if_fail (MATEWNCK_IS_WINDOW (window), item);
446 + g_return_val_if_fail (WNCK_IS_WINDOW (window), item);
448 item = g_object_new (TASK_TYPE_ITEM,
450 @@ -725,7 +725,7 @@ task_item_new (MatewnckWindow *window)
452 priv->window = window;
454 - screen = matewnck_window_get_screen (window);
455 + screen = wnck_window_get_screen (window);
456 priv->screen = screen;
458 gtk_drag_dest_set (item,
459 --- mate-netbook-1.6.1/mate-window-picker-applet/task-list.c.orig 2014-01-01 19:27:09.000000000 +0100
460 +++ mate-netbook-1.6.1/mate-window-picker-applet/task-list.c 2014-01-02 20:12:32.018269599 +0100
462 #include "task-list.h"
463 #include "task-item.h"
465 -#include <libmatewnck/libmatewnck.h>
466 +#define WNCK_I_KNOW_THIS_IS_UNSTABLE
467 +#include <libwnck/libwnck.h>
469 G_DEFINE_TYPE (TaskList, task_list, GTK_TYPE_HBOX);
471 @@ -30,7 +31,7 @@ G_DEFINE_TYPE (TaskList, task_list, GTK_
473 struct _TaskListPrivate
475 - MatewnckScreen *screen;
476 + WnckScreen *screen;
477 GHashTable *win_table;
480 @@ -65,22 +66,22 @@ on_task_item_closed (TaskItem *item,
484 -on_window_opened (MatewnckScreen *screen,
485 - MatewnckWindow *window,
486 +on_window_opened (WnckScreen *screen,
487 + WnckWindow *window,
490 TaskListPrivate *priv;
491 - MatewnckWindowType type;
492 + WnckWindowType type;
494 g_return_if_fail (TASK_IS_LIST (list));
497 - type = matewnck_window_get_window_type (window);
498 + type = wnck_window_get_window_type (window);
500 - if (type == MATEWNCK_WINDOW_DESKTOP
501 - || type == MATEWNCK_WINDOW_DOCK
502 - || type == MATEWNCK_WINDOW_SPLASHSCREEN
503 - || type == MATEWNCK_WINDOW_MENU)
504 + if (type == WNCK_WINDOW_DESKTOP
505 + || type == WNCK_WINDOW_DOCK
506 + || type == WNCK_WINDOW_SPLASHSCREEN
507 + || type == WNCK_WINDOW_MENU)
510 GtkWidget *item = task_item_new (window);
511 @@ -178,7 +179,7 @@ task_list_init (TaskList *list)
513 priv = list->priv = TASK_LIST_GET_PRIVATE (list);
515 - priv->screen = matewnck_screen_get_default ();
516 + priv->screen = wnck_screen_get_default ();
518 priv->win_table = g_hash_table_new (NULL, NULL);
520 @@ -224,14 +225,14 @@ task_list_get_desktop_visible (TaskList
522 g_return_val_if_fail (TASK_IS_LIST (list), TRUE);
524 - windows = matewnck_screen_get_windows (list->priv->screen);
525 + windows = wnck_screen_get_windows (list->priv->screen);
526 for (w = windows; w; w = w->next)
528 - MatewnckWindow *window;
529 + WnckWindow *window;
533 - if (MATEWNCK_IS_WINDOW (window) && !matewnck_window_is_minimized (window))
534 + if (WNCK_IS_WINDOW (window) && !wnck_window_is_minimized (window))
535 all_minimised = FALSE;
538 --- mate-netbook-1.6.1/mate-window-picker-applet/task-title.c.orig 2014-01-01 19:27:09.000000000 +0100
539 +++ mate-netbook-1.6.1/mate-window-picker-applet/task-title.c 2014-01-02 20:13:43.351600042 +0100
542 #include "task-title.h"
544 -#include <libmatewnck/libmatewnck.h>
545 +#define WNCK_I_KNOW_THIS_IS_UNSTABLE
546 +#include <libwnck/libwnck.h>
547 #include <mate-panel-applet.h>
549 #include "task-list.h"
550 @@ -35,8 +36,8 @@ G_DEFINE_TYPE (TaskTitle, task_title, GT
552 struct _TaskTitlePrivate
554 - MatewnckScreen *screen;
555 - MatewnckWindow *window;
556 + WnckScreen *screen;
557 + WnckWindow *window;
561 @@ -56,7 +57,7 @@ on_close_clicked (GtkButton *button,
564 TaskTitlePrivate *priv;
565 - MatewnckWindow *window;
566 + WnckWindow *window;
568 g_return_val_if_fail (TASK_IS_TITLE (title), FALSE);
570 @@ -64,10 +65,10 @@ on_close_clicked (GtkButton *button,
571 if (event->button != 1 || !priv->mouse_in_close_button)
574 - window = matewnck_screen_get_active_window (priv->screen);
575 + window = wnck_screen_get_active_window (priv->screen);
577 - if (!MATEWNCK_IS_WINDOW (window)
578 - || matewnck_window_get_window_type (window) == MATEWNCK_WINDOW_DESKTOP)
579 + if (!WNCK_IS_WINDOW (window)
580 + || wnck_window_get_window_type (window) == WNCK_WINDOW_DESKTOP)
582 gdk_spawn_command_line_on_screen (gdk_screen_get_default (),
584 @@ -76,7 +77,7 @@ on_close_clicked (GtkButton *button,
586 if (priv->window == window)
587 disconnect_window (title);
588 - matewnck_window_close (window, GDK_CURRENT_TIME);
589 + wnck_window_close (window, GDK_CURRENT_TIME);
591 gtk_widget_queue_draw (GTK_WIDGET (title));
593 @@ -138,32 +139,32 @@ on_button_expose (GtkWidget *widget,
597 -on_name_changed (MatewnckWindow *window, TaskTitle *title)
598 +on_name_changed (WnckWindow *window, TaskTitle *title)
600 TaskTitlePrivate *priv;
602 g_return_if_fail (TASK_IS_TITLE (title));
603 - g_return_if_fail (MATEWNCK_IS_WINDOW (window));
604 + g_return_if_fail (WNCK_IS_WINDOW (window));
607 if (priv->window != window)
610 gtk_label_set_text (GTK_LABEL (title->priv->label),
611 - matewnck_window_get_name (window));
612 + wnck_window_get_name (window));
613 gtk_widget_set_tooltip_text (GTK_WIDGET (title),
614 - matewnck_window_get_name (window));
615 + wnck_window_get_name (window));
616 gtk_widget_queue_draw (GTK_WIDGET (title));
621 -on_icon_changed (MatewnckWindow *window, TaskTitle *title)
622 +on_icon_changed (WnckWindow *window, TaskTitle *title)
624 TaskTitlePrivate *priv;
626 g_return_if_fail (TASK_IS_TITLE (title));
627 - g_return_if_fail (MATEWNCK_IS_WINDOW (window));
628 + g_return_if_fail (WNCK_IS_WINDOW (window));
631 if (priv->window != window)
632 @@ -173,21 +174,21 @@ on_icon_changed (MatewnckWindow *window,
636 -on_state_changed (MatewnckWindow *window,
637 - MatewnckWindowState changed_mask,
638 - MatewnckWindowState new_state,
639 +on_state_changed (WnckWindow *window,
640 + WnckWindowState changed_mask,
641 + WnckWindowState new_state,
644 TaskTitlePrivate *priv;
646 g_return_if_fail (TASK_IS_TITLE (title));
647 - g_return_if_fail (MATEWNCK_IS_WINDOW (window));
648 + g_return_if_fail (WNCK_IS_WINDOW (window));
651 if (priv->window != window)
654 - if (matewnck_window_is_maximized (window))
655 + if (wnck_window_is_maximized (window))
657 gtk_widget_set_state (GTK_WIDGET (title), GTK_STATE_ACTIVE);
658 gtk_widget_show (priv->box);
659 @@ -212,35 +213,35 @@ disconnect_window (TaskTitle *title)
663 -on_active_window_changed (MatewnckScreen *screen,
664 - MatewnckWindow *old_window,
665 +on_active_window_changed (WnckScreen *screen,
666 + WnckWindow *old_window,
669 TaskTitlePrivate *priv;
670 - MatewnckWindow *act_window;
671 - MatewnckWindowType type = MATEWNCK_WINDOW_NORMAL;
672 + WnckWindow *act_window;
673 + WnckWindowType type = WNCK_WINDOW_NORMAL;
675 g_return_if_fail (TASK_IS_TITLE (title));
678 - act_window = matewnck_screen_get_active_window (screen);
679 + act_window = wnck_screen_get_active_window (screen);
681 - type = matewnck_window_get_window_type (act_window);
682 + type = wnck_window_get_window_type (act_window);
684 - if (MATEWNCK_IS_WINDOW (act_window)
685 - && matewnck_window_is_skip_tasklist (act_window)
686 - && type != MATEWNCK_WINDOW_DESKTOP)
687 + if (WNCK_IS_WINDOW (act_window)
688 + && wnck_window_is_skip_tasklist (act_window)
689 + && type != WNCK_WINDOW_DESKTOP)
692 - if (type == MATEWNCK_WINDOW_DOCK
693 - || type == MATEWNCK_WINDOW_SPLASHSCREEN
694 - || type == MATEWNCK_WINDOW_MENU)
695 + if (type == WNCK_WINDOW_DOCK
696 + || type == WNCK_WINDOW_SPLASHSCREEN
697 + || type == WNCK_WINDOW_MENU)
700 disconnect_window (title);
702 - if (!MATEWNCK_IS_WINDOW (act_window)
703 - || matewnck_window_get_window_type (act_window) == MATEWNCK_WINDOW_DESKTOP)
704 + if (!WNCK_IS_WINDOW (act_window)
705 + || wnck_window_get_window_type (act_window) == WNCK_WINDOW_DESKTOP)
707 if (priv->show_home_title)
709 @@ -264,12 +265,12 @@ on_active_window_changed (MatewnckScreen
712 gtk_label_set_text (GTK_LABEL (priv->label),
713 - matewnck_window_get_name (act_window));
714 + wnck_window_get_name (act_window));
715 gtk_image_set_from_stock (GTK_IMAGE (priv->button_image),
716 GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
718 gtk_widget_set_tooltip_text (GTK_WIDGET (title),
719 - matewnck_window_get_name (act_window));
720 + wnck_window_get_name (act_window));
721 gtk_widget_set_tooltip_text (priv->button, _("Close window"));
723 g_signal_connect (act_window, "name-changed",
724 @@ -282,14 +283,14 @@ on_active_window_changed (MatewnckScreen
725 priv->window = act_window;
728 - if (MATEWNCK_IS_WINDOW (act_window)
729 - && !matewnck_window_is_maximized (act_window)
730 - && (priv->show_home_title ? type != MATEWNCK_WINDOW_DESKTOP : 1))
731 + if (WNCK_IS_WINDOW (act_window)
732 + && !wnck_window_is_maximized (act_window)
733 + && (priv->show_home_title ? type != WNCK_WINDOW_DESKTOP : 1))
735 gtk_widget_set_state (GTK_WIDGET (title), GTK_STATE_NORMAL);
736 gtk_widget_hide (priv->box);
738 - else if (!MATEWNCK_IS_WINDOW (act_window))
739 + else if (!WNCK_IS_WINDOW (act_window))
741 if (task_list_get_desktop_visible (TASK_LIST (task_list_get_default ()))
742 && priv->show_home_title)
743 @@ -322,21 +323,21 @@ static gboolean
744 on_button_release (GtkWidget *title, GdkEventButton *event)
746 TaskTitlePrivate *priv;
747 - MatewnckWindow *window;
748 + WnckWindow *window;
751 g_return_val_if_fail (TASK_IS_TITLE (title), FALSE);
752 priv = TASK_TITLE_GET_PRIVATE (title);
754 - window = matewnck_screen_get_active_window (priv->screen);
755 + window = wnck_screen_get_active_window (priv->screen);
757 - g_return_val_if_fail (MATEWNCK_IS_WINDOW (window), FALSE);
758 + g_return_val_if_fail (WNCK_IS_WINDOW (window), FALSE);
760 if (event->button == 3)
762 - if (matewnck_window_get_window_type (window) != MATEWNCK_WINDOW_DESKTOP)
763 + if (wnck_window_get_window_type (window) != WNCK_WINDOW_DESKTOP)
765 - menu = matewnck_action_menu_new (window);
766 + menu = wnck_action_menu_new (window);
767 gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
768 event->button, event->time);
770 @@ -344,9 +345,9 @@ on_button_release (GtkWidget *title, Gdk
772 else if (event->button == 1)
774 - if (event->type == GDK_2BUTTON_PRESS && matewnck_window_is_maximized (window))
775 + if (event->type == GDK_2BUTTON_PRESS && wnck_window_is_maximized (window))
777 - matewnck_window_unmaximize (window);
778 + wnck_window_unmaximize (window);
782 @@ -411,7 +412,7 @@ task_title_init (TaskTitle *title)
784 priv = title->priv = TASK_TITLE_GET_PRIVATE (title);
786 - priv->screen = matewnck_screen_get_default ();
787 + priv->screen = wnck_screen_get_default ();
790 /* FIXME we can add an option for this in future */
791 --- mate-netbook-1.6.0/maximus/maximus-app.h.orig 2013-04-01 16:05:35.000000000 +0200
792 +++ mate-netbook-1.6.0/maximus/maximus-app.h 2014-01-01 14:32:02.282752921 +0100
795 #include <glib-object.h>
797 -#include <libmatewnck/libmatewnck.h>
799 #define MAXIMUS_TYPE_APP (maximus_app_get_type ())
801 --- mate-netbook-1.6.1/maximus/maximus-bind.c.orig 2014-01-01 19:27:09.000000000 +0100
802 +++ mate-netbook-1.6.1/maximus/maximus-bind.c 2014-01-02 20:28:55.984895075 +0100
807 -#include <libmatewnck/libmatewnck.h>
808 +#define WNCK_I_KNOW_THIS_IS_UNSTABLE
809 +#include <libwnck/libwnck.h>
811 #include <X11/Xlib.h>
812 #include <X11/Xresource.h>
813 @@ -67,7 +68,7 @@ G_DEFINE_TYPE (MaximusBind, maximus_bind
814 struct _MaximusBindPrivate
817 - MatewnckScreen *screen;
818 + WnckScreen *screen;
822 @@ -83,16 +84,16 @@ typedef struct
826 -get_fullscreen_keystroke (GList *rules, MatewnckWindow *window)
827 +get_fullscreen_keystroke (GList *rules, WnckWindow *window)
829 - MatewnckClassGroup *group;
830 + WnckClassGroup *group;
831 const gchar *class_name;
834 - group = matewnck_window_get_class_group (window);
835 - class_name = matewnck_class_group_get_name (group);
836 + group = wnck_window_get_class_group (window);
837 + class_name = wnck_class_group_get_name (group);
839 - g_debug ("Searching rules for %s:\n", matewnck_window_get_name (window));
840 + g_debug ("Searching rules for %s:\n", wnck_window_get_name (window));
842 for (r = rules; r; r = r->next)
844 @@ -112,14 +113,14 @@ get_fullscreen_keystroke (GList *rules,
848 -get_unfullscreen_keystroke (GList *rules, MatewnckWindow *window)
849 +get_unfullscreen_keystroke (GList *rules, WnckWindow *window)
851 - MatewnckClassGroup *group;
852 + WnckClassGroup *group;
853 const gchar *class_name;
856 - group = matewnck_window_get_class_group (window);
857 - class_name = matewnck_class_group_get_name (group);
858 + group = wnck_window_get_class_group (window);
859 + class_name = wnck_class_group_get_name (group);
861 for (r = rules; r; r = r->next)
863 @@ -138,16 +139,16 @@ real_fullscreen (MaximusBind *bind)
865 MaximusBindPrivate *priv;
866 GdkDisplay UNUSED_VARIABLE *display;
867 - MatewnckWindow *active;
868 + WnckWindow *active;
869 const gchar *keystroke;
873 display = gdk_display_get_default ();
874 - active = matewnck_screen_get_active_window (priv->screen);
875 + active = wnck_screen_get_active_window (priv->screen);
877 - if (!MATEWNCK_IS_WINDOW (active)
878 - || matewnck_window_get_window_type (active) != MATEWNCK_WINDOW_NORMAL)
879 + if (!WNCK_IS_WINDOW (active)
880 + || wnck_window_get_window_type (active) != WNCK_WINDOW_NORMAL)
883 keystroke = get_fullscreen_keystroke (priv->rules, active);
884 @@ -179,7 +180,7 @@ real_fullscreen (MaximusBind *bind)
888 - if (!matewnck_window_is_fullscreen (active))
889 + if (!wnck_window_is_fullscreen (active))
891 g_debug ("Sending fullscreen F11 event");
892 fakekey_press_keysym (priv->fk, XK_F11, 0);
893 @@ -188,17 +189,17 @@ real_fullscreen (MaximusBind *bind)
895 sleep (STATE_CHANGED_SLEEP);
897 - if (!matewnck_window_is_fullscreen (active))
898 + if (!wnck_window_is_fullscreen (active))
900 - g_debug ("Forcing fullscreen matewnck event");
901 - matewnck_window_set_fullscreen (active, TRUE);
902 + g_debug ("Forcing fullscreen wnck event");
903 + wnck_window_set_fullscreen (active, TRUE);
910 -fullscreen (MaximusBind *bind, MatewnckWindow *window)
911 +fullscreen (MaximusBind *bind, WnckWindow *window)
913 MaximusBindPrivate UNUSED_VARIABLE *priv;
915 @@ -212,16 +213,16 @@ real_unfullscreen (MaximusBind *bind)
917 MaximusBindPrivate *priv;
918 GdkDisplay UNUSED_VARIABLE *display;
919 - MatewnckWindow *active;
920 + WnckWindow *active;
921 const gchar *keystroke;
925 display = gdk_display_get_default ();
926 - active = matewnck_screen_get_active_window (priv->screen);
927 + active = wnck_screen_get_active_window (priv->screen);
929 - if (!MATEWNCK_IS_WINDOW (active)
930 - || matewnck_window_get_window_type (active) != MATEWNCK_WINDOW_NORMAL)
931 + if (!WNCK_IS_WINDOW (active)
932 + || wnck_window_get_window_type (active) != WNCK_WINDOW_NORMAL)
935 keystroke = get_unfullscreen_keystroke (priv->rules, active);
936 @@ -252,7 +253,7 @@ real_unfullscreen (MaximusBind *bind)
940 - if (matewnck_window_is_fullscreen (active))
941 + if (wnck_window_is_fullscreen (active))
943 g_debug ("Sending un-fullscreen F11 event");
944 fakekey_press_keysym (priv->fk, XK_F11, 0);
945 @@ -261,17 +262,17 @@ real_unfullscreen (MaximusBind *bind)
947 sleep (STATE_CHANGED_SLEEP);
949 - if (matewnck_window_is_fullscreen (active))
950 + if (wnck_window_is_fullscreen (active))
952 - g_debug ("Forcing un-fullscreen matewnck event");
953 - matewnck_window_set_fullscreen (active, FALSE);
954 + g_debug ("Forcing un-fullscreen wnck event");
955 + wnck_window_set_fullscreen (active, FALSE);
962 -unfullscreen (MaximusBind *bind, MatewnckWindow *window)
963 +unfullscreen (MaximusBind *bind, WnckWindow *window)
965 MaximusBindPrivate UNUSED_VARIABLE *priv;
967 @@ -285,17 +286,17 @@ static void
968 on_binding_activated (gchar *keystring, MaximusBind *bind)
970 MaximusBindPrivate *priv;
971 - MatewnckWindow *active;
972 + WnckWindow *active;
974 g_return_if_fail (MAXIMUS_IS_BIND (bind));
977 - active = matewnck_screen_get_active_window (priv->screen);
978 + active = wnck_screen_get_active_window (priv->screen);
980 - if (matewnck_window_get_window_type (active) != MATEWNCK_WINDOW_NORMAL)
981 + if (wnck_window_get_window_type (active) != WNCK_WINDOW_NORMAL)
984 - if (matewnck_window_is_fullscreen (active))
985 + if (wnck_window_is_fullscreen (active))
987 unfullscreen (bind, active);
989 @@ -462,12 +463,12 @@ maximus_bind_init (MaximusBind *bind)
991 MaximusBindPrivate *priv;
992 GdkDisplay *display = gdk_display_get_default ();
993 - MatewnckScreen *screen;
994 + WnckScreen *screen;
996 priv = bind->priv = MAXIMUS_BIND_GET_PRIVATE (bind);
998 priv->fk = fakekey_init (GDK_DISPLAY_XDISPLAY (display));
999 - priv->screen = screen = matewnck_screen_get_default ();
1000 + priv->screen = screen = wnck_screen_get_default ();
1002 priv->settings = g_settings_new (BIND_SCHEMA);
1004 --- mate-netbook-1.6.0/maximus/xutils.c.orig 2013-04-01 16:05:35.000000000 +0200
1005 +++ mate-netbook-1.6.0/maximus/xutils.c 2014-01-01 14:31:37.276087304 +0100
1010 -#include <libmatewnck/libmatewnck.h>
1011 +#define WNCK_I_KNOW_THIS_IS_UNSTABLE
1012 +#include <libwnck/libwnck.h>
1015 #define UNUSED_VARIABLE __attribute__ ((unused))
1016 --- mate-netbook-1.6.1/maximus/maximus-app.c.orig 2014-01-01 19:27:09.000000000 +0100
1017 +++ mate-netbook-1.6.1/maximus/maximus-app.c 2014-01-02 20:30:45.454890481 +0100
1019 #include <gdk/gdkx.h>
1020 #include <gio/gio.h>
1022 +#define WNCK_I_KNOW_THIS_IS_UNSTABLE
1023 +#include <libwnck/libwnck.h>
1025 #include "maximus-app.h"
1026 #include "maximus-bind.h"
1028 @@ -71,7 +74,7 @@ static gchar *default_exclude_classes[]
1029 struct _MaximusAppPrivate
1032 - MatewnckScreen *screen;
1033 + WnckScreen *screen;
1034 GSettings *settings;
1036 gchar **exclude_class_list;
1037 @@ -98,7 +98,7 @@ typedef struct {
1038 #define _XA_MOTIF_WM_HINTS "_MOTIF_WM_HINTS"
1041 -matewnck_window_is_decorated (MatewnckWindow *window)
1042 +matewnck_window_is_decorated (WnckWindow *window)
1044 GdkDisplay *display = gdk_display_get_default();
1045 Atom hints_atom = None;
1046 @@ -107,13 +110,13 @@ matewnck_window_is_decorated (MatewnckWi
1050 - g_return_val_if_fail (MATEWNCK_IS_WINDOW (window), FALSE);
1051 + g_return_val_if_fail (WNCK_IS_WINDOW (window), FALSE);
1053 hints_atom = gdk_x11_get_xatom_by_name_for_display (display,
1054 _XA_MOTIF_WM_HINTS);
1056 XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
1057 - matewnck_window_get_xid (window),
1058 + wnck_window_get_xid (window),
1059 hints_atom, 0, sizeof (MotifWmHints)/sizeof (long),
1060 False, AnyPropertyType, &type, &format, &nitems,
1061 &bytes_after, &data);
1062 @@ -131,7 +134,7 @@ matewnck_window_is_decorated (MatewnckWi
1066 -gdk_window_set_mwm_hints (MatewnckWindow *window,
1067 +gdk_window_set_mwm_hints (WnckWindow *window,
1068 MotifWmHints *new_hints)
1070 GdkDisplay *display = gdk_display_get_default();
1071 @@ -143,14 +146,14 @@ gdk_window_set_mwm_hints (MatewnckWindow
1075 - g_return_if_fail (MATEWNCK_IS_WINDOW (window));
1076 + g_return_if_fail (WNCK_IS_WINDOW (window));
1077 g_return_if_fail (GDK_IS_DISPLAY (display));
1079 hints_atom = gdk_x11_get_xatom_by_name_for_display (display,
1080 _XA_MOTIF_WM_HINTS);
1082 XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
1083 - matewnck_window_get_xid (window),
1084 + wnck_window_get_xid (window),
1085 hints_atom, 0, sizeof (MotifWmHints)/sizeof (long),
1086 False, AnyPropertyType, &type, &format, &nitems,
1087 &bytes_after, &data);
1088 @@ -175,7 +178,7 @@ gdk_window_set_mwm_hints (MatewnckWindow
1090 _matewnck_error_trap_push ();
1091 XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
1092 - matewnck_window_get_xid (window),
1093 + wnck_window_get_xid (window),
1094 hints_atom, hints_atom, 32, PropModeReplace,
1095 (guchar *)hints, sizeof (MotifWmHints)/sizeof (long));
1097 @@ -186,12 +189,12 @@ gdk_window_set_mwm_hints (MatewnckWindow
1101 -_window_set_decorations (MatewnckWindow *window,
1102 +_window_set_decorations (WnckWindow *window,
1103 GdkWMDecoration decorations)
1105 MotifWmHints *hints;
1107 - g_return_if_fail (MATEWNCK_IS_WINDOW (window));
1108 + g_return_if_fail (WNCK_IS_WINDOW (window));
1110 /* initialize to zero to avoid writing uninitialized data to socket */
1111 hints = g_slice_new0 (MotifWmHints);
1112 @@ -206,17 +209,17 @@ _window_set_decorations (MatewnckWindow
1113 /* </TAKEN FROM GDK> */
1116 -window_is_too_large_for_screen (MatewnckWindow *window)
1117 +window_is_too_large_for_screen (WnckWindow *window)
1119 static GdkScreen *screen = NULL;
1120 gint x=0, y=0, w=0, h=0;
1122 - g_return_val_if_fail (MATEWNCK_IS_WINDOW (window), FALSE);
1123 + g_return_val_if_fail (WNCK_IS_WINDOW (window), FALSE);
1126 screen = gdk_screen_get_default ();
1128 - matewnck_window_get_geometry (window, &x, &y, &w, &h);
1129 + wnck_window_get_geometry (window, &x, &y, &w, &h);
1131 /* some wiggle room */
1133 @@ -225,14 +228,14 @@ window_is_too_large_for_screen (Matewnck
1137 -on_window_maximised_changed (MatewnckWindow *window)
1138 +on_window_maximised_changed (WnckWindow *window)
1140 - g_return_val_if_fail (MATEWNCK_IS_WINDOW (window), FALSE);
1141 + g_return_val_if_fail (WNCK_IS_WINDOW (window), FALSE);
1143 if (window_is_too_large_for_screen (window))
1145 _window_set_decorations (window, 1);
1146 - matewnck_window_unmaximize (window);
1147 + wnck_window_unmaximize (window);
1151 @@ -242,29 +245,29 @@ on_window_maximised_changed (MatewnckWin
1155 -enable_window_decorations (MatewnckWindow *window)
1156 +enable_window_decorations (WnckWindow *window)
1158 - g_return_val_if_fail (MATEWNCK_IS_WINDOW (window), FALSE);
1159 + g_return_val_if_fail (WNCK_IS_WINDOW (window), FALSE);
1161 _window_set_decorations (window, 1);
1166 -on_window_state_changed (MatewnckWindow *window,
1167 - MatewnckWindowState change_mask,
1168 - MatewnckWindowState new_state,
1169 +on_window_state_changed (WnckWindow *window,
1170 + WnckWindowState change_mask,
1171 + WnckWindowState new_state,
1174 - g_return_if_fail (MATEWNCK_IS_WINDOW (window));
1175 + g_return_if_fail (WNCK_IS_WINDOW (window));
1177 if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "exclude"))==1)
1180 - if (change_mask & MATEWNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY
1181 - || change_mask & MATEWNCK_WINDOW_STATE_MAXIMIZED_VERTICALLY)
1182 + if (change_mask & WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY
1183 + || change_mask & WNCK_WINDOW_STATE_MAXIMIZED_VERTICALLY)
1185 - if (matewnck_window_is_maximized (window) && app->priv->undecorate)
1186 + if (wnck_window_is_maximized (window) && app->priv->undecorate)
1188 g_idle_add ((GSourceFunc)on_window_maximised_changed, window);
1190 @@ -276,44 +279,44 @@ on_window_state_changed (MatewnckWindow
1194 -is_excluded (MaximusApp *app, MatewnckWindow *window)
1195 +is_excluded (MaximusApp *app, WnckWindow *window)
1197 MaximusAppPrivate *priv;
1198 - MatewnckWindowType type;
1199 - MatewnckWindowActions actions;
1200 + WnckWindowType type;
1201 + WnckWindowActions actions;
1206 g_return_val_if_fail (MAXIMUS_IS_APP (app), TRUE);
1207 - g_return_val_if_fail (MATEWNCK_IS_WINDOW (window), TRUE);
1208 + g_return_val_if_fail (WNCK_IS_WINDOW (window), TRUE);
1211 - type = matewnck_window_get_window_type (window);
1212 - if (type != MATEWNCK_WINDOW_NORMAL)
1213 + type = wnck_window_get_window_type (window);
1214 + if (type != WNCK_WINDOW_NORMAL)
1217 if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "exclude"))==1)
1220 /* Ignore if the window is already fullscreen */
1221 - if (matewnck_window_is_fullscreen (window))
1222 + if (wnck_window_is_fullscreen (window))
1224 - g_debug ("Excluding (is fullscreen): %s\n",matewnck_window_get_name (window));
1225 + g_debug ("Excluding (is fullscreen): %s\n",wnck_window_get_name (window));
1229 /* Make sure the window supports maximising */
1230 - actions = matewnck_window_get_actions (window);
1231 - if (actions & MATEWNCK_WINDOW_ACTION_RESIZE
1232 - && actions & MATEWNCK_WINDOW_ACTION_MAXIMIZE_HORIZONTALLY
1233 - && actions & MATEWNCK_WINDOW_ACTION_MAXIMIZE_VERTICALLY
1234 - && actions & MATEWNCK_WINDOW_ACTION_MAXIMIZE)
1235 + actions = wnck_window_get_actions (window);
1236 + if (actions & WNCK_WINDOW_ACTION_RESIZE
1237 + && actions & WNCK_WINDOW_ACTION_MAXIMIZE_HORIZONTALLY
1238 + && actions & WNCK_WINDOW_ACTION_MAXIMIZE_VERTICALLY
1239 + && actions & WNCK_WINDOW_ACTION_MAXIMIZE)
1240 ; /* Is good to maximise */
1244 - _matewnck_get_wmclass (matewnck_window_get_xid (window), &res_name, &class_name);
1245 + _matewnck_get_wmclass (wnck_window_get_xid (window), &res_name, &class_name);
1247 g_debug ("Window opened: res_name=%s -- class_name=%s", res_name, class_name);
1249 @@ -325,7 +328,7 @@ is_excluded (MaximusApp *app, MatewnckWi
1250 || (res_name && default_exclude_classes[i] && strstr (res_name,
1251 default_exclude_classes[i])))
1253 - g_debug ("Excluding: %s\n", matewnck_window_get_name (window));
1254 + g_debug ("Excluding: %s\n", wnck_window_get_name (window));
1258 @@ -336,7 +339,7 @@ is_excluded (MaximusApp *app, MatewnckWi
1259 if ((class_name && strstr (class_name, priv->exclude_class_list[i]))
1260 || (res_name && strstr (res_name, priv->exclude_class_list[i]) ))
1262 - g_debug ("Excluding: %s\n", matewnck_window_get_name (window));
1263 + g_debug ("Excluding: %s\n", wnck_window_get_name (window));
1267 @@ -349,25 +352,25 @@ is_excluded (MaximusApp *app, MatewnckWi
1268 extern gboolean no_maximize;
1271 -on_window_opened (MatewnckScreen *screen,
1272 - MatewnckWindow *window,
1273 +on_window_opened (WnckScreen *screen,
1274 + WnckWindow *window,
1277 MaximusAppPrivate *priv;
1278 - MatewnckWindowType type;
1279 + WnckWindowType type;
1282 g_return_if_fail (MAXIMUS_IS_APP (app));
1283 - g_return_if_fail (MATEWNCK_IS_WINDOW (window));
1284 + g_return_if_fail (WNCK_IS_WINDOW (window));
1287 - type = matewnck_window_get_window_type (window);
1288 - if (type != MATEWNCK_WINDOW_NORMAL)
1289 + type = wnck_window_get_window_type (window);
1290 + if (type != WNCK_WINDOW_NORMAL)
1293 /* Ignore undecorated windows */
1294 exclude = matewnck_window_is_decorated (window) ? 0 : 1;
1295 - if (matewnck_window_is_maximized (window))
1296 + if (wnck_window_is_maximized (window))
1298 g_object_set_data (G_OBJECT (window), "exclude", GINT_TO_POINTER (exclude));
1300 @@ -380,7 +383,7 @@ on_window_opened (MatewnckScreen *scree
1302 if (no_maximize || priv->no_maximize)
1304 - if (matewnck_window_is_maximized(window))
1305 + if (wnck_window_is_maximized(window))
1307 _window_set_decorations (window, 0);
1309 @@ -400,7 +403,7 @@ on_window_opened (MatewnckScreen *scree
1313 - matewnck_window_maximize (window);
1314 + wnck_window_maximize (window);
1316 g_signal_connect (window, "state-changed",
1317 G_CALLBACK (on_window_state_changed), app);
1318 @@ -437,11 +440,11 @@ on_exclude_class_changed (GSettings *set
1322 -show_desktop (MatewnckScreen *screen)
1323 +show_desktop (WnckScreen *screen)
1325 - g_return_val_if_fail (MATEWNCK_IS_SCREEN (screen), FALSE);
1326 + g_return_val_if_fail (WNCK_IS_SCREEN (screen), FALSE);
1328 - matewnck_screen_toggle_showing_desktop (screen, TRUE);
1329 + wnck_screen_toggle_showing_desktop (screen, TRUE);
1333 @@ -455,22 +458,22 @@ on_app_undecorate_changed (GSettings
1335 g_return_if_fail (MAXIMUS_IS_APP (app));
1337 - g_return_if_fail (MATEWNCK_IS_SCREEN (priv->screen));
1338 + g_return_if_fail (WNCK_IS_SCREEN (priv->screen));
1340 priv->undecorate = g_settings_get_boolean (settings, APP_UNDECORATE);
1341 g_debug ("%s\n", priv->undecorate ? "Undecorating" : "Decorating");
1343 - windows = matewnck_screen_get_windows (priv->screen);
1344 + windows = wnck_screen_get_windows (priv->screen);
1345 for (w = windows; w; w = w->next)
1347 - MatewnckWindow *window = w->data;
1348 + WnckWindow *window = w->data;
1350 - if (!MATEWNCK_IS_WINDOW (window))
1351 + if (!WNCK_IS_WINDOW (window))
1354 if (no_maximize || priv->no_maximize)
1356 - if (!matewnck_window_is_maximized(window))
1357 + if (!wnck_window_is_maximized(window))
1361 @@ -478,8 +481,8 @@ on_app_undecorate_changed (GSettings
1363 gdk_error_trap_push ();
1364 _window_set_decorations (window, priv->undecorate ? 0 : 1);
1365 - matewnck_window_unmaximize (window);
1366 - matewnck_window_maximize (window);
1367 + wnck_window_unmaximize (window);
1368 + wnck_window_maximize (window);
1370 gdk_error_trap_pop ();
1372 @@ -504,7 +507,7 @@ static void
1373 maximus_app_init (MaximusApp *app)
1375 MaximusAppPrivate *priv;
1376 - MatewnckScreen *screen;
1377 + WnckScreen *screen;
1379 priv = app->priv = MAXIMUS_APP_GET_PRIVATE (app);
1381 @@ -523,7 +526,7 @@ maximus_app_init (MaximusApp *app)
1382 G_CALLBACK (on_app_undecorate_changed), app);
1385 - priv->screen = screen = matewnck_screen_get_default ();
1386 + priv->screen = screen = wnck_screen_get_default ();
1387 g_signal_connect (screen, "window-opened",
1388 G_CALLBACK (on_window_opened), app);
1390 --- mate-netbook-1.6.0/mate-window-picker-applet/task-item.h.orig 2013-04-01 16:05:35.000000000 +0200
1391 +++ mate-netbook-1.6.0/mate-window-picker-applet/task-item.h 2014-01-01 14:58:56.632685173 +0100
1395 #include <gtk/gtk.h>
1396 -#include <libmatewnck/libmatewnck.h>
1397 +#define WNCK_I_KNOW_THIS_IS_UNSTABLE
1398 +#include <libwnck/libwnck.h>
1400 #define TASK_TYPE_ITEM (task_item_get_type ())
1402 @@ -62,7 +63,7 @@ struct _TaskItemClass
1404 GType task_item_get_type (void) G_GNUC_CONST;
1406 -GtkWidget * task_item_new (MatewnckWindow *window);
1407 +GtkWidget * task_item_new (WnckWindow *window);
1409 GtkWidget * task_item_get_default (void);