diff options
| author | infirit <[email protected]> | 2013-11-12 15:07:45 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2013-11-12 15:36:00 +0100 |
| commit | a2b1af54a24b93766f5e2ed4a216637dc510ec47 (patch) | |
| tree | eec9b217290f39140c3eb0bbf6cd7d9fe918cf5a | |
| parent | 428e32cd0f3f2df0cbd4e859304f0935a11612bc (diff) | |
| download | mate-panel-a2b1af54a24b93766f5e2ed4a216637dc510ec47.tar.bz2 mate-panel-a2b1af54a24b93766f5e2ed4a216637dc510ec47.tar.xz | |
Correct wnck/gtk3 check.
| -rw-r--r-- | applets/wncklet/window-list.c | 13 | ||||
| -rw-r--r-- | 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,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) +#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 |