summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-11-12 06:47:50 -0800
committerStefano Karapetsas <[email protected]>2013-11-12 06:47:50 -0800
commit1bb6004d9198143df0d15b9b0a318607b59eaf0f (patch)
treeeec9b217290f39140c3eb0bbf6cd7d9fe918cf5a
parent1b401ff5fa2ca8e710986e61227389cedde10a05 (diff)
parenta2b1af54a24b93766f5e2ed4a216637dc510ec47 (diff)
downloadmate-panel-1bb6004d9198143df0d15b9b0a318607b59eaf0f.tar.bz2
mate-panel-1bb6004d9198143df0d15b9b0a318607b59eaf0f.tar.xz
Merge pull request #136 from infirit/master
Fix build failure
-rw-r--r--applets/wncklet/window-list.c6
-rw-r--r--applets/wncklet/workspace-switcher.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index e24d6eb6..fc913617 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -121,7 +121,7 @@ static void applet_change_orient(MatePanelApplet* applet, MatePanelAppletOrient
tasklist->orientation = new_orient;
-#if WNCK_CHECK_VERSION (3, 4, 6)
+#if GTK_CHECK_VERSION (3, 0, 0) && WNCK_CHECK_VERSION (3, 4, 6)
wnck_tasklist_set_orientation (tasklist->tasklist, new_orient);
#endif
tasklist_update(tasklist);
@@ -425,13 +425,13 @@ gboolean window_list_applet_fill(MatePanelApplet* applet)
break;
}
-#if WNCK_CHECK_VERSION (2, 91, 6)
+#if GTK_CHECK_VERSION (3, 0, 0) && WNCK_CHECK_VERSION (2, 91, 6)
tasklist->tasklist = wnck_tasklist_new();
#else
tasklist->tasklist = wnck_tasklist_new(NULL);
#endif
-#if WNCK_CHECK_VERSION (3, 4, 6)
+#if GTK_CHECK_VERSION (3, 0, 0) && WNCK_CHECK_VERSION (3, 4, 6)
wnck_tasklist_set_orientation (tasklist->tasklist, tasklist->orientation);
#endif
diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
index 29a386e4..3ae4f9d2 100644
--- a/applets/wncklet/workspace-switcher.c
+++ b/applets/wncklet/workspace-switcher.c
@@ -529,7 +529,7 @@ gboolean workspace_switcher_applet_fill(MatePanelApplet* applet)
break;
}
-#if WNCK_CHECK_VERSION (2, 91, 6)
+#if GTK_CHECK_VERSION (3, 0, 0) && WNCK_CHECK_VERSION (2, 91, 6)
pager->pager = wnck_pager_new();
#else
pager->pager = wnck_pager_new(NULL);