From 428e32cd0f3f2df0cbd4e859304f0935a11612bc Mon Sep 17 00:00:00 2001 From: Alex Brinister Date: Mon, 11 Nov 2013 16:06:19 -0500 Subject: Fixed the WNCK_CHECK_VERSION calls to only be used when GTK is version 3.0 --- applets/wncklet/window-list.c | 7 ++++++- applets/wncklet/workspace-switcher.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c index e24d6eb6..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) #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) #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 29a386e4..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) #if WNCK_CHECK_VERSION (2, 91, 6) pager->pager = wnck_pager_new(); +#endif #else pager->pager = wnck_pager_new(NULL); #endif -- cgit v1.2.1 From a2b1af54a24b93766f5e2ed4a216637dc510ec47 Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 12 Nov 2013 15:07:45 +0100 Subject: Correct wnck/gtk3 check. --- applets/wncklet/window-list.c | 13 ++++--------- applets/wncklet/workspace-switcher.c | 4 +--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c index dd11af99..fc913617 100644 --- a/applets/wncklet/window-list.c +++ b/applets/wncklet/window-list.c @@ -121,10 +121,8 @@ 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) +#if GTK_CHECK_VERSION (3, 0, 0) && 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) +#if GTK_CHECK_VERSION (3, 0, 0) && 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) +#if GTK_CHECK_VERSION (3, 0, 0) && 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..3ae4f9d2 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) +#if GTK_CHECK_VERSION (3, 0, 0) && WNCK_CHECK_VERSION (2, 91, 6) pager->pager = wnck_pager_new(); -#endif #else pager->pager = wnck_pager_new(NULL); #endif -- cgit v1.2.1