diff options
-rw-r--r-- | mate-window-picker-applet/task-item.c | 10 | ||||
-rw-r--r-- | mate-window-picker-applet/task-list.c | 4 | ||||
-rw-r--r-- | mate-window-picker-applet/task-title.c | 12 | ||||
-rw-r--r-- | maximus/maximus-app.c | 4 | ||||
-rw-r--r-- | maximus/maximus-bind.c | 4 |
5 files changed, 17 insertions, 17 deletions
diff --git a/mate-window-picker-applet/task-item.c b/mate-window-picker-applet/task-item.c index 3e0dd97..cdcc113 100644 --- a/mate-window-picker-applet/task-item.c +++ b/mate-window-picker-applet/task-item.c @@ -154,7 +154,7 @@ task_item_set_visibility (TaskItem *item) TaskItemPrivate *priv = item->priv; - if (!MATEWNCK_IS_WINDOW (priv->window)) + if (!MATEWNCK_IS_WINDOW (priv->window)) { gtk_widget_hide (GTK_WIDGET (item)); return; @@ -168,7 +168,7 @@ task_item_set_visibility (TaskItem *item) 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 (!matewnck_window_is_skip_tasklist (window)) { if (matewnck_workspace_is_virtual (workspace)) { @@ -462,7 +462,7 @@ on_blink (TaskItem *item) } static void -on_window_state_changed (MatewnckWindow *window, +on_window_state_changed (MatewnckWindow *window, MatewnckWindowState changed_mask, MatewnckWindowState new_state, TaskItem *item) @@ -521,7 +521,7 @@ on_screen_active_window_changed (MatewnckScreen *screen, g_return_if_fail (MATEWNCK_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)) { /* queue a draw to reflect that we are [no longer] the active window */ @@ -583,7 +583,7 @@ activate_window (GtkWidget *widget) priv = TASK_ITEM (widget)->priv; - g_return_val_if_fail (MATEWNCK_IS_WINDOW (priv->window), FALSE); + g_return_val_if_fail (MATEWNCK_IS_WINDOW (priv->window), FALSE); active = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "drag-true")); diff --git a/mate-window-picker-applet/task-list.c b/mate-window-picker-applet/task-list.c index 43c0d5d..e29a114 100644 --- a/mate-window-picker-applet/task-list.c +++ b/mate-window-picker-applet/task-list.c @@ -65,7 +65,7 @@ on_task_item_closed (TaskItem *item, } static void -on_window_opened (MatewnckScreen *screen, +on_window_opened (MatewnckScreen *screen, MatewnckWindow *window, TaskList *list) { @@ -175,7 +175,7 @@ static void task_list_init (TaskList *list) { TaskListPrivate *priv; - + priv = list->priv = TASK_LIST_GET_PRIVATE (list); priv->screen = matewnck_screen_get_default (); diff --git a/mate-window-picker-applet/task-title.c b/mate-window-picker-applet/task-title.c index 35d8854..60de87a 100644 --- a/mate-window-picker-applet/task-title.c +++ b/mate-window-picker-applet/task-title.c @@ -173,7 +173,7 @@ on_icon_changed (MatewnckWindow *window, TaskTitle *title) } static void -on_state_changed (MatewnckWindow *window, +on_state_changed (MatewnckWindow *window, MatewnckWindowState changed_mask, MatewnckWindowState new_state, TaskTitle *title) @@ -212,7 +212,7 @@ disconnect_window (TaskTitle *title) } static void -on_active_window_changed (MatewnckScreen *screen, +on_active_window_changed (MatewnckScreen *screen, MatewnckWindow *old_window, TaskTitle *title) { @@ -227,7 +227,7 @@ on_active_window_changed (MatewnckScreen *screen, if (act_window) type = matewnck_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) return; @@ -239,7 +239,7 @@ on_active_window_changed (MatewnckScreen *screen, 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 (priv->show_home_title) @@ -269,7 +269,7 @@ on_active_window_changed (MatewnckScreen *screen, GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); gtk_widget_set_tooltip_text (GTK_WIDGET (title), - matewnck_window_get_name (act_window)); + matewnck_window_get_name (act_window)); gtk_widget_set_tooltip_text (priv->button, _("Close window")); g_signal_connect (act_window, "name-changed", @@ -283,7 +283,7 @@ on_active_window_changed (MatewnckScreen *screen, } 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)) { gtk_widget_set_state (GTK_WIDGET (title), GTK_STATE_NORMAL); diff --git a/maximus/maximus-app.c b/maximus/maximus-app.c index 334cca5..a51147d 100644 --- a/maximus/maximus-app.c +++ b/maximus/maximus-app.c @@ -306,7 +306,7 @@ is_excluded (MaximusApp *app, MatewnckWindow *window) /* 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) ; /* Is good to maximise */ @@ -349,7 +349,7 @@ is_excluded (MaximusApp *app, MatewnckWindow *window) extern gboolean no_maximize; static void -on_window_opened (MatewnckScreen *screen, +on_window_opened (MatewnckScreen *screen, MatewnckWindow *window, MaximusApp *app) { diff --git a/maximus/maximus-bind.c b/maximus/maximus-bind.c index b58cbc1..543834a 100644 --- a/maximus/maximus-bind.c +++ b/maximus/maximus-bind.c @@ -146,7 +146,7 @@ real_fullscreen (MaximusBind *bind) display = gdk_display_get_default (); active = matewnck_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) return FALSE; @@ -220,7 +220,7 @@ real_unfullscreen (MaximusBind *bind) display = gdk_display_get_default (); active = matewnck_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) return FALSE; |