From e453fc3773d3b49665c42d54069c4c82a853bc64 Mon Sep 17 00:00:00 2001 From: infirit Date: Wed, 27 Nov 2013 13:23:16 +0100 Subject: Revert "Correct wnck/gtk3 check." This reverts commit a2b1af54a24b93766f5e2ed4a216637dc510ec47. --- applets/wncklet/window-list.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'applets/wncklet/window-list.c') 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,8 +121,10 @@ 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); -- cgit v1.2.1