/* prepare to disable Maximus */
object_class = G_OBJECT_GET_CLASS (G_OBJECT(applet));
---- mate-netbook-1.6.0/mate-window-picker-applet/task-item.c.orig 2013-04-01 16:05:35.000000000 +0200
-+++ mate-netbook-1.6.0/mate-window-picker-applet/task-item.c 2014-01-01 14:44:45.849387544 +0100
+--- mate-netbook-1.6.1/mate-window-picker-applet/task-item.c.orig 2014-01-01 19:27:09.000000000 +0100
++++ mate-netbook-1.6.1/mate-window-picker-applet/task-item.c 2014-01-02 20:04:54.174955583 +0100
@@ -35,8 +35,8 @@ G_DEFINE_TYPE (TaskItem, task_item, GTK_
struct _TaskItemPrivate
TaskItemPrivate *priv = item->priv;
-- if (!MATEWNCK_IS_WINDOW (priv->window))
-+ if (!WNCK_IS_WINDOW (priv->window))
+- if (!MATEWNCK_IS_WINDOW (priv->window))
++ if (!WNCK_IS_WINDOW (priv->window))
{
gtk_widget_hide (GTK_WIDGET (item));
return;
gboolean show_all = task_list_get_show_all_windows (TASK_LIST (task_list_get_default ()));
gboolean show_window = FALSE;
-- if (!matewnck_window_is_skip_tasklist (window))
-+ if (!wnck_window_is_skip_tasklist (window))
+- if (!matewnck_window_is_skip_tasklist (window))
++ if (!wnck_window_is_skip_tasklist (window))
{
- if (matewnck_workspace_is_virtual (workspace))
+ if (wnck_workspace_is_virtual (workspace))
}
static void
--on_window_state_changed (MatewnckWindow *window,
+-on_window_state_changed (MatewnckWindow *window,
- MatewnckWindowState changed_mask,
- MatewnckWindowState new_state,
-+on_window_state_changed (WnckWindow *window,
++on_window_state_changed (WnckWindow *window,
+ WnckWindowState changed_mask,
+ WnckWindowState new_state,
TaskItem *item)
- g_return_if_fail (MATEWNCK_IS_WINDOW (window));
+ g_return_if_fail (WNCK_IS_WINDOW (window));
-- if ((MATEWNCK_IS_WINDOW (old_window) && window == old_window) ||
+- if ((MATEWNCK_IS_WINDOW (old_window) && window == old_window) ||
- window == matewnck_screen_get_active_window (screen))
-+ if ((WNCK_IS_WINDOW (old_window) && window == old_window) ||
++ if ((WNCK_IS_WINDOW (old_window) && window == old_window) ||
+ window == wnck_screen_get_active_window (screen))
{
/* queue a draw to reflect that we are [no longer] the active window */
priv = TASK_ITEM (widget)->priv;
-- g_return_val_if_fail (MATEWNCK_IS_WINDOW (priv->window), FALSE);
-+ g_return_val_if_fail (WNCK_IS_WINDOW (priv->window), FALSE);
+- g_return_val_if_fail (MATEWNCK_IS_WINDOW (priv->window), FALSE);
++ g_return_val_if_fail (WNCK_IS_WINDOW (priv->window), FALSE);
active = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "drag-true"));
priv->screen = screen;
gtk_drag_dest_set (item,
---- mate-netbook-1.6.0/mate-window-picker-applet/task-list.c.orig 2013-04-01 16:05:35.000000000 +0200
-+++ mate-netbook-1.6.0/mate-window-picker-applet/task-list.c 2014-01-01 14:45:10.512719842 +0100
+--- mate-netbook-1.6.1/mate-window-picker-applet/task-list.c.orig 2014-01-01 19:27:09.000000000 +0100
++++ mate-netbook-1.6.1/mate-window-picker-applet/task-list.c 2014-01-02 20:12:32.018269599 +0100
@@ -20,7 +20,8 @@
#include "task-list.h"
#include "task-item.h"
G_DEFINE_TYPE (TaskList, task_list, GTK_TYPE_HBOX);
-@@ -30,7 +30,7 @@ G_DEFINE_TYPE (TaskList, task_list, GTK_
+@@ -30,7 +31,7 @@ G_DEFINE_TYPE (TaskList, task_list, GTK_
struct _TaskListPrivate
{
GHashTable *win_table;
guint timer;
guint counter;
-@@ -65,22 +65,22 @@ on_task_item_closed (TaskItem *item,
+@@ -65,22 +66,22 @@ on_task_item_closed (TaskItem *item,
}
static void
--on_window_opened (MatewnckScreen *screen,
+-on_window_opened (MatewnckScreen *screen,
- MatewnckWindow *window,
-+on_window_opened (WnckScreen *screen,
++on_window_opened (WnckScreen *screen,
+ WnckWindow *window,
TaskList *list)
{
return;
GtkWidget *item = task_item_new (window);
-@@ -178,7 +178,7 @@ task_list_init (TaskList *list)
-
+@@ -178,7 +179,7 @@ task_list_init (TaskList *list)
+
priv = list->priv = TASK_LIST_GET_PRIVATE (list);
- priv->screen = matewnck_screen_get_default ();
priv->win_table = g_hash_table_new (NULL, NULL);
-@@ -224,14 +224,14 @@ task_list_get_desktop_visible (TaskList
+@@ -224,14 +225,14 @@ task_list_get_desktop_visible (TaskList
g_return_val_if_fail (TASK_IS_LIST (list), TRUE);
all_minimised = FALSE;
}
---- mate-netbook-1.6.0/mate-window-picker-applet/task-title.c.orig 2013-04-01 16:05:35.000000000 +0200
-+++ mate-netbook-1.6.0/mate-window-picker-applet/task-title.c 2014-01-01 14:46:16.976050386 +0100
+--- mate-netbook-1.6.1/mate-window-picker-applet/task-title.c.orig 2014-01-01 19:27:09.000000000 +0100
++++ mate-netbook-1.6.1/mate-window-picker-applet/task-title.c 2014-01-02 20:13:43.351600042 +0100
@@ -19,7 +19,8 @@
#include "task-title.h"
#include <mate-panel-applet.h>
#include "task-list.h"
-@@ -35,8 +35,8 @@ G_DEFINE_TYPE (TaskTitle, task_title, GT
+@@ -35,8 +36,8 @@ G_DEFINE_TYPE (TaskTitle, task_title, GT
struct _TaskTitlePrivate
{
GtkWidget *align;
GtkWidget *box;
GtkWidget *label;
-@@ -56,7 +56,7 @@ on_close_clicked (GtkButton *button,
+@@ -56,7 +57,7 @@ on_close_clicked (GtkButton *button,
TaskTitle *title)
{
TaskTitlePrivate *priv;
g_return_val_if_fail (TASK_IS_TITLE (title), FALSE);
priv = title->priv;
-@@ -64,10 +64,10 @@ on_close_clicked (GtkButton *button,
+@@ -64,10 +65,10 @@ on_close_clicked (GtkButton *button,
if (event->button != 1 || !priv->mouse_in_close_button)
return FALSE;
{
gdk_spawn_command_line_on_screen (gdk_screen_get_default (),
LOGOUT, NULL);
-@@ -76,7 +76,7 @@ on_close_clicked (GtkButton *button,
+@@ -76,7 +77,7 @@ on_close_clicked (GtkButton *button,
{
if (priv->window == window)
disconnect_window (title);
}
gtk_widget_queue_draw (GTK_WIDGET (title));
-@@ -138,32 +138,32 @@ on_button_expose (GtkWidget *widget,
+@@ -138,32 +139,32 @@ on_button_expose (GtkWidget *widget,
}
static void
priv = title->priv;
if (priv->window != window)
-@@ -173,21 +173,21 @@ on_icon_changed (MatewnckWindow *window,
+@@ -173,21 +174,21 @@ on_icon_changed (MatewnckWindow *window,
}
static void
--on_state_changed (MatewnckWindow *window,
+-on_state_changed (MatewnckWindow *window,
- MatewnckWindowState changed_mask,
- MatewnckWindowState new_state,
-+on_state_changed (WnckWindow *window,
++on_state_changed (WnckWindow *window,
+ WnckWindowState changed_mask,
+ WnckWindowState new_state,
TaskTitle *title)
{
gtk_widget_set_state (GTK_WIDGET (title), GTK_STATE_ACTIVE);
gtk_widget_show (priv->box);
-@@ -212,35 +212,35 @@ disconnect_window (TaskTitle *title)
+@@ -212,35 +213,35 @@ disconnect_window (TaskTitle *title)
}
static void
--on_active_window_changed (MatewnckScreen *screen,
+-on_active_window_changed (MatewnckScreen *screen,
- MatewnckWindow *old_window,
-+on_active_window_changed (WnckScreen *screen,
++on_active_window_changed (WnckScreen *screen,
+ WnckWindow *old_window,
TaskTitle *title)
{
- type = matewnck_window_get_window_type (act_window);
+ type = wnck_window_get_window_type (act_window);
-- if (MATEWNCK_IS_WINDOW (act_window)
+- if (MATEWNCK_IS_WINDOW (act_window)
- && matewnck_window_is_skip_tasklist (act_window)
- && type != MATEWNCK_WINDOW_DESKTOP)
-+ if (WNCK_IS_WINDOW (act_window)
++ if (WNCK_IS_WINDOW (act_window)
+ && wnck_window_is_skip_tasklist (act_window)
+ && type != WNCK_WINDOW_DESKTOP)
return;
disconnect_window (title);
-- if (!MATEWNCK_IS_WINDOW (act_window)
+- if (!MATEWNCK_IS_WINDOW (act_window)
- || matewnck_window_get_window_type (act_window) == MATEWNCK_WINDOW_DESKTOP)
-+ if (!WNCK_IS_WINDOW (act_window)
++ if (!WNCK_IS_WINDOW (act_window)
+ || wnck_window_get_window_type (act_window) == WNCK_WINDOW_DESKTOP)
{
if (priv->show_home_title)
{
-@@ -264,12 +264,12 @@ on_active_window_changed (MatewnckScreen
+@@ -264,12 +265,12 @@ on_active_window_changed (MatewnckScreen
else
{
gtk_label_set_text (GTK_LABEL (priv->label),
GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
gtk_widget_set_tooltip_text (GTK_WIDGET (title),
-- matewnck_window_get_name (act_window));
-+ wnck_window_get_name (act_window));
+- matewnck_window_get_name (act_window));
++ wnck_window_get_name (act_window));
gtk_widget_set_tooltip_text (priv->button, _("Close window"));
g_signal_connect (act_window, "name-changed",
-@@ -282,14 +282,14 @@ on_active_window_changed (MatewnckScreen
+@@ -282,14 +283,14 @@ on_active_window_changed (MatewnckScreen
priv->window = act_window;
}
- if (MATEWNCK_IS_WINDOW (act_window)
-- && !matewnck_window_is_maximized (act_window)
+- && !matewnck_window_is_maximized (act_window)
- && (priv->show_home_title ? type != MATEWNCK_WINDOW_DESKTOP : 1))
+ if (WNCK_IS_WINDOW (act_window)
-+ && !wnck_window_is_maximized (act_window)
++ && !wnck_window_is_maximized (act_window)
+ && (priv->show_home_title ? type != WNCK_WINDOW_DESKTOP : 1))
{
gtk_widget_set_state (GTK_WIDGET (title), GTK_STATE_NORMAL);
{
if (task_list_get_desktop_visible (TASK_LIST (task_list_get_default ()))
&& priv->show_home_title)
-@@ -322,21 +322,21 @@ static gboolean
+@@ -322,21 +323,21 @@ static gboolean
on_button_release (GtkWidget *title, GdkEventButton *event)
{
TaskTitlePrivate *priv;
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
event->button, event->time);
return TRUE;
-@@ -344,9 +344,9 @@ on_button_release (GtkWidget *title, Gdk
+@@ -344,9 +345,9 @@ on_button_release (GtkWidget *title, Gdk
}
else if (event->button == 1)
{
}
}
-@@ -411,7 +411,7 @@ task_title_init (TaskTitle *title)
+@@ -411,7 +412,7 @@ task_title_init (TaskTitle *title)
priv = title->priv = TASK_TITLE_GET_PRIVATE (title);
#define MAXIMUS_TYPE_APP (maximus_app_get_type ())
---- mate-netbook-1.6.0/maximus/maximus-bind.c.orig 2013-04-01 16:05:35.000000000 +0200
-+++ mate-netbook-1.6.0/maximus/maximus-bind.c 2014-01-01 14:34:33.399413246 +0100
+--- mate-netbook-1.6.1/maximus/maximus-bind.c.orig 2014-01-01 19:27:09.000000000 +0100
++++ mate-netbook-1.6.1/maximus/maximus-bind.c 2014-01-02 20:28:55.984895075 +0100
@@ -27,7 +27,8 @@
#include <gio/gio.h>
#include <X11/Xlib.h>
#include <X11/Xresource.h>
-@@ -67,7 +67,7 @@ G_DEFINE_TYPE (MaximusBind, maximus_bind
+@@ -67,7 +68,7 @@ G_DEFINE_TYPE (MaximusBind, maximus_bind
struct _MaximusBindPrivate
{
FakeKey *fk;
GSettings *settings;
gchar *binding;
-@@ -83,16 +83,16 @@ typedef struct
+@@ -83,16 +84,16 @@ typedef struct
} MaximusRule;
static const gchar *
for (r = rules; r; r = r->next)
{
-@@ -112,14 +112,14 @@ get_fullscreen_keystroke (GList *rules,
+@@ -112,14 +113,14 @@ get_fullscreen_keystroke (GList *rules,
}
static const gchar *
for (r = rules; r; r = r->next)
{
-@@ -138,16 +138,16 @@ real_fullscreen (MaximusBind *bind)
+@@ -138,16 +139,16 @@ real_fullscreen (MaximusBind *bind)
{
MaximusBindPrivate *priv;
GdkDisplay UNUSED_VARIABLE *display;
- active = matewnck_screen_get_active_window (priv->screen);
+ active = wnck_screen_get_active_window (priv->screen);
-- if (!MATEWNCK_IS_WINDOW (active)
+- if (!MATEWNCK_IS_WINDOW (active)
- || matewnck_window_get_window_type (active) != MATEWNCK_WINDOW_NORMAL)
-+ if (!WNCK_IS_WINDOW (active)
++ if (!WNCK_IS_WINDOW (active)
+ || wnck_window_get_window_type (active) != WNCK_WINDOW_NORMAL)
return FALSE;
keystroke = get_fullscreen_keystroke (priv->rules, active);
-@@ -179,7 +179,7 @@ real_fullscreen (MaximusBind *bind)
+@@ -179,7 +180,7 @@ real_fullscreen (MaximusBind *bind)
}
}
{
g_debug ("Sending fullscreen F11 event");
fakekey_press_keysym (priv->fk, XK_F11, 0);
-@@ -188,17 +188,17 @@ real_fullscreen (MaximusBind *bind)
+@@ -188,17 +189,17 @@ real_fullscreen (MaximusBind *bind)
sleep (STATE_CHANGED_SLEEP);
{
MaximusBindPrivate UNUSED_VARIABLE *priv;
-@@ -212,16 +212,16 @@ real_unfullscreen (MaximusBind *bind)
+@@ -212,16 +213,16 @@ real_unfullscreen (MaximusBind *bind)
{
MaximusBindPrivate *priv;
GdkDisplay UNUSED_VARIABLE *display;
- active = matewnck_screen_get_active_window (priv->screen);
+ active = wnck_screen_get_active_window (priv->screen);
-- if (!MATEWNCK_IS_WINDOW (active)
+- if (!MATEWNCK_IS_WINDOW (active)
- || matewnck_window_get_window_type (active) != MATEWNCK_WINDOW_NORMAL)
-+ if (!WNCK_IS_WINDOW (active)
++ if (!WNCK_IS_WINDOW (active)
+ || wnck_window_get_window_type (active) != WNCK_WINDOW_NORMAL)
return FALSE;
keystroke = get_unfullscreen_keystroke (priv->rules, active);
-@@ -252,7 +252,7 @@ real_unfullscreen (MaximusBind *bind)
+@@ -252,7 +253,7 @@ real_unfullscreen (MaximusBind *bind)
return FALSE;
}
}
{
g_debug ("Sending un-fullscreen F11 event");
fakekey_press_keysym (priv->fk, XK_F11, 0);
-@@ -261,17 +261,17 @@ real_unfullscreen (MaximusBind *bind)
+@@ -261,17 +262,17 @@ real_unfullscreen (MaximusBind *bind)
sleep (STATE_CHANGED_SLEEP);
{
MaximusBindPrivate UNUSED_VARIABLE *priv;
-@@ -285,17 +285,17 @@ static void
+@@ -285,17 +286,17 @@ static void
on_binding_activated (gchar *keystring, MaximusBind *bind)
{
MaximusBindPrivate *priv;
{
unfullscreen (bind, active);
}
-@@ -462,12 +462,12 @@ maximus_bind_init (MaximusBind *bind)
+@@ -462,12 +463,12 @@ maximus_bind_init (MaximusBind *bind)
{
MaximusBindPrivate *priv;
GdkDisplay *display = gdk_display_get_default ();
#ifdef __GNUC__
#define UNUSED_VARIABLE __attribute__ ((unused))
---- mate-netbook-1.6.0/maximus/maximus-app.c.orig 2013-04-01 16:05:35.000000000 +0200
-+++ mate-netbook-1.6.0/maximus/maximus-app.c 2014-01-01 14:57:29.662688823 +0100
+--- mate-netbook-1.6.1/maximus/maximus-app.c.orig 2014-01-01 19:27:09.000000000 +0100
++++ mate-netbook-1.6.1/maximus/maximus-app.c 2014-01-02 20:30:45.454890481 +0100
@@ -25,6 +25,9 @@
#include <gdk/gdkx.h>
#include <gio/gio.h>
GSettings *settings;
gchar **exclude_class_list;
-@@ -95,7 +98,7 @@ typedef struct {
+@@ -98,7 +98,7 @@ typedef struct {
#define _XA_MOTIF_WM_HINTS "_MOTIF_WM_HINTS"
static gboolean
/* Make sure the window supports maximising */
- actions = matewnck_window_get_actions (window);
- if (actions & MATEWNCK_WINDOW_ACTION_RESIZE
-- && actions & MATEWNCK_WINDOW_ACTION_MAXIMIZE_HORIZONTALLY
+- && actions & MATEWNCK_WINDOW_ACTION_MAXIMIZE_HORIZONTALLY
- && actions & MATEWNCK_WINDOW_ACTION_MAXIMIZE_VERTICALLY
- && actions & MATEWNCK_WINDOW_ACTION_MAXIMIZE)
+ actions = wnck_window_get_actions (window);
+ if (actions & WNCK_WINDOW_ACTION_RESIZE
-+ && actions & WNCK_WINDOW_ACTION_MAXIMIZE_HORIZONTALLY
++ && actions & WNCK_WINDOW_ACTION_MAXIMIZE_HORIZONTALLY
+ && actions & WNCK_WINDOW_ACTION_MAXIMIZE_VERTICALLY
+ && actions & WNCK_WINDOW_ACTION_MAXIMIZE)
; /* Is good to maximise */
extern gboolean no_maximize;
static void
--on_window_opened (MatewnckScreen *screen,
+-on_window_opened (MatewnckScreen *screen,
- MatewnckWindow *window,
-+on_window_opened (WnckScreen *screen,
++on_window_opened (WnckScreen *screen,
+ WnckWindow *window,
MaximusApp *app)
{