diff options
| author | infirit <[email protected]> | 2013-11-27 13:23:16 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2013-11-28 15:38:38 +0100 |
| commit | e453fc3773d3b49665c42d54069c4c82a853bc64 (patch) | |
| tree | 24c35d13c7f819e15e78b8d6dd5aad2b860b050a | |
| parent | a2b1af54a24b93766f5e2ed4a216637dc510ec47 (diff) | |
| download | mate-panel-e453fc3773d3b49665c42d54069c4c82a853bc64.tar.bz2 mate-panel-e453fc3773d3b49665c42d54069c4c82a853bc64.tar.xz | |
Revert "Correct wnck/gtk3 check."
This reverts commit a2b1af54a24b93766f5e2ed4a216637dc510ec47.
| -rw-r--r-- | applets/wncklet/window-list.c | 13 | ||||
| -rw-r--r-- | applets/wncklet/workspace-switcher.c | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c index fc913617..dd11af99 100644 --- a/applets/wncklet/window-list.c +++ b/applets/wncklet/window-list.c @@ -121,9 +121,11 @@ static void applet_change_orient(MatePanelApplet* applet, MatePanelAppletOrient tasklist->orientation = new_orient; -#if GTK_CHECK_VERSION (3, 0, 0) && WNCK_CHECK_VERSION (3, 4, 6) +#if GTK_CHECK_VERSION (3, 0, 0) +#if WNCK_CHECK_VERSION (3, 4, 6) wnck_tasklist_set_orientation (tasklist->tasklist, new_orient); #endif +#endif tasklist_update(tasklist); } @@ -425,16 +427,19 @@ gboolean window_list_applet_fill(MatePanelApplet* applet) break; } -#if GTK_CHECK_VERSION (3, 0, 0) && WNCK_CHECK_VERSION (2, 91, 6) +#if GTK_CHECK_VERSION (3, 0, 0) +#if WNCK_CHECK_VERSION (2, 91, 6) tasklist->tasklist = wnck_tasklist_new(); +#endif #else tasklist->tasklist = wnck_tasklist_new(NULL); #endif -#if GTK_CHECK_VERSION (3, 0, 0) && WNCK_CHECK_VERSION (3, 4, 6) +#if GTK_CHECK_VERSION (3, 0, 0) +#if WNCK_CHECK_VERSION (3, 4, 6) wnck_tasklist_set_orientation (tasklist->tasklist, tasklist->orientation); #endif - +#endif wnck_tasklist_set_icon_loader(WNCK_TASKLIST(tasklist->tasklist), icon_loader_func, tasklist, NULL); g_signal_connect(G_OBJECT(tasklist->tasklist), "destroy", G_CALLBACK(destroy_tasklist), tasklist); diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c index 3ae4f9d2..64f0b330 100644 --- a/applets/wncklet/workspace-switcher.c +++ b/applets/wncklet/workspace-switcher.c @@ -529,8 +529,10 @@ gboolean workspace_switcher_applet_fill(MatePanelApplet* applet) break; } -#if GTK_CHECK_VERSION (3, 0, 0) && WNCK_CHECK_VERSION (2, 91, 6) +#if GTK_CHECK_VERSION (3, 0, 0) +#if WNCK_CHECK_VERSION (2, 91, 6) pager->pager = wnck_pager_new(); +#endif #else pager->pager = wnck_pager_new(NULL); #endif |