diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-23 11:47:16 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-23 11:47:16 -0800 |
| commit | 2340d0b656ddb105404dc3f14d2d38e24a06ad7a (patch) | |
| tree | e0de205c430dadf313ec6154b957b82d887fcfc6 /mate-window-picker-applet/task-title.c | |
| parent | 7811eb717c4dc231473f3a6e80ea061d15953c1a (diff) | |
| parent | ce7c5055cfe487acf1254f399504c568513a1cc1 (diff) | |
| download | mate-netbook-2340d0b656ddb105404dc3f14d2d38e24a06ad7a.tar.bz2 mate-netbook-2340d0b656ddb105404dc3f14d2d38e24a06ad7a.tar.xz | |
Merge pull request #8 from flexiondotorg/1.6
Cherry picks for `mate-netbook` 1.6
Diffstat (limited to 'mate-window-picker-applet/task-title.c')
| -rw-r--r-- | mate-window-picker-applet/task-title.c | 12 |
1 files changed, 6 insertions, 6 deletions
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); |