summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2013-11-27 13:23:20 +0100
committerinfirit <[email protected]>2013-11-28 15:38:38 +0100
commit39ad4f5cc370685777e53f3be10781179ea1bd9e (patch)
tree50605f92b6ad6629c6ab546e47bb44590761c62f
parente453fc3773d3b49665c42d54069c4c82a853bc64 (diff)
downloadmate-panel-39ad4f5cc370685777e53f3be10781179ea1bd9e.tar.bz2
mate-panel-39ad4f5cc370685777e53f3be10781179ea1bd9e.tar.xz
Revert "Fixed the WNCK_CHECK_VERSION calls to only be used when GTK is version"
This reverts commit 428e32cd0f3f2df0cbd4e859304f0935a11612bc.
-rw-r--r--applets/wncklet/window-list.c7
-rw-r--r--applets/wncklet/workspace-switcher.c2
2 files changed, 1 insertions, 8 deletions
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index dd11af99..e24d6eb6 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -121,11 +121,9 @@ static void applet_change_orient(MatePanelApplet* applet, MatePanelAppletOrient
tasklist->orientation = new_orient;
-#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);
}
@@ -427,19 +425,16 @@ gboolean window_list_applet_fill(MatePanelApplet* applet)
break;
}
-#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)
#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 64f0b330..29a386e4 100644
--- a/applets/wncklet/workspace-switcher.c
+++ b/applets/wncklet/workspace-switcher.c
@@ -529,10 +529,8 @@ gboolean workspace_switcher_applet_fill(MatePanelApplet* applet)
break;
}
-#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