From 45aca6d22cfcbebe2bfc526d6c346b81bdd908df Mon Sep 17 00:00:00 2001
From: Jim Nelson <jim@yorba.org>
Date: Tue, 12 Mar 2013 14:55:54 -0700
Subject: [PATCH] Geary doesn't build with Granite: Closes #6229, Closes #6206

Removes Granite from Geary.  We need to work with the Elementary
crew to build a Granite-enabled version of Geary.
---
 CMakeLists.txt                 |  1 -
 src/CMakeLists.txt             | 20 --------------------
 src/client/ui/main-window.vala |  5 -----
 3 files changed, 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cc0903f..9f74185a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,6 @@ find_package(PkgConfig)
 pkg_check_modules(LIBINDICATE QUIET indicate-0.7>=0.6.1)
 pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
 pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
-pkg_check_modules(LIBGRANITE QUIET granite>=0.1.1)
 
 # intl
 include(Gettext)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b14b4dd3..bba56d1e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -361,26 +361,6 @@ else ()
     message(STATUS "Unity launcher support: OFF")
 endif ()
 
-if (LIBGRANITE_FOUND)
-    message(STATUS "Granite support: ON")
-    set(EXTRA_CLIENT_PKG_CONFIG
-        ${EXTRA_CLIENT_PKG_CONFIG}
-        granite
-    )
-    
-    set(EXTRA_CLIENT_PACKAGES
-        ${EXTRA_CLIENT_PACKAGES}
-        granite
-    )
-    
-    set(EXTRA_VALA_OPTIONS
-        ${EXTRA_VALA_OPTIONS}
-        -D HAVE_LIBGRANITE
-    )
-else ()
-    message(STATUS "Granite support: OFF")
-endif ()
-
 set(TARGET_GLIB 2.32)
 
 pkg_check_modules(DEPS REQUIRED
diff --git a/src/client/ui/main-window.vala b/src/client/ui/main-window.vala
index 9f866982..920ffc30 100644
--- a/src/client/ui/main-window.vala
+++ b/src/client/ui/main-window.vala
@@ -18,13 +18,8 @@ public class MainWindow : Gtk.Window {
     public int window_height { get; set; }
     public bool window_maximized { get; set; }
 
-#if HAVE_LIBGRANITE
-    private Granite.Widgets.SidebarPaned folder_paned = new Granite.Widgets.SidebarPaned();
-    private Granite.Widgets.SidebarPaned conversations_paned = new Granite.Widgets.SidebarPaned();
-#else
     private Gtk.Paned folder_paned = new Gtk.Paned(Gtk.Orientation.HORIZONTAL);
     private Gtk.Paned conversations_paned = new Gtk.Paned(Gtk.Orientation.HORIZONTAL);
-#endif
 
     private Gtk.Spinner spinner = new Gtk.Spinner();