Merge lp:~elementary-pantheon/switchboard/switchboard-gmodule into lp:~elementary-pantheon/switchboard/switchboard

[Corentin Noël]

Introduce new plugin API using gmodule and GUI based on gtk+ 3.10

Switched to gmodule:
 * New Plug API
 * Now using the Gtk.Stack view switcher with animation
 * Now using the Gtk.HeaderBar
 * Multiarch compatibility

[Rico Tzschichholz (ricotz)]

<ricotz> tintou, regarding the libpeas branch don't use g-ir-scanner on the generated c-code
<ricotz> valac should create the gir and this one gets compiled with g-ir-compiler
<ricotz> otherwise the GI binding is useless and broken

<ricotz> tintou, since this is a new switchboard library you can start with 0 rather than 2
<tintou> ricotz: yes, but I think it's maybe better to follow switchboard version scheme
<ricotz> tintou, no, if you want a version then call it libswitchboard-2.0.so.0
<ricotz> which would be an API version

[Rico Tzschichholz (ricotz)]

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

Good, it compiles now.

[Rico Tzschichholz (ricotz)]

r416 is a no-go and should not be done that way.

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

The API could need some more thinking.

Public fields are not that great. E.g. Plug.vala contains a lot of fields which would better fit as "construct-only properties" or at least write-protected.

Of course this public API should have a proper valadoc-style documentation, not just some "// ..." comments.

review: Needs Fixing

[Cody Garver (codygarver)]

set (PLUGS_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/switchboard)

to

set (PLUGS_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PROJECT_NAME})

review: Needs Fixing

[Corentin Noël (tintou)]

Okay:
 * Added multiarch support
 * changed the API to a more solid one
 * Added valadoc-style documentation
 * changed switchboard to ${CMAKE_PROJECT_NAME}

[Rico Tzschichholz (ricotz)]

private static SwitchboardApp _instance;
public static SwitchboardApp instance {
   get {
Dont use a property here!

"public Switchboard.PlugsManager plugs_manager;" should be private

I didnt want to you to get the impression that you need to refactor the whole source. This was mostly targeted to the lines you touched and the especially the plug api. If you touch every line, you won't make the reviewer happier So please don't re-intend without good reason and keep using "namespace Switchboard { ...". This is getting a bit out of hand: 2520 lines (+1145/-1147) 18 files modified and changing indentation in this amount should be done in a separate merge which states clearly that there are "no changes".

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

So please be consistent and keep all changed "namespace Switchboard { ... }" and do the same for new classes, etc.

review: Needs Fixing

[Corentin Noël (tintou)]

I don't want to use "namespace Switchboard { … }" anymore, so It won't be in newly written code, and it will be removed from old code after this will be merged.
It's not present in the CategoryView class anymore because this one was almost entirely rewritten.

[Rico Tzschichholz (ricotz)]

I already mentioned my concerns about the Peas usage.
Look into using Peas.ExtensionBase and Peas.Activatable.

I would expect something like the following and its consequences, but I am not that familiar with peas yet.

    public abstract class Switchboard.Plug : Peas.ExtensionBase, Peas.Activatable {
    }

    exts = new Peas.ExtensionSet (engine, typeof (Switchboard.Plug), null);

[Danielle Foré (danrabbit)]

Not sure why, but with the latest revision switchboard's background is transparent

[lp:~elementary-pantheon/switchboard/switchboard-gmodule]

446. By Corentin Noël on 2014-01-02

Fixed code style and Changed ITEM_WIDTH to constant

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-12-03 14:30:40 +0000
+++ CMakeLists.txt	2014-01-02 20:30:11 +0000
@@ -5,21 +5,36 @@
 
 # Base bits
 
-#
-
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-set (PKGDATADIR "${DATADIR}/switchboard")
-set (GETTEXT_PACKAGE "switchboard")
+include (GNUInstallDirs)
+set (DATADIR ${CMAKE_INSTALL_FULL_DATAROOTDIR})
+set (PKGDATADIR "${DATADIR}/${CMAKE_PROJECT_NAME}")
+set (GETTEXT_PACKAGE "${CMAKE_PROJECT_NAME}")
 set (RELEASE_NAME "Preferences with piazzaz.")
-set (VERSION "1.0.1")
+set (PLUGS_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PROJECT_NAME})
+set (VERSION "2.0.0")
 set (VERSION_INFO "Stable Release")
+
+add_definitions ("-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"")
+
+# Comment this out to enable C compiler warnings
+add_definitions (-w)
+
+option (BUILD_SHARED_LIBS "Switch between shared and static libraries" ON)
+option (BUILD_SAMPLE "Build an example that shows how it works" OFF)
+
+if (BUILD_SHARED_LIBS)
+  message ("-- Shared libraries enabled")
+else ()
+  message ("-- Shared libraries disabled")
+endif ()
+
 #
 
 # Niceties
 
 #
 
-set (ARCHIVE_NAME switchboard-${VERSION})
+set (ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${VERSION})
 add_custom_target (dist
     COMMAND bzr export --root=${ARCHIVE_NAME} ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -38,21 +53,14 @@
 add_dependencies(distcheck dist)
 add_custom_target (uninstall "${CMAKE_COMMAND}" -P
   "${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake")
-#
-
-# config.h
-
-#
-
-configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
-add_definitions(-include config.h)
+
 #
 
 # Data
 
 #
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/switchboard.desktop DESTINATION /usr/share/applications)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/${CMAKE_PROJECT_NAME}.desktop DESTINATION /usr/share/applications)
 add_subdirectory(po)
 #
 
@@ -60,31 +68,61 @@
 
 #
 
+set (LIB_PACKAGES
+  glib-2.0
+  gio-2.0
+  gee-1.0
+  gmodule-2.0
+  gtk+-3.0
+  gio-unix-2.0
+)
+
+set (LIB_PKG
+  glib-2.0>=2.32
+  gio-2.0
+  gee-1.0
+  gmodule-2.0
+  gtk+-3.0>=3.10
+  gio-unix-2.0
+)
 find_package(PkgConfig)
-pkg_check_modules(DEPS REQUIRED granite gio-2.0 gee-1.0 gtk+-3.0>=3.6 unity)
-add_definitions(${DEPS_CFLAGS})
-link_directories(${DEPS_LIBRARY_DIRS})
-find_package(Vala REQUIRED)
-include(ValaVersion)
-ensure_vala_version("0.18.0" MINIMUM)
-include(ValaPrecompile)
-vala_precompile(VALA_C
-    src/Switchboard.vala
-    src/CategoryView.vala
-    src/Resources.vala
-    src/DesktopLauncher.vala
-    src/EmbeddedAlert.vala
-    src/NavigationButton.vala
-PACKAGES
-    granite
-    gee-1.0
-    gio-2.0
-    gtk+-3.0
-    unity
-CUSTOM_VAPIS
-    vapi/config.vapi
-    )
-add_definitions(${CFLAGS} -Wall -Winit-self -Wwrite-strings -Wunreachable-code -Wstrict-prototypes )
-add_executable(switchboard ${VALA_C})
-target_link_libraries(switchboard ${DEPS_LIBRARIES})
-install(TARGETS switchboard RUNTIME DESTINATION bin)
+
+pkg_check_modules (LIB REQUIRED ${LIB_PKG})
+
+set (GLOBAL_VALAC_OPTIONS
+  --vapidir=${CMAKE_BINARY_DIR}/lib
+  --target-glib=2.32
+  --thread
+)
+
+find_package (Vala REQUIRED)
+include (ValaVersion)
+ensure_vala_version ("0.21.0" MINIMUM)
+include (ValaPrecompile)
+
+add_subdirectory (lib)
+
+set (DEPS_PACKAGES
+  ${LIB_NAME}
+  ${LIB_PACKAGES} # this is needed until we provide a ${CMAKE_PROJECT_NAME}.deps file
+  granite
+  unity
+)
+
+set (DEPS_PKG
+  granite
+  unity
+)
+
+pkg_check_modules (DEPS REQUIRED ${DEPS_PKG} ${LIB_PKG})
+set (DEPS_LIBRARIES ${DEPS_LIBRARIES} -lm)
+
+# 'src' and 'plugins' depend on the core library
+include_directories (${CMAKE_BINARY_DIR}/lib)
+set (DEPS_LIBRARIES ${DEPS_LIBRARIES} ${LIB_NAME})
+add_subdirectory (src)
+
+
+if (BUILD_SAMPLE)
+  add_subdirectory (sample)
+endif ()

=== added file 'cmake/FindGirCompiler.cmake'
--- cmake/FindGirCompiler.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGirCompiler.cmake	2014-01-02 20:30:11 +0000
@@ -0,0 +1,56 @@
+##
+# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+#    1. Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+# 
+#    2. Redistributions in binary form must reproduce the above copyright notice,
+#       this list of conditions and the following disclaimer in the documentation
+#       and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of Jakob Westhoff
+##
+
+##
+# Find module for the Gir compiler (g-ir-compiler)
+#
+# This module determines wheter a Gir compiler is installed on the current
+# system and where its executable is.
+#
+# Call the module using "find_package(GirCompiler) from within your CMakeLists.txt.
+#
+# The following variables will be set after an invocation:
+#
+#  G_IR_COMPILER_FOUND       Whether the g-ir-compiler compiler has been found or not
+#  G_IR_COMPILER_EXECUTABLE  Full path to the g-ir-compiler executable if it has been found
+##
+
+
+# Search for the g-ir-compiler executable in the usual system paths.
+find_program (G_IR_COMPILER_EXECUTABLE
+  NAMES g-ir-compiler)
+
+# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.
+# Furthermore set G_IR_COMPILER_FOUND to TRUE if the g-ir-compiler has been found (aka.
+# G_IR_COMPILER_EXECUTABLE is set)
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (GirCompiler DEFAULT_MSG G_IR_COMPILER_EXECUTABLE)
+
+mark_as_advanced (G_IR_COMPILER_EXECUTABLE)

=== removed file 'cmake/Makefile'
--- cmake/Makefile	2012-01-13 17:02:58 +0000
+++ cmake/Makefile	1970-01-01 00:00:00 +0000
@@ -1,286 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.8
-
-# Default target executed when no arguments are given to make.
-default_target: all
-.PHONY : default_target
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-# Remove some rules from gmake that .SUFFIXES does not remove.
-SUFFIXES =
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/mefrio/Scrivania/cmake
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/mefrio/Scrivania/cmake/cmake
-
-#=============================================================================
-# Targets provided globally by CMake.
-
-# Special rule for the target edit_cache
-edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
-	/usr/bin/cmake -i .
-.PHONY : edit_cache
-
-# Special rule for the target edit_cache
-edit_cache/fast: edit_cache
-.PHONY : edit_cache/fast
-
-# Special rule for the target install
-install: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/bin/cmake -P cmake_install.cmake
-.PHONY : install
-
-# Special rule for the target install
-install/fast: preinstall/fast
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/bin/cmake -P cmake_install.cmake
-.PHONY : install/fast
-
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
-
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
-
-# Special rule for the target install/strip
-install/strip: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
-	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
-.PHONY : install/strip
-
-# Special rule for the target install/strip
-install/strip/fast: install/strip
-.PHONY : install/strip/fast
-
-# Special rule for the target list_install_components
-list_install_components:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
-.PHONY : list_install_components
-
-# Special rule for the target list_install_components
-list_install_components/fast: list_install_components
-.PHONY : list_install_components/fast
-
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
-# The main all target
-all: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/mefrio/Scrivania/cmake/cmake/CMakeFiles /home/mefrio/Scrivania/cmake/cmake/CMakeFiles/progress.marks
-	$(MAKE) -f CMakeFiles/Makefile2 all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/mefrio/Scrivania/cmake/cmake/CMakeFiles 0
-.PHONY : all
-
-# The main clean target
-clean:
-	$(MAKE) -f CMakeFiles/Makefile2 clean
-.PHONY : clean
-
-# The main clean target
-clean/fast: clean
-.PHONY : clean/fast
-
-# Prepare targets for installation.
-preinstall: all
-	$(MAKE) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall
-
-# Prepare targets for installation.
-preinstall/fast:
-	$(MAKE) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall/fast
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-.PHONY : depend
-
-#=============================================================================
-# Target rules for targets named scratch
-
-# Build rule for target.
-scratch: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 scratch
-.PHONY : scratch
-
-# fast build rule for target.
-scratch/fast:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/build
-.PHONY : scratch/fast
-
-src/entry.o: src/entry.c.o
-.PHONY : src/entry.o
-
-# target to build an object file
-src/entry.c.o:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/entry.c.o
-.PHONY : src/entry.c.o
-
-src/entry.i: src/entry.c.i
-.PHONY : src/entry.i
-
-# target to preprocess a source file
-src/entry.c.i:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/entry.c.i
-.PHONY : src/entry.c.i
-
-src/entry.s: src/entry.c.s
-.PHONY : src/entry.s
-
-# target to generate assembly for a file
-src/entry.c.s:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/entry.c.s
-.PHONY : src/entry.c.s
-
-src/main_window.o: src/main_window.c.o
-.PHONY : src/main_window.o
-
-# target to build an object file
-src/main_window.c.o:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/main_window.c.o
-.PHONY : src/main_window.c.o
-
-src/main_window.i: src/main_window.c.i
-.PHONY : src/main_window.i
-
-# target to preprocess a source file
-src/main_window.c.i:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/main_window.c.i
-.PHONY : src/main_window.c.i
-
-src/main_window.s: src/main_window.c.s
-.PHONY : src/main_window.s
-
-# target to generate assembly for a file
-src/main_window.c.s:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/main_window.c.s
-.PHONY : src/main_window.c.s
-
-src/menu.o: src/menu.c.o
-.PHONY : src/menu.o
-
-# target to build an object file
-src/menu.c.o:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/menu.c.o
-.PHONY : src/menu.c.o
-
-src/menu.i: src/menu.c.i
-.PHONY : src/menu.i
-
-# target to preprocess a source file
-src/menu.c.i:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/menu.c.i
-.PHONY : src/menu.c.i
-
-src/menu.s: src/menu.c.s
-.PHONY : src/menu.s
-
-# target to generate assembly for a file
-src/menu.c.s:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/menu.c.s
-.PHONY : src/menu.c.s
-
-src/notebook.o: src/notebook.c.o
-.PHONY : src/notebook.o
-
-# target to build an object file
-src/notebook.c.o:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/notebook.c.o
-.PHONY : src/notebook.c.o
-
-src/notebook.i: src/notebook.c.i
-.PHONY : src/notebook.i
-
-# target to preprocess a source file
-src/notebook.c.i:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/notebook.c.i
-.PHONY : src/notebook.c.i
-
-src/notebook.s: src/notebook.c.s
-.PHONY : src/notebook.s
-
-# target to generate assembly for a file
-src/notebook.c.s:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/notebook.c.s
-.PHONY : src/notebook.c.s
-
-# Help Target
-help:
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... edit_cache"
-	@echo "... install"
-	@echo "... install/local"
-	@echo "... install/strip"
-	@echo "... list_install_components"
-	@echo "... rebuild_cache"
-	@echo "... scratch"
-	@echo "... src/entry.o"
-	@echo "... src/entry.i"
-	@echo "... src/entry.s"
-	@echo "... src/main_window.o"
-	@echo "... src/main_window.i"
-	@echo "... src/main_window.s"
-	@echo "... src/menu.o"
-	@echo "... src/menu.i"
-	@echo "... src/menu.s"
-	@echo "... src/notebook.o"
-	@echo "... src/notebook.i"
-	@echo "... src/notebook.s"
-.PHONY : help
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-.PHONY : cmake_check_build_system
-

=== modified file 'cmake/Translations.cmake' (properties changed: -x to +x)
--- cmake/Translations.cmake	2012-06-05 05:30:28 +0000
+++ cmake/Translations.cmake	2014-01-02 20:30:11 +0000
@@ -36,6 +36,7 @@
 
     add_custom_command (TARGET pot COMMAND
         ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
-        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
+        ${VALA_SOURCE} ${C_SOURCE} --add-comments="/" --keyword="_" --keyword="N_" --keyword="C_:1c,2"
+        --keyword="NC_:1c,2" --keyword="ngettext:1,2" --keyword="N_" --keyword="Q_:1g" --from-code=UTF-8
         )
 endmacro()

=== modified file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	2012-01-13 17:02:58 +0000
+++ cmake/ValaPrecompile.cmake	2014-01-02 20:30:11 +0000
@@ -1,5 +1,6 @@
 ##
 # Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# Copyright 2012 elementary.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -74,10 +75,18 @@
 #   be a header file as well as an internal header file being generated called
 #   <provided_name>.h and <provided_name>_internal.h
 #
+# GENERATE_GIR
+#   Have the compiler generate a GObject-Introspection repository file with
+#   name: <provided_name>.gir. This can be later used to create a binary typelib
+#   using the GI compiler.
+#
+# GENERATE_SYMBOLS
+#   Output a <provided_name>.symbols file containing all the exported symbols.
+# 
 # The following call is a simple example to the vala_precompile macro showing
 # an example to every of the optional sections:
 #
-#   vala_precompile(VALA_C
+#   vala_precompile(VALA_C mytargetname
 #       source1.vala
 #       source2.vala
 #       source3.vala
@@ -95,14 +104,19 @@
 #       myvapi
 #   GENERATE_HEADER
 #       myheader
+#   GENERATE_GIR
+#       mygir
+#   GENERATE_SYMBOLS
+#       mysymbols
 #   )
 #
 # Most important is the variable VALA_C which will contain all the generated c
 # file names after the call.
 ##
 
-macro(vala_precompile output)
-    parse_arguments(ARGS "PACKAGES;OPTIONS;DIRECTORY;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN})
+macro(vala_precompile output target_name)
+    parse_arguments(ARGS "TARGET;PACKAGES;OPTIONS;DIRECTORY;GENERATE_GIR;GENERATE_SYMBOLS;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN})
+
     if(ARGS_DIRECTORY)
         set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY})
     else(ARGS_DIRECTORY)
@@ -115,14 +129,17 @@
     endforeach(pkg ${ARGS_PACKAGES})
     set(in_files "")
     set(out_files "")
+    set(out_files_display "")
     set(${output} "")
+
     foreach(src ${ARGS_DEFAULT_ARGS})
         string(REGEX MATCH "^/" IS_MATCHED ${src})
         if(${IS_MATCHED} MATCHES "/")
-            list(APPEND in_files "${src}")
+            set(src_file_path ${src})
         else()
-            list(APPEND in_files "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
+            set(src_file_path ${CMAKE_CURRENT_SOURCE_DIR}/${src})
         endif()
+        list(APPEND in_files ${src_file_path})
         string(REPLACE ".vala" ".c" src ${src})
         string(REPLACE ".gs" ".c" src ${src})
         if(${IS_MATCHED} MATCHES "/")
@@ -134,6 +151,7 @@
             list(APPEND out_files "${DIRECTORY}/${src}")
         endif()
         list(APPEND ${output} ${out_file})
+        list(APPEND out_files_display "${src}")
     endforeach(src ${ARGS_DEFAULT_ARGS})
 
     set(custom_vapi_arguments "")
@@ -150,7 +168,8 @@
     set(vapi_arguments "")
     if(ARGS_GENERATE_VAPI)
         list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi")
-        set(vapi_arguments "--internal-vapi=${ARGS_GENERATE_VAPI}.vapi")
+        list(APPEND out_files_display "${ARGS_GENERATE_VAPI}.vapi")
+        set(vapi_arguments "--library=${ARGS_GENERATE_VAPI}" "--vapi=${ARGS_GENERATE_VAPI}.vapi")
 
         # Header and internal header is needed to generate internal vapi
         if (NOT ARGS_GENERATE_HEADER)
@@ -161,26 +180,69 @@
     set(header_arguments "")
     if(ARGS_GENERATE_HEADER)
         list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}.h")
-        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h")
-        list(APPEND header_arguments "--header=${DIRECTORY}/${ARGS_GENERATE_HEADER}.h")
-        list(APPEND header_arguments "--internal-header=${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h")
+        list(APPEND out_files_display "${ARGS_GENERATE_HEADER}.h")
+        list(APPEND header_arguments "--header=${ARGS_GENERATE_HEADER}.h")
     endif(ARGS_GENERATE_HEADER)
 
-    add_custom_command(OUTPUT ${out_files} 
+    set(gir_arguments "")
+    set(gircomp_command "")
+    if(ARGS_GENERATE_GIR)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir")
+        list(APPEND out_files_display "${ARGS_GENERATE_GIR}.gir")
+        set(gir_arguments "--gir=${ARGS_GENERATE_GIR}.gir")
+
+        include (FindGirCompiler)
+        find_package(GirCompiler REQUIRED)
+        
+        set(gircomp_command 
+            COMMAND 
+                ${G_IR_COMPILER_EXECUTABLE}
+            ARGS 
+                "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir"
+                -o "${DIRECTORY}/${ARGS_GENERATE_GIR}.typelib")
+    endif(ARGS_GENERATE_GIR)
+
+    set(symbols_arguments "")
+    if(ARGS_GENERATE_SYMBOLS)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_SYMBOLS}.symbols")
+        list(APPEND out_files_display "${ARGS_GENERATE_SYMBOLS}.symbols")
+        set(symbols_arguments "--symbols=${ARGS_GENERATE_SYMBOLS}.symbols")
+    endif(ARGS_GENERATE_SYMBOLS)
+
+    # Workaround for a bug that would make valac run twice. This file is written
+    # after the vala compiler generates C source code.
+    set(OUTPUT_STAMP ${CMAKE_CURRENT_BINARY_DIR}/${target_name}_valac.stamp)
+        
+    add_custom_command(
+    OUTPUT
+        ${OUTPUT_STAMP}
     COMMAND 
         ${VALA_EXECUTABLE} 
     ARGS 
         "-C" 
         ${header_arguments} 
-        ${vapi_arguments}
+        ${vapi_arguments} 
+        ${gir_arguments} 
+        ${symbols_arguments} 
         "-b" ${CMAKE_CURRENT_SOURCE_DIR} 
         "-d" ${DIRECTORY} 
         ${vala_pkg_opts} 
         ${ARGS_OPTIONS} 
         ${in_files} 
         ${custom_vapi_arguments}
+    COMMAND
+        touch
+    ARGS
+        ${OUTPUT_STAMP}
     DEPENDS 
         ${in_files} 
         ${ARGS_CUSTOM_VAPIS}
+    COMMENT
+        "Generating ${out_files_display}"
+    ${gircomp_command}
     )
+
+    # This command will be run twice for some reason (pass a non-empty string to COMMENT
+    # in order to see it). Since valac is not executed from here, this won't be a problem.
+    add_custom_command(OUTPUT ${out_files} DEPENDS ${OUTPUT_STAMP} COMMENT "")
 endmacro(vala_precompile)

=== removed file 'config.h.cmake'
--- config.h.cmake	2011-06-23 05:56:29 +0000
+++ config.h.cmake	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#cmakedefine DATADIR "@DATADIR@"
-#cmakedefine PKGDATADIR "@PKGDATADIR@"
-#cmakedefine GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
-#cmakedefine RELEASE_NAME "@RELEASE_NAME@"
-#cmakedefine VERSION "@VERSION@"
-#cmakedefine VERSION_INFO "@VERSION_INFO@"
-
-#endif // CONFIG_H

=== added directory 'lib'
=== added file 'lib/CMakeLists.txt'
--- lib/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ lib/CMakeLists.txt	2014-01-02 20:30:11 +0000
@@ -0,0 +1,74 @@
+######################
+# Set Variables
+######################
+
+set (CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/config.vala)
+set (PREFIX ${CMAKE_INSTALL_PREFIX})
+set (DOLLAR "$") # You hear that? It's kittens being killed by the gods of cmake
+set (LIB_VERSION 2.0)
+set (LIB_VERSION ${LIB_VERSION} PARENT_SCOPE)
+set (LIB_SOVERSION 0)
+set (LIB_SOVERSION ${LIB_SOVERSION} PARENT_SCOPE)
+set (LIB_NAME ${CMAKE_PROJECT_NAME}-${LIB_VERSION})
+set (LIB_NAME ${LIB_NAME} PARENT_SCOPE)
+
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.vala.cmake ${CONFIG_FILE})
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc)
+
+set (LIB_SOURCE
+  ${CONFIG_FILE}
+  Plug.vala
+  PlugsManager.vala
+)
+
+if  (BUILD_SHARED_LIBS)
+  set (LINK_MODE SHARED)
+else ()
+  set (LINK_MODE STATIC)
+endif ()
+
+######################
+# Generate .c, .vapi, .gir and .h
+######################
+
+vala_precompile (LIB_VALA_C ${LIB_NAME}
+  ${LIB_SOURCE}
+  PACKAGES
+  ${LIB_PACKAGES}
+  OPTIONS
+  ${GLOBAL_VALAC_OPTIONS}
+  GENERATE_VAPI
+  ${LIB_NAME}
+  GENERATE_HEADER
+  ${CMAKE_PROJECT_NAME}
+)
+
+######################
+# Include definitions
+######################
+
+add_definitions (${LIB_CFLAGS})
+link_directories (${LIB_LIBRARY_DIRS})
+
+add_library (${LIB_NAME} ${LINK_MODE} ${LIB_VALA_C})
+
+set_target_properties (${LIB_NAME} PROPERTIES
+  OUTPUT_NAME ${LIB_NAME}
+  VERSION ${LIB_VERSION}
+  SOVERSION ${LIB_SOVERSION}
+)
+
+target_link_libraries (${LIB_NAME} ${LIB_LIBRARIES})
+
+######################
+# Installation
+######################
+
+if (BUILD_SHARED_LIBS)
+  install (TARGETS ${LIB_NAME} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
+  # Install lib stuffs
+  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig/)
+  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.vapi DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/vala/vapi/)
+  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_NAME}.deps DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/vala/vapi/)
+  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.h DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${LIB_NAME}/)
+endif ()

=== added file 'lib/Plug.vala'
--- lib/Plug.vala	1970-01-01 00:00:00 +0000
+++ lib/Plug.vala	2014-01-02 20:30:11 +0000
@@ -0,0 +1,113 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2012-2013 Switchboard Developers (http://launchpad.net/switchboard)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Corentin Noël <[e-mail]>
+ */
+
+public abstract class Switchboard.Plug : GLib.Object {
+    
+    public enum Category {
+        PERSONAL = 0,
+        HARDWARE = 1,
+        NETWORK = 2,
+        SYSTEM = 3,
+        OTHER = 4
+    }
+    
+    /**
+     * The common used separator.
+     */
+    public const string SEP = "<sep>";
+    
+    /**
+     * The category under which the plug will be stored.
+     * 
+     * Possible {@link Category} values are PERSONAL, HARDWARE, NETWORK or SYSTEM.
+     */
+    public Category category { get; construct; }
+    
+    /**
+     * The unique name representing the plug.
+     * 
+     * It is also used to recognise it with the open-plug command.
+     * for example "system-pantheon-info" for the official Info plug of the pantheon desktop.
+     */
+    public string code_name { get; construct; }
+    
+    /**
+     * The localised name of the plug.
+     */
+    public string display_name { get; construct; }
+    
+    /**
+     * A short description of the plug.
+     */
+    public string description { get; construct; }
+    
+    /**
+     * The icon representing the plug.
+     */
+    public string icon { get; construct; }
+    
+    /**
+     * Inform if the plug should be shown or not
+     */
+    public bool can_show { get; set; default=true;}
+    
+    /**
+     * Inform the application that the plug can now be listed in the available plugs
+     */
+    public signal void visibility_changed ();
+    
+    /**
+     * Returns the widget that contain the whole interface.
+     *
+     * @return a {@link Gtk.Widget} containing the interface.
+     */
+    public abstract Gtk.Widget get_widget ();
+    
+    /**
+     * Called when the plug appears to the user.
+     */
+    public abstract void shown ();
+    
+    /**
+     * Called when the plug disappear to the user.
+     * 
+     * This is not called when the plug got destroyed or the window is closed, use ~Plug () instead.
+     */
+    public abstract void hidden ();
+    
+    /**
+     * This function should return the widget that contain the whole interface.
+     * 
+     * When the user click on an action, the second parameter is send to the {@link search_callback} method
+     * 
+     * @param search a {@link string} that represent the search.
+     * @return a {@link Gee.TreeMap} containing two strings like {"Keyboard → Behavior → Duration", "keyboard<sep>behavior"}.
+     */
+    public abstract async Gee.TreeMap<string, string> search (string search);
+    
+    /**
+     * This function is used when the user click on a search result, it should show the selected setting (right tab…).
+     * 
+     * @param location a {@link string} that represents the setting to show.
+     */
+    public abstract void search_callback (string location);
+}

=== added file 'lib/PlugsManager.vala'
--- lib/PlugsManager.vala	1970-01-01 00:00:00 +0000
+++ lib/PlugsManager.vala	2014-01-02 20:30:11 +0000
@@ -0,0 +1,106 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2012-2013 Switchboard Developers (http://launchpad.net/switchboard)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Corentin Noël <[e-mail]>
+ */
+
+public class Switchboard.PlugsManager : GLib.Object {
+    
+    private static Switchboard.PlugsManager? plugs_manager = null;
+    
+    public static PlugsManager get_default () {
+        if (plugs_manager == null)
+            plugs_manager = new PlugsManager ();
+        return plugs_manager;
+    }
+    
+    [CCode (has_target = false)]
+    private delegate Switchboard.Plug RegisterPluginFunction (Module module);
+    
+    private Gee.LinkedList<Switchboard.Plug> plugs;
+    
+    public signal void plug_added (Switchboard.Plug plug);
+    
+    private PlugsManager () {
+        plugs = new Gee.LinkedList<Switchboard.Plug> ();
+        var base_folder = File.new_for_path (Build.PLUGS_DIR);
+        find_plugins (base_folder);
+    }
+
+    private void load (string path) {
+        if (Module.supported () == false) {
+            error ("Switchboard is not supported by this system!");
+        }
+
+        Module module = Module.open (path, ModuleFlags.BIND_LAZY);
+        if (module == null) {
+            critical (Module.error ());
+            return;
+        }
+
+        void* function;
+        module.symbol ("get_plug", out function);
+        if (function == null) {
+            critical ("get_plug () not found in %s", path);
+            return;
+        }
+
+        RegisterPluginFunction register_plugin = (RegisterPluginFunction) function;
+        Switchboard.Plug plug = register_plugin (module);
+        if (plug == null) {
+            critical ("Unknown plugin type for %s !", path);
+            return;
+        }
+        module.make_resident ();
+        register_plug (plug);
+    }
+    
+    private void find_plugins (File base_folder) {
+        FileInfo file_info = null;
+        try {
+            var enumerator = base_folder.enumerate_children (FileAttribute.STANDARD_NAME + "," + FileAttribute.STANDARD_TYPE + "," + FileAttribute.STANDARD_CONTENT_TYPE, 0);
+            while ((file_info = enumerator.next_file ()) != null) {
+                var file = base_folder.get_child (file_info.get_name ());
+
+                if (file_info.get_file_type () == FileType.REGULAR && GLib.ContentType.equals (file_info.get_content_type (), "application/x-sharedlib")) {
+                    load (file.get_path ());
+                } else if (file_info.get_file_type () == FileType.DIRECTORY) {
+                    find_plugins (file);
+                }
+            }
+        } catch (Error err) {
+            warning("Unable to scan plugs folder: %s\n", err.message);
+        }
+    }
+    
+    private void register_plug (Switchboard.Plug plug) {
+        if (plugs.contains (plug))
+            return;
+        plugs.add (plug);
+        plug_added (plug);
+    }
+    
+    public bool has_plugs () {
+        return !plugs.is_empty;
+    }
+    
+    public Gee.Collection<Switchboard.Plug> get_plugs () {
+        return plugs.read_only_view;
+    }
+}
\ No newline at end of file

=== added file 'lib/config.vala.cmake'
--- lib/config.vala.cmake	1970-01-01 00:00:00 +0000
+++ lib/config.vala.cmake	2014-01-02 20:30:11 +0000
@@ -0,0 +1,9 @@
+namespace Switchboard.Build {
+    public const string DATADIR = "@DATADIR@";
+    public const string PKGDATADIR = "@PKGDATADIR@";
+    public const string PLUGS_DIR = "@PLUGS_DIR@";
+    public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
+    public const string RELEASE_NAME = "@RELEASE_NAME@";
+    public const string VERSION = "@VERSION@";
+    public const string VERSION_INFO = "@VERSION_INFO@";
+}

=== added file 'lib/switchboard-2.0.deps'
--- lib/switchboard-2.0.deps	1970-01-01 00:00:00 +0000
+++ lib/switchboard-2.0.deps	2014-01-02 20:30:11 +0000
@@ -0,0 +1,6 @@
+glib-2.0
+gio-2.0
+gee-1.0
+gmodule-2.0
+gtk+-3.0
+gio-unix-2.0

=== added file 'lib/switchboard.pc.cmake'
--- lib/switchboard.pc.cmake	1970-01-01 00:00:00 +0000
+++ lib/switchboard.pc.cmake	2014-01-02 20:30:11 +0000
@@ -0,0 +1,12 @@
+prefix=@PREFIX@
+exec_prefix=@DOLLAR@{prefix}
+libdir=@DOLLAR@{prefix}/lib
+includedir=@DOLLAR@{prefix}/include/
+ 
+Name: Switchboard
+Description: Switchboard headers  
+Version: 2.0  
+Libs: -lswitchboard-2.0
+Cflags: -I@DOLLAR@{includedir}/switchboard-2.0
+Requires: glib-2.0 gio-2.0 gee-1.0 gmodule-2.0 gtk+-3.0 gio-unix-2.0
+

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2012-01-13 17:02:58 +0000
+++ po/CMakeLists.txt	2014-01-02 20:30:11 +0000
@@ -1,5 +1,5 @@
 include(Translations)
 add_translations_directory("switchboard")
 add_translations_catalog("switchboard"
-    ../Switchboard/
+    ../src/
 )

=== modified file 'po/switchboard.pot'
--- po/switchboard.pot	2012-08-02 04:47:30 +0000
+++ po/switchboard.pot	2014-01-02 20:30:11 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 23:47-0500\n"
+"POT-Creation-Date: 2013-12-14 17:45+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,96 +17,56 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-categoryview.vala:29
+#: /home/noelco/libpeas-isis/po/../src//DesktopLauncher.vala:6
+msgid "Change system and user settings"
+msgstr ""
+
+#: /home/noelco/libpeas-isis/po/../src//DesktopLauncher.vala:7
+msgid "Settings Center"
+msgstr ""
+
+#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:174
+#, c-format
+msgid "Unable to load plug %s's icon: %s"
+msgstr ""
+
+#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:211
+#: /home/noelco/libpeas-isis/po/../src//Switchboard.vala:132
+msgid "No settings found"
+msgstr ""
+
+#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:211
+msgid "Try changing your search terms"
+msgstr ""
+
+#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:302
 msgid "Personal"
 msgstr ""
 
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-categoryview.vala:29
+#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:305
 msgid "Hardware"
 msgstr ""
 
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-categoryview.vala:29
+#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:308
 msgid "Network and Wireless"
 msgstr ""
 
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-categoryview.vala:29
+#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:311
 msgid "System"
 msgstr ""
 
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-categoryview.vala:85
-#, c-format
-msgid ""
-"Keyfile \"%s\" contains an invalid category: \"%s\", and will not be added"
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-categoryview.vala:94
-#, c-format
-msgid "Unable to load plug %s's icon: %s"
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-categoryview.vala:137
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-app.vala:159
-msgid "No settings found"
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-categoryview.vala:137
-msgid "Try changing your search terms"
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-desktoplauncher.vala:6
-msgid "Change system and user settings"
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-desktoplauncher.vala:7
-msgid "Settings Center"
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-app.vala:159
+#: /home/noelco/libpeas-isis/po/../src//Switchboard.vala:38
+msgid "All Settings"
+msgstr ""
+
+#: /home/noelco/libpeas-isis/po/../src//Switchboard.vala:132
 msgid "Install some and re-launch Switchboard"
 msgstr ""
 
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-app.vala:213
-#, c-format
-msgid "Closing plug \"%s\" in Switchboard controller..."
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-app.vala:225
-#, c-format
-msgid "Failed to launch plug: title %s | executable %s"
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-app.vala:322
-msgid "title"
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-app.vala:369
-msgid "Unable to iterate over enumerated plug directory \"$path\"'s contents"
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-app.vala:462
+#: /home/noelco/libpeas-isis/po/../src//Switchboard.vala:215
 msgid "Search Settings"
 msgstr ""
 
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-app.vala:492
+#: /home/noelco/libpeas-isis/po/../src//Switchboard.vala:315
 msgid "Open a plug"
 msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-app.vala:501
-msgid "Welcome to $APP_TITLE"
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-app.vala:502
-msgid "Version: $VERSION"
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-app.vala:503
-msgid "Report any issues/bugs you mind find to lp:switchboard"
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-app.vala:526
-msgid "Switchboard already running. Exiting.."
-msgstr ""
-
-#: /home/codygarver/switchboard/po/../Switchboard//switchboard-resources.vala:3
-msgid "System Settings"
-msgstr ""

=== added directory 'sample'
=== added file 'sample/CMakeLists.txt'
--- sample/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ sample/CMakeLists.txt	2014-01-02 20:30:11 +0000
@@ -0,0 +1,29 @@
+find_package (PkgConfig)
+
+# Add all your dependencies to the list below
+pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 switchboard-2.0)
+
+add_definitions (${DEPS_CFLAGS})
+link_directories (${DEPS_LIBRARY_DIRS})
+set (SAMPLEPLUG "plug-sample")
+
+find_package (Vala REQUIRED)
+include (ValaVersion)
+ensure_vala_version ("0.12.0" MINIMUM)
+
+include (ValaPrecompile)
+# Add all your vala files and requires packages to the List below to include them in the build
+vala_precompile (VALA_C ${SAMPLEPLUG}
+    SamplePlug.vala
+PACKAGES
+    gtk+-3.0
+    switchboard-2.0
+OPTIONS
+    --thread
+)
+
+add_library (${SAMPLEPLUG} MODULE ${VALA_C})
+target_link_libraries(${SAMPLEPLUG} ${DEPS_LIBRARIES})
+
+# Installation
+install (TARGETS ${SAMPLEPLUG} DESTINATION "${PLUGS_DIR}/${PLUGNAME}")
\ No newline at end of file

=== added file 'sample/SamplePlug.vala'
--- sample/SamplePlug.vala	1970-01-01 00:00:00 +0000
+++ sample/SamplePlug.vala	2014-01-02 20:30:11 +0000
@@ -0,0 +1,67 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2012-2013 Switchboard Developers (http://launchpad.net/switchboard)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Corentin Noël <[e-mail]>
+ */
+
+public class Sample.Plug : Switchboard.Plug {
+
+    private Gtk.Grid main_grid;
+
+    public Plug () {
+        Object (category: Category.SYSTEM,
+                code_name: "sample-plug",
+                display_name: _("Sample Plug"),
+                description:_("Does nothing, but it is cool !"),
+                icon: "system-run");
+    }
+    
+    public override Gtk.Widget get_widget () {
+        if (main_grid == null) {
+            main_grid = new Gtk.Grid ();
+            var hello_label = new Gtk.Label ("Hello World!");
+            main_grid.attach (hello_label, 0, 0, 1, 1);
+        }
+        main_grid.show_all ();
+        return main_grid;
+    }
+    
+    public override void shown () {
+        
+    }
+    
+    public override void hidden () {
+        
+    }
+    
+    public override void search_callback (string location) {
+    
+    }
+    
+    // 'search' returns results like ("Keyboard → Behavior → Duration", "keyboard<sep>behavior")
+    public override async Gee.TreeMap<string, string> search (string search) {
+        return new Gee.TreeMap<string, string> (null, null);
+    }
+}
+
+public Switchboard.Plug get_plug (Module module) {
+    debug ("Activating Sample plug");
+    var plug = new Sample.Plug ();
+    return plug;
+}
\ No newline at end of file

=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/CMakeLists.txt	2014-01-02 20:30:11 +0000
@@ -0,0 +1,25 @@
+set(CLIENT_SOURCE
+    Switchboard.vala
+    CategoryView.vala
+    DesktopLauncher.vala
+    EmbeddedAlert.vala
+    NavigationButton.vala
+)
+
+vala_precompile (CLIENT_VALA_C ${CMAKE_PROJECT_NAME}
+  ${CLIENT_SOURCE}
+  PACKAGES
+  ${DEPS_PACKAGES}
+  OPTIONS
+  ${GLOBAL_VALAC_OPTIONS}
+)
+
+set (EXEC_NAME ../${CMAKE_PROJECT_NAME})
+
+add_definitions (${DEPS_CFLAGS})
+link_directories (${DEPS_LIBRARY_DIRS})
+add_executable (${EXEC_NAME} ${CLIENT_VALA_C})
+
+target_link_libraries (${EXEC_NAME} ${DEPS_LIBRARIES})
+
+install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})

=== modified file 'src/CategoryView.vala'
--- src/CategoryView.vala	2013-09-29 19:41:03 +0000
+++ src/CategoryView.vala	2014-01-02 20:30:11 +0000
@@ -19,160 +19,290 @@
 
     public class CategoryView : Gtk.Grid {
 
-        public Gee.HashMap<string, Gtk.Grid> category_labels = new Gee.HashMap<string, Gtk.Grid> ();
-        public Gee.HashMap<string, Gtk.ListStore> category_store = new Gee.HashMap<string, Gtk.ListStore> ();
-        public Gee.HashMap<string, Gtk.IconView> category_views = new Gee.HashMap<string, Gtk.IconView> ();
+        public enum Columns {
+            ICON,
+            TEXT,
+            DESCRIPTION,
+            VISIBLE,
+            PLUG,
+            N_COLUMNS
+        }
+
+        const int ITEM_WIDTH = 96;
+
+        public signal void plug_selected (Switchboard.Plug plug);
+
         Gtk.IconTheme theme = Gtk.IconTheme.get_default ();
-
-        public signal void plug_selected (string title, string executable, bool @extern);
-        public string[] category_ids = { "personal", "hardware", "network", "system" };
-        public string[] category_names = { N_("Personal"), N_("Hardware"), N_("Network and Wireless"), N_("System") };
-
-        int ITEM_WIDTH = 96;
-        int ITEM_PADDING = 10;
+        Gtk.Grid personal_grid;
+        Gtk.Grid hardware_grid;
+        Gtk.Grid network_grid;
+        Gtk.Grid system_grid;
+
+        public Gtk.IconView personal_iconview;
+        public Gtk.IconView hardware_iconview;
+        public Gtk.IconView network_iconview;
+        public Gtk.IconView system_iconview;
 
         public CategoryView () {
-            for (int i = 0; i < category_ids.length; i++) {
-                var store = new Gtk.ListStore (5, typeof (Gdk.Pixbuf), typeof (string), 
-                    typeof(string), typeof(bool), typeof(string));
-                store.set_sort_column_id (1, Gtk.SortType.ASCENDING);
-                
-                var category_label = new Gtk.Label (_(category_names[i]));
-                var fg_css = new Gtk.CssProvider ();
-                
-                try {
-                    fg_css.load_from_data ("*{
-                        color: shade (@bg_color, 0.4);
-                        font: open sans 11;
-                        font-weight: 600;
-                        text-shadow: 0 1px alpha (#fff, 0.6);
-                    }", -1);
-                } catch (Error e) { warning (e.message); }
-                
+            setup_category (Switchboard.Plug.Category.PERSONAL, 0);
+            setup_category (Switchboard.Plug.Category.HARDWARE, 1);
+            setup_category (Switchboard.Plug.Category.NETWORK, 2);
+            setup_category (Switchboard.Plug.Category.SYSTEM, 3);
+        }
+
+        private void setup_category (Switchboard.Plug.Category category, int i) {
+            var category_label = new Gtk.Label (get_category_name (category));
+            var fg_css = new Gtk.CssProvider ();
+
+            try {
+                fg_css.load_from_data ("*{
+                    color: shade (@bg_color, 0.4);
+                    font: open sans 11;
+                    font-weight: 600;
+                    text-shadow: 0 1px alpha (#fff, 0.6);
+                }", -1);
                 category_label.get_style_context ().add_provider (fg_css, 20000);
-                category_label.margin_left = 12;
-                category_label.margin_right = 8;
-                var filtered = new Gtk.TreeModelFilter (store, null);
-                filtered.set_visible_column(3);
-                filtered.refilter ();
-                
-                var category_plugs = new Gtk.IconView.with_model (filtered);
-                category_plugs.set_item_width (ITEM_WIDTH);
-                category_plugs.set_text_column (1);
-                category_plugs.set_pixbuf_column (0);
-                category_plugs.set_hexpand (true);
-                category_plugs.selection_changed.connect (() => on_selection_changed (category_plugs, filtered));
-                
-                (category_plugs.get_cells ().nth_data (0) as Gtk.CellRendererText).wrap_mode = Pango.WrapMode.WORD;
-                (category_plugs.get_cells ().nth_data (0) as Gtk.CellRendererText).ellipsize_set = true;
-                
-                var bg_css = new Gtk.CssProvider ();
-                try {
-                    bg_css.load_from_data ("*{background-color:@background_color;}", -1);
-                } catch (Error e) { warning (e.message); }
+            } catch (Error e) {
+                critical (e.message);
+            }
+
+            category_label.margin_left = 12;
+            category_label.margin_right = 8;
+            category_label.xalign = (float) 0.02;
+            category_label.use_markup = true;
+
+            var category_plugs = setup_icon_view ();
+
+            var bg_css = new Gtk.CssProvider ();
+            try {
+                bg_css.load_from_data ("*{background-color:@background_color;}", -1);
                 category_plugs.get_style_context ().add_provider (bg_css, 20000);
-                category_label.xalign = (float) 0.02;
-                
-                var grid = new Gtk.Grid ();
-                category_label.use_markup = true;
-                
-                // Always add a Seperator
-                var h_separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL);
-                h_separator.set_hexpand (true);
-                h_separator.margin_right = 12;
-                grid.attach (category_label, 0, 0, 1, 1);
-                grid.attach (h_separator, 1, 0, 1, 1); // expand, fill, padding´
-                
-                grid.attach (category_plugs, 0, 1, 2, 1);
-                
-                category_labels[category_ids[i]] = grid;
-                category_store[category_ids[i]] = store;
-                category_views[category_ids[i]] = category_plugs;
-                
-                attach (grid, 0, i, 1, 1);
-            }
-        }
-
-        public void add_plug (Gee.HashMap<string, string> plug) {
-
-                Gtk.TreeIter root;
-                string plug_down = plug["category"].down ();
-                
-                if (!(plug_down in category_ids)) {
-                    warning (_("Keyfile \"%s\" contains an invalid category: \"%s\", and will not be added"), 
-                        plug["title"], plug["category"]);
+            } catch (Error e) {
+                critical (e.message);
+            }
+
+            var grid = new Gtk.Grid ();
+
+            // Always add a Seperator
+            var h_separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL);
+            h_separator.set_hexpand (true);
+            h_separator.margin_right = 12;
+            grid.attach (category_label, 0, 0, 1, 1);
+            grid.attach (h_separator, 1, 0, 1, 1);
+
+            grid.attach (category_plugs, 0, 1, 2, 1);
+            switch (category) {
+                case Switchboard.Plug.Category.PERSONAL:
+                    personal_iconview = category_plugs;
+                    personal_grid = grid;
+                    break;
+                case Switchboard.Plug.Category.HARDWARE:
+                    hardware_iconview = category_plugs;
+                    hardware_grid = grid;
+                    break;
+                case Switchboard.Plug.Category.NETWORK:
+                    network_iconview = category_plugs;
+                    network_grid = grid;
+                    break;
+                case Switchboard.Plug.Category.SYSTEM:
+                    system_iconview = category_plugs;
+                    system_grid = grid;
+                    break;
+            }
+
+            attach (grid, 0, i, 1, 1);
+        }
+
+        public void load_default_plugs () {
+            var plugsmanager = Switchboard.PlugsManager.get_default ();
+            foreach (var plug in plugsmanager.get_plugs ()) {
+                plug.visibility_changed.connect (() => plug_visibility_changed (plug));
+                if (plug.can_show == true) {
+                    add_plug (plug);
+                }
+            }
+
+            plugsmanager.plug_added.connect ( (plug) => {
+                plug.visibility_changed.connect (() => plug_visibility_changed (plug));
+                add_plug (plug);
+            });
+        }
+        
+        private Gtk.IconView setup_icon_view () {
+            var store = new Gtk.ListStore (Columns.N_COLUMNS, typeof (Gdk.Pixbuf), typeof (string), 
+                typeof(string), typeof(bool), typeof(Switchboard.Plug));
+            store.set_sort_column_id (1, Gtk.SortType.ASCENDING);
+            store.set_sort_column_id (1, Gtk.SortType.ASCENDING);
+
+            var filtered = new Gtk.TreeModelFilter (store, null);
+            filtered.set_visible_column (3);
+            filtered.refilter ();
+
+            var category_plugs = new Gtk.IconView.with_model (filtered);
+            category_plugs.set_item_width (ITEM_WIDTH);
+            category_plugs.set_text_column (Columns.TEXT);
+            category_plugs.set_pixbuf_column (Columns.ICON);
+            category_plugs.set_tooltip_column (Columns.DESCRIPTION);
+            category_plugs.set_hexpand (true);
+            category_plugs.selection_changed.connect (() => on_selection_changed (category_plugs, filtered));
+            var cellrenderer = (Gtk.CellRendererText)category_plugs.get_cells ().nth_data (0);
+            cellrenderer.wrap_mode = Pango.WrapMode.WORD;
+            cellrenderer.ellipsize_set = true;
+
+            return category_plugs;
+        }
+
+        private void plug_visibility_changed (Switchboard.Plug plug) {
+            if (plug.can_show == true) {
+                add_plug (plug);
+            }
+        }
+
+        public void add_plug (Switchboard.Plug plug) {
+            if (plug.can_show == false)
+                return;
+            Gtk.TreeIter root;
+            Gtk.TreeModelFilter model_filter;
+
+            switch (plug.category) {
+                case Switchboard.Plug.Category.PERSONAL:
+                    model_filter = (Gtk.TreeModelFilter)personal_iconview.get_model ();
+                    personal_grid.show_all ();
+                    break;
+                case Switchboard.Plug.Category.HARDWARE:
+                    model_filter = (Gtk.TreeModelFilter)hardware_iconview.get_model ();
+                    hardware_grid.show_all ();
+                    break;
+                case Switchboard.Plug.Category.NETWORK:
+                    model_filter = (Gtk.TreeModelFilter)network_iconview.get_model ();
+                    network_grid.show_all ();
+                    break;
+                case Switchboard.Plug.Category.SYSTEM:
+                    model_filter = (Gtk.TreeModelFilter)system_iconview.get_model ();
+                    system_grid.show_all ();
+                    break;
+                default:
                     return;
-                }
-                
-                Gdk.Pixbuf icon_pixbuf = null;
-                try {
-                    icon_pixbuf = theme.load_icon (plug["icon"], 32, Gtk.IconLookupFlags.GENERIC_FALLBACK);
-                } catch {
-                    warning(_("Unable to load plug %s's icon: %s"), plug["title"], plug["icon"]);
-                    return; // FIXME: if we get no icon, we probably dont want that one..
-                }
-                category_store[plug_down].append (out root);
-                
-                category_store[plug_down].set (root, 0, icon_pixbuf, 1, plug["title"], 2, plug["exec"], 
-                    3, true, 4, plug["extern"]);
-                category_labels[plug_down].show_all ();
-                category_views[plug_down].show_all ();
-
+            }
+
+            var store = model_filter.child_model as Gtk.ListStore;
+            Gdk.Pixbuf icon_pixbuf = null;
+            try {
+                // FIXME: if we get no icon, we probably dont want that one…
+                icon_pixbuf = theme.load_icon (plug.icon, 32, Gtk.IconLookupFlags.GENERIC_FALLBACK);
+            } catch {
+                critical ("Unable to load plug %s's icon: %s", plug.display_name, plug.icon);
+                return;
+            }
+
+            store.append (out root);
+            store.set (root, Columns.ICON, icon_pixbuf, Columns.TEXT, plug.display_name, 
+                Columns.DESCRIPTION, plug.description, Columns.VISIBLE, true, Columns.PLUG, plug);
+            unowned SwitchboardApp app = (SwitchboardApp) GLib.Application.get_default ();
+
+            if (Switchboard.PlugsManager.get_default ().has_plugs ()) {
+                app.search_box.sensitive = true;
+                filter_plugs (app.search_box.get_text ());
+
+                if (plug_to_open != null) {
+                    if (plug_to_open.has_suffix (plug.code_name)) {
+                        app.current_plug = plug;
+                        plug_to_open = null;
+                    }
+                }
+
+                app.update_libunity_quicklist ();
+            }
         }
 
-        public void filter_plugs (string filter, SwitchboardApp switchboard) {
-            
+        public void filter_plugs (string filter) {
+
             var any_found = false;
-            foreach (string category in category_ids) {
-
-                var store = category_store[category];
-                var container = category_labels[category];
-
-                int shown = 0;
-
-                store.foreach ((model, path, iter) => {
-                    string title;
-
-                    store.get (iter, 1, out title);
-
-                    if (filter.down () in title.down ()) {
-                        store.set_value (iter, 3, true);
-                        shown ++;
-                    } else {
-                        store.set_value (iter, 3, false);
-                    }
-
+
+            if (search_by_category (filter, Switchboard.Plug.Category.PERSONAL))
+                any_found = true;
+            if (search_by_category (filter, Switchboard.Plug.Category.HARDWARE))
+                any_found = true;
+            if (search_by_category (filter, Switchboard.Plug.Category.NETWORK))
+                any_found = true;
+            if (search_by_category (filter, Switchboard.Plug.Category.SYSTEM))
+                any_found = true;
+
+            unowned SwitchboardApp app = (SwitchboardApp) GLib.Application.get_default ();
+            if (!any_found) {
+                app.show_alert (_("No settings found"), _("Try changing your search terms"), Gtk.MessageType.INFO);
+            } else {
+                app.hide_alert ();
+            }
+        }
+        
+        private bool search_by_category (string filter, Plug.Category category) {
+            
+            Gtk.TreeModelFilter model_filter;
+            Gtk.Widget grid;
+            
+            switch (category) {
+                case Switchboard.Plug.Category.PERSONAL:
+                    model_filter = (Gtk.TreeModelFilter)personal_iconview.get_model ();
+                    grid = personal_grid;
+                    break;
+                case Switchboard.Plug.Category.HARDWARE:
+                    model_filter = (Gtk.TreeModelFilter)hardware_iconview.get_model ();
+                    grid = hardware_grid;
+                    break;
+                case Switchboard.Plug.Category.NETWORK:
+                    model_filter = (Gtk.TreeModelFilter)network_iconview.get_model ();
+                    grid = network_grid;
+                    break;
+                case Switchboard.Plug.Category.SYSTEM:
+                    model_filter = (Gtk.TreeModelFilter)system_iconview.get_model ();
+                    grid = system_grid;
+                    break;
+                default:
                     return false;
-                });
-                
-                if (shown == 0) {
-                    container.hide ();
+            }
+
+            var store = model_filter.child_model as Gtk.ListStore;
+            int shown = 0;
+            store.foreach ((model, path, iter) => {
+                string title;
+
+                store.get (iter, Columns.TEXT, out title);
+
+                if (filter.down () in title.down ()) {
+                    store.set_value (iter, Columns.VISIBLE, true);
+                    shown++;
                 } else {
-                    any_found = true;
-                    container.show ();
+                    store.set_value (iter, Columns.VISIBLE, false);
                 }
-            }
-            if (!any_found) {
-                switchboard.show_alert (_("No settings found"), _("Try changing your search terms"), Gtk.MessageType.INFO);
+
+                return false;
+            });
+            
+            if (shown == 0) {
+                grid.hide ();
+                return false;
             } else {
-                switchboard.hide_alert ();
+                grid.show_all ();
+                return true;
             }
         }
 
-        public void recalculate_columns (int width) {
-
-            foreach (var view in category_views.values) {
-                view.set_columns (width / (ITEM_WIDTH + ITEM_PADDING * 2));
-            }
+        public void recalculate_columns () {
+            int columns = personal_iconview.get_columns ();
+            columns = int.max (columns, hardware_iconview.get_columns ());
+            columns = int.max (columns, network_iconview.get_columns ());
+            columns = int.max (columns, system_iconview.get_columns ());
+            personal_iconview.set_columns (columns);
+            hardware_iconview.set_columns (columns);
+            network_iconview.set_columns (columns);
+            system_iconview.set_columns (columns);
         }
 
         private void on_selection_changed (Gtk.IconView view, Gtk.TreeModelFilter store) {
-            
-            GLib.Value title;
-            GLib.Value executable;
-            GLib.Value @extern;
+            GLib.Value plug;
             Gtk.TreeIter selected_plug;
-            
+
             var selected = view.get_selected_items ();
             var item = selected.nth_data (0);
 
@@ -180,14 +310,26 @@
                 return;
 
             store.get_iter (out selected_plug, item);
-            store.get_value (selected_plug, 1, out title);
-            store.get_value (selected_plug, 2, out executable);
-            store.get_value (selected_plug, 4, out @extern);
+            store.get_value (selected_plug, Columns.PLUG, out plug);
 
-            plug_selected (title.get_string (), executable.get_string (), @extern.get_string () == "1");
+            plug_selected ((Switchboard.Plug) plug.get_object ());
 
             view.unselect_path (item);
         }
+
+        public static string? get_category_name (Switchboard.Plug.Category category) {
+            switch (category) {
+                case Plug.Category.PERSONAL:
+                    return _("Personal");
+                case Plug.Category.HARDWARE:
+                    return _("Hardware");
+                case Plug.Category.NETWORK:
+                    return _("Network and Wireless");
+                case Plug.Category.SYSTEM:
+                    return _("System");
+            }
+
+            return null;
+        }
     }
-}
-
+}
\ No newline at end of file

=== modified file 'src/EmbeddedAlert.vala'
--- src/EmbeddedAlert.vala	2013-01-08 15:21:51 +0000
+++ src/EmbeddedAlert.vala	2014-01-02 20:30:11 +0000
@@ -124,7 +124,6 @@
                 case Gtk.MessageType.WARNING:
                     image.set_from_icon_name ("dialog-warning", Gtk.IconSize.DIALOG);
                     break;
-                    break;
                 case Gtk.MessageType.INFO:
                     image.set_from_icon_name ("dialog-information", Gtk.IconSize.DIALOG);
                     break;

=== removed file 'src/Resources.vala'
--- src/Resources.vala	2013-01-08 15:21:51 +0000
+++ src/Resources.vala	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-namespace Switchboard {
-
-    public const string APP_TITLE = _("System Settings");
-    public const string COPYRIGHT = "Copyright (C) 2011-2012 Avi Romanoff";
-    public const string WEBSITE = "https://launchpad.net/switchboard";
-    public const string VERSION = "0.9";
-    public const string[] AUTHORS = {"Avi Romanoff <[e-mail]>",
-					null};
-    public const string ERRDOMAIN = "switchboard";
-    public const string APP_ICON = "preferences-desktop";
-    public const string BUG_URL = "https://bugs.launchpad.net/switchboard";
-    public const string HELP_URL = "https://answers.launchpad.net/switchboard";
-    public const string TRANSLATE_URL = "https://translations.launchpad.net/switchboard";
-
-}

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2013-12-03 13:44:13 +0000
+++ src/Switchboard.vala	2014-01-02 20:30:11 +0000
@@ -17,75 +17,139 @@
 
 namespace Switchboard {
 
-    static string plug_to_open;
-
-    [DBus (name = "org.elementary.switchboard")]
+    static const OptionEntry[] entries = {
+            { "open-plug", 'o', 0, OptionArg.STRING, ref plug_to_open, N_("Open a plug"), "PLUG_NAME" },
+            { null }
+    };
+
+    private static string? plug_to_open = null;
+    
+    public static int main (string[] args) {
+        
+        Gtk.init (ref args);
+        
+        var context = new OptionContext("");
+        context.add_main_entries(entries, "switchboard ");
+        context.add_group(Gtk.get_option_group(true));
+        try {
+            context.parse(ref args);
+        } catch(Error e) { warning (e.message); }
+        var app = new SwitchboardApp ();
+        
+        return app.run (args);
+    }
+
     public class SwitchboardApp : Granite.Application {
+        private Gtk.Window main_window;
+        private Gtk.Stack stack;
+        private Gtk.HeaderBar headerbar;
+
+        private Granite.Widgets.EmbeddedAlert alert_view;
+        private Gtk.ScrolledWindow category_scrolled;
+        private Switchboard.NavigationButton navigation_button;
+        private Switchboard.CategoryView category_view;
+
+        private Gee.LinkedList <string> loaded_plugs;
+        private string all_settings_label = _("All Settings");
+
+        public Switchboard.Plug current_plug;
+        public Gtk.SearchEntry search_box { public get; private set; }
 
         construct {
             application_id = "org.elementary.Switchboard";
             program_name = "Switchboard";
-            app_years = "2011-2012";
+            app_years = "2011-2013";
             exec_name = "switchboard";
             app_launcher = exec_name+".desktop";
 
-            build_version = VERSION;
-            app_icon = APP_ICON;
-            main_url = WEBSITE;
-            bug_url = BUG_URL;
-            help_url = HELP_URL;
-            translate_url = TRANSLATE_URL;
-            about_authors = AUTHORS;
+            build_version = "2.0";
+            app_icon = "preferences-desktop";
+            main_url = "https://launchpad.net/switchboard";
+            bug_url = "https://bugs.launchpad.net/switchboard";
+            help_url = "https://answers.launchpad.net/switchboard";
+            translate_url = "https://translations.launchpad.net/switchboard";
+            about_authors = {"Avi Romanoff <[e-mail]>", "Corentin Noël <[e-mail]>", null};
 
             about_license_type = Gtk.License.GPL_3_0;
         }
 
-        // Chrome widgets
-        Gtk.ProgressBar progress_bar;
-        Gtk.Label progress_label;
-        Gtk.SearchEntry search_box;
-        Gtk.Toolbar toolbar;
-        Switchboard.NavigationButton navigation_button;
-        // Public so we can hide it after show_all()
-        public Gtk.ToolItem progress_toolitem;
-        // These two wrap the progress bar
-        Gtk.ToolItem lspace = new Gtk.ToolItem ();
-        Gtk.ToolItem rspace = new Gtk.ToolItem ();
-
-        Gtk.Spinner loading;
-
-        Gtk.Window main_window;
-
-        // Content area widgets
-        Gtk.Socket socket;
-        Gtk.Grid grid;
-        Granite.Widgets.EmbeddedAlert alert_view;
-        Gtk.ScrolledWindow scrollable_view;
-        Switchboard.CategoryView category_view;
-
-        // Plug data
-        bool socket_shown;
-        Gee.HashMap<string, string> current_plug = new Gee.HashMap<string, string>();
-        Gee.HashMap<string, string>[] plugs;
-
-        string[] plug_places = {"/usr/share/plugs/",
-                                "/usr/lib/plugs/",
-                                "/usr/local/share/plugs/",
-                                "/usr/local/lib/plugs/"};
-        string search_box_buffer = "";
-
-        private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
-
-        string all_settings_label = _("All Settings");
-
-        public SwitchboardApp () { }
-
-        void build () {
+        public override void activate () {
+            // If app is already running, present the current window.
+            if (get_windows () != null) {
+                get_windows ().data.present ();
+                return;
+            }
+
+            if (DEBUG)
+                Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
+            else
+                Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.INFO;
+
+            loaded_plugs = new Gee.LinkedList <string> ();
+            Switchboard.PlugsManager.get_default ();
+            build ();
+            category_view.load_default_plugs ();
+            if (current_plug != null)
+                load_plug (current_plug);
+
+            Gtk.main ();
+        }
+
+        public void hide_alert () {
+            stack.set_visible_child (category_scrolled);
+        }
+
+        public void show_alert (string primary_text, string secondary_text, Gtk.MessageType type) {
+            alert_view.set_alert (primary_text, secondary_text, null, true, type);
+            stack.set_visible_child (alert_view);
+        }
+
+        public void load_plug (Switchboard.Plug plug) {
+            if (!loaded_plugs.contains (plug.code_name)) {
+                stack.add_named (plug.get_widget (), plug.code_name);
+                loaded_plugs.add (plug.code_name);
+            }
+
+            // Launch plug's executable
+            navigation_button.set_sensitive (true);
+            navigation_button.set_text (all_settings_label);
+            navigation_button.show ();
+            headerbar.subtitle = plug.display_name;
+            current_plug = plug;
+            switch_to_plug (plug);
+        }
+
+        // Updates items in quicklist menu using the Unity quicklist api.
+        public void update_libunity_quicklist () {
+            var launcher = Unity.LauncherEntry.get_for_desktop_id (app_launcher);
+            var quicklist = new Dbusmenu.Menuitem ();
+
+            var personal_item = add_quicklist_for_category (Switchboard.Plug.Category.PERSONAL);
+            if (personal_item != null)
+                quicklist.child_append (personal_item);
+
+            var hardware_item = add_quicklist_for_category (Switchboard.Plug.Category.HARDWARE);
+            if (hardware_item != null)
+                quicklist.child_append (hardware_item);
+
+            var network_item = add_quicklist_for_category (Switchboard.Plug.Category.NETWORK);
+            if (network_item != null)
+                quicklist.child_append (network_item);
+
+            var system_item = add_quicklist_for_category (Switchboard.Plug.Category.SYSTEM);
+            if (system_item != null)
+                quicklist.child_append (system_item);
+
+            if (personal_item != null && hardware_item != null && network_item != null && system_item != null)
+                launcher.quicklist = quicklist;
+        }
+
+        private void build () {
             main_window = new Gtk.Window();
 
             // Set up defaults
-            main_window.title = APP_TITLE;
-            main_window.icon_name = APP_ICON;
+            main_window.title = program_name;
+            main_window.icon_name = app_icon;
 
             // Set up window
             main_window.set_default_size (842, 475);
@@ -94,424 +158,112 @@
             main_window.destroy.connect (shut_down);
             setup_toolbar ();
 
-            // Set up socket
-            socket = new Gtk.Socket ();
-            socket.set_hexpand(true);
-            socket.set_vexpand(true);
-
-            socket.plug_removed.connect (() => {
-                plug_closed ();
-                return true;
-            });
-
             // Set up accelerators (hotkeys)
             var accel_group = new Gtk.AccelGroup ();
             uint accel_key;
             Gdk.ModifierType accel_mod;
             var accel_flags = Gtk.AccelFlags.LOCKED;
-            Gtk.accelerator_parse("<Control>q", out accel_key, out accel_mod);
-            accel_group.connect(accel_key, accel_mod, accel_flags, () => {
-                main_window.destroy();
-                return true;
-            });
+            Gtk.accelerator_parse ("<Control>q", out accel_key, out accel_mod);
             main_window.add_accel_group (accel_group);
-
-            // ??? Why?
-            current_plug["title"] = "";
-            current_plug["executable"] = "";
+            accel_group.connect (accel_key, accel_mod, accel_flags, () => {
+                main_window.destroy ();
+                return true;
+            });
 
             category_view = new Switchboard.CategoryView ();
-            category_view.plug_selected.connect ((title, executable, @extern) => load_plug (title, executable, @extern));
+            category_view.plug_selected.connect ((plug) => load_plug (plug));
             category_view.margin_top = 12;
 
-            scrollable_view = new Gtk.ScrolledWindow (null, null);
+            category_scrolled = new Gtk.ScrolledWindow (null, null);
+            category_scrolled.add_with_viewport (category_view);
+            category_scrolled.set_vexpand (true);
 
             // Set up UI
-            grid = new Gtk.Grid ();
-            grid.set_hexpand (true);
-            grid.set_vexpand (true);
-            grid.attach (toolbar, 0, 0, 1, 1);
-            toolbar.set_hexpand (true);
-
             alert_view = new Granite.Widgets.EmbeddedAlert ();
             alert_view.set_vexpand (true);
-            grid.attach (alert_view, 0, 2, 1, 1);
-
-            main_window.add (grid);
-            scrollable_view.add_with_viewport (category_view);
-            scrollable_view.set_vexpand (true);
-            grid.attach (scrollable_view, 0, 1, 1, 1);
-
+
+            stack = new Gtk.Stack ();
+            stack.expand = true;
+            stack.add_named (category_scrolled, "main");
+            stack.add_named (alert_view, "alert");
+            stack.set_visible_child (category_scrolled);
+
+            main_window.add (stack);
             main_window.set_application (this);
             main_window.show_all ();
+            navigation_button.hide ();
 
             main_window.size_allocate.connect (() => {
-                var width = main_window.get_allocated_width ();
-                category_view.recalculate_columns (width);
-            });
-
-            navigation_button.hide ();
-
-            foreach (var label in category_view.category_labels.values)
-                label.hide ();
-            foreach (var view in category_view.category_views.values)
-                view.hide ();
-
-            alert_view.hide();
-
-            loading = new Gtk.Spinner ();
-            loading.set_vexpand(true);
-            loading.halign = Gtk.Align.CENTER;
-            loading.valign = Gtk.Align.CENTER;
-            loading.width_request = 72;
-            loading.height_request = 72;
-            loading.start ();
-
-            grid.attach (socket, 0, 1, 1, 1);
-            socket.hide ();
-            grid.attach (loading, 0, 1, 1, 1);
-            loading.hide ();
-
-            var any_plugs = false;
-
-            socket.plug_added.connect (() => {
-                if (loading.visible) {
-                    loading.hide ();
-                    socket.show_all ();
-                }
-            });
-
-            foreach (string place in plug_places)
-                if (enumerate_plugs (place))
-                    any_plugs = true;
-
-            if (!any_plugs) {
-                show_alert(_("No settings found"), _("Install some and re-launch Switchboard"), Gtk.MessageType.WARNING);
+                category_view.recalculate_columns ();
+            });
+
+            if (Switchboard.PlugsManager.get_default ().has_plugs () == false) {
+                show_alert (_("No settings found"), _("Install some and re-launch Switchboard"), Gtk.MessageType.WARNING);
                 search_box.sensitive = false;
             } else {
                 update_libunity_quicklist ();
             }
-
-            bool found = false;
-            if (plug_to_open != null) {
-                foreach (var plug in plugs) {
-                    if (plug["id"] == plug_to_open) {
-                        load_plug (plug["title"], plug["exec"], plug["extern"] == "1");
-                        found = true;
-                    }
-                }
-                if (!found) {
-                    critical ("Couldn't find %s among the loaded settings.", plug_to_open);
-                }
-            }
-
-            foreach (var store in category_view.category_store.values) {
-                store.foreach ((model, path, iter) => {
-                    store.set_value (iter, 3, true);
-                    return false;
-                });
-            }
-
-            progress_toolitem.hide ();
-        }
-
-        void shut_down () {
-            plug_closed ();
-        }
-
-        public void hide_alert () {
-            alert_view.hide ();
-            scrollable_view.show ();
-        }
-
-        public void show_alert (string primary_text, string secondary_text, Gtk.MessageType type) {
-            alert_view.set_alert (primary_text, secondary_text, null, true, type);
-            alert_view.show ();
-            scrollable_view.hide ();
-        }
-
-        public void load_plug (string title, string executable, bool @extern) {
-            debug ("Selected plug: title %s | executable %s", title, executable);
-
-            // Launch plug's executable
-            if (current_plug["title"] != title || !socket.visible) {
-                try {
-                    // The plug is already selected
-                    debug(_("Closing plug \"%s\" in Switchboard controller..."), current_plug["title"]);
-                    plug_closed ();
-
-                    string[] cmd_exploded = (executable!=null)?executable.split (" "):null;
-                    GLib.Process.spawn_async (File.new_for_path (cmd_exploded[0]).get_parent ().
-                        get_path (), cmd_exploded, null, SpawnFlags.SEARCH_PATH, null, null);
-
-                    // ensure the button is sensitive; it might be the first plug loaded
-                    if (!@extern) {
-                        navigation_button.set_sensitive (true);
-                        navigation_button.set_text (all_settings_label);
-                        navigation_button.show ();
-
-                        current_plug["title"] = title;
-                        current_plug["executable"] = executable;
-                        switch_to_socket ();
-                        main_window.title = @"$APP_TITLE - $title";
-                    }
-                } catch {  warning(_("Failed to launch plug: title %s | executable %s"), title, executable); }
-            } else {
-                navigation_button.set_sensitive (true);
-                navigation_button.set_text (all_settings_label);
-                navigation_button.show ();
-            }
-
-            if (@extern) {
-                switch_to_icons ();
-            }
+        }
+
+        private void shut_down () {
+            Gtk.main_quit ();
         }
 
         // Change Switchboard title back to "Switchboard"
-        void reset_title () {
-            main_window.title = APP_TITLE;
+        private void reset_title () {
+            headerbar.subtitle = null;
         }
 
         // Handles clicking the navigation button
-        void handle_navigation_button_clicked () {
-            if (navigation_button.get_text () != current_plug["title"]) {
-                switch_to_icons();
-                navigation_button.set_text (current_plug["title"]);
+        private void handle_navigation_button_clicked () {
+            if (navigation_button.get_text () == all_settings_label) {
+                switch_to_icons ();
+                navigation_button.set_text (current_plug.display_name);
             } else {
-                load_plug (current_plug["title"], current_plug["executable"], current_plug["extern"] == "1");
+                switch_to_plug (current_plug);
                 navigation_button.set_text (all_settings_label);
             }
         }
 
         // Switches to the socket view
-        void switch_to_socket () {
-            socket_shown = true;
+        private void switch_to_plug (Switchboard.Plug plug) {
+            stack.set_transition_type (Gtk.StackTransitionType.SLIDE_LEFT);
             search_box.sensitive = false;
-
-            category_view.hide ();
-            socket.hide ();
-            loading.show_all ();
+            plug.shown ();
+            stack.set_visible_child_name (plug.code_name);
         }
 
         // Switches back to the icons
-        bool switch_to_icons () {
-            socket.hide ();
-            loading.hide ();
-            category_view.show ();
-
-            socket_shown = false;
+        private bool switch_to_icons () {
+            stack.set_transition_type (Gtk.StackTransitionType.SLIDE_RIGHT);
+            stack.set_visible_child (category_scrolled);
+            current_plug.hidden ();
 
             // Reset state
             reset_title ();
-            search_box.set_text("");
-            search_box.sensitive = count_plugs() > 0;
-            progress_label.set_text("");
-            progress_bar.fraction = 0.0;
-            progress_toolitem.visible = false;
-
-            plug_closed ();
+            search_box.set_text ("");
+            search_box.sensitive = Switchboard.PlugsManager.get_default ().has_plugs ();
 
             return true;
         }
 
-        // Loads in all of the plugs
-        // Returns true if any were found,
-        // false if none were.
-        bool enumerate_plugs (string plug_root_dir) {
-
-            // <keyfile's absolute path, keyfile's directory>
-            List<string> keyfiles = find_plugs (plug_root_dir);
-            if (keyfiles.length() == 0) {
-                return false;
-            } else {
-                foreach (string keyfile in keyfiles) {
-                    KeyFile kf = new KeyFile();
-
-                    string head = File.new_for_path(keyfile).get_basename();
-                    string parent = File.new_for_path(keyfile).get_parent().get_path();
-
-                    Gee.HashMap<string, string> plug = new Gee.HashMap<string, string> ();
-                    try { kf.load_from_file(keyfile, KeyFileFlags.NONE);
-                    } catch (Error e) { warning("Couldn't load this keyfile, %s (path: %s)", e.message, keyfile); }
-                    plug["id"] = kf.get_start_group();
-                    try {
-                        var exec = kf.get_string (head, "exec");
-                        //if a path starts with a double slash, we take it as an absolute path
-                        if (exec.substring (0, 2) == "//") {
-                            exec = exec.substring (1);
-                            plug["extern"] = "1";
-                        } else {
-                            exec = Path.build_filename(parent, exec);
-                            plug["extern"] = "0";
-                        }
-
-                        plug["exec"] = exec;
-                    } catch (Error e) { warning("Couldn't read exec field in file %s, %s", keyfile, e.message); }
-                    try { plug["icon"] = kf.get_string (head, "icon");
-                    } catch (Error e) { warning("Couldn't read icon field in file %s, %s", keyfile, e.message); }
-                    try {
-                        plug["title"] = kf.get_locale_string (head, "title");
-                        string? textdomain = null;
-                        foreach (var domain_key in SUPPORTED_GETTEXT_DOMAINS_KEYS) {
-                            if (kf.has_key (head, domain_key)) {
-                                textdomain = kf.get_string (head, domain_key);
-                                break;
-                            }
-                        }
-                        if (textdomain != null)
-                            plug["title"] = GLib.dgettext (textdomain, plug["title"]).dup ();
-                    } catch (Error e) { warning("Couldn't read title field in file %s, %s", keyfile, e.message); }
-                    try { plug["category"] = kf.get_string (head, "category");
-                    } catch {
-                        plug["category"] = "other";
-                    }
-                    category_view.add_plug (plug);
-                    plugs += plug;
-                }
-                return true;
-            }
-        }
-
-        // Checks if the file is a .plug file
-        bool is_plug_file (string filename) {
-            return (filename.down().has_suffix(".plug"));
-        }
-
-        // Find all .plug files
-        List<string> find_plugs (string path, List<string>? keyfiles_list = null) {
-            List<string>? keyfiles;
-            if(keyfiles_list == null) {
-                keyfiles = new List<string> ();
-            } else {
-                keyfiles = new List<string> ();
-                foreach(var keyfile in keyfiles_list) {
-                    keyfiles.append(keyfile);
-                }
-            }
-
-            var directory = File.new_for_path (path);
-            if (!directory.query_exists ()) {
-                return null;
-            }
-            try {
-                var enumerator = directory.enumerate_children (
-                    FileAttribute.STANDARD_NAME + "," + FileAttribute.STANDARD_TYPE, 0);
-                FileInfo file_info;
-                while ((file_info = enumerator.next_file ()) != null) {
-                    string file_path = Path.build_filename(path, file_info.get_name());
-                    if (file_info.get_file_type() == GLib.FileType.REGULAR &&
-                        is_plug_file(file_info.get_name())) {
-                        keyfiles.append(file_path);
-                    } else if(file_info.get_file_type() == GLib.FileType.DIRECTORY) {
-                        keyfiles = find_plugs(file_path, keyfiles);
-                    }
-                }
-            } catch { warning(_(@"Unable to iterate over enumerated plug directory \"$path\"'s contents")); }
-
-            return keyfiles;
-        }
-
-        // Counts how many plugs exist at the moment
-        int count_plugs () {
-
-            uint count = 0;
-            foreach (string place in plug_places)
-                count += find_plugs (place).length ();
-            return (int) count;
-        }
-
-        /*
-            D-Bus ONLY methods
-        */
-
-        public int get_socket_wid () {
-
-            return ((int) socket.get_id ());
-        }
-
-        public signal void plug_closed ();
-
-        public void progress_bar_set_visible (bool visibility) {
-
-            progress_toolitem.set_visible(visibility);
-        }
-
-        public void progress_bar_set_text (string text) {
-
-            progress_label.set_text(text);
-        }
-
-        public void progress_bar_set_fraction (double fraction) {
-
-            progress_bar.fraction = fraction;
-        }
-
-        public void progress_bar_pulse () {
-
-            progress_bar.pulse();
-        }
-
-        public signal void search_box_activated ();
-
-        public signal void search_box_text_changed ();
-
-        public void search_box_set_sensitive (bool sensitivity) {
-            search_box.set_sensitive (sensitivity);
-        }
-
-        public void search_box_set_text (string text) {
-
-            plug_closed();
-            search_box.set_text (text);
-        }
-
-        public string search_box_get_text () {
-
-            return search_box.get_text ();
-        }
-
-        /*
-           End D-Bus ONLY methods
-        */
-
         // Sets up the toolbar for the Switchboard app
-        void setup_toolbar () {
-
+        private void setup_toolbar () {
             // Global toolbar widgets
-            toolbar = new Gtk.Toolbar ();
-            toolbar.get_style_context ().add_class ("primary-toolbar");
-
-            // Spacing
-            lspace.set_expand(true);
-            rspace.set_expand(true);
-
-            // Progressbar
-            var progress_vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-            progress_label = new Gtk.Label ("");
-            progress_label.set_use_markup(true);
-            progress_bar = new Gtk.ProgressBar ();
-            progress_toolitem = new Gtk.ToolItem ();
-            progress_vbox.pack_start(progress_label, true, false, 0);
-            progress_vbox.pack_end(progress_bar, false, false, 0);
-            progress_toolitem.add(progress_vbox);
-            progress_toolitem.set_expand(true);
+            headerbar = new Gtk.HeaderBar ();
+            headerbar.show_close_button = true;
+            headerbar.title = program_name;
+            main_window.set_titlebar (headerbar);
 
             // Searchbar
             search_box = new Gtk.SearchEntry ();
-            search_box.set_placeholder_text (_("Search Settings"));
-            search_box.activate.connect (() => search_box_activated ());
-
-            search_box.changed.connect (() => {
-                category_view.filter_plugs (search_box.get_text (), this);
-                search_box_text_changed ();
+            search_box.placeholder_text = _("Search Settings");
+            search_box.margin_right = 5;
+            search_box.sensitive = false;
+            search_box.changed.connect(() => {
+                category_view.filter_plugs(search_box.get_text ());
             });
 
-            search_box.sensitive = (count_plugs () > 0);
-            search_box.margin = 5;
-            var find_toolitem = new Gtk.ToolItem ();
-            find_toolitem.add(search_box);
-            find_toolitem.margin_right = 6;
-
             // Focus typing to the search bar
             main_window.key_press_event.connect ((event) => {
                 // Don't focus if it is a modifier or if search_box is already focused.
@@ -524,107 +276,60 @@
             // Nav button
             navigation_button = new NavigationButton ();
             navigation_button.clicked.connect (handle_navigation_button_clicked);
-            navigation_button.margin = 5;
+            navigation_button.sensitive = false;
 
             // Add everything to the toolbar
-
-            Gtk.ToolItem tool = new Gtk.ToolItem ();
-            tool.add (navigation_button);
-            toolbar.insert (tool, -1);
-            toolbar.insert (lspace, -1);
-            toolbar.insert (progress_toolitem, -1);
-            toolbar.insert (rspace, -1);
-            toolbar.insert (find_toolitem, -1);
+            headerbar.pack_start (navigation_button);
+            headerbar.pack_end (search_box);
         }
 
-        public override void activate () {
-            // If app is already running, present the current window.
-            if (get_windows () != null) {
-                get_windows ().data.present ();
-                return;
+        private Dbusmenu.Menuitem? add_quicklist_for_category (Switchboard.Plug.Category category) {
+            // Create menuitem for this category
+            var category_item = new Dbusmenu.Menuitem ();
+            category_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, CategoryView.get_category_name (category));
+
+            Gtk.TreeModelFilter model_filter;
+            switch (category) {
+                case Switchboard.Plug.Category.PERSONAL:
+                    model_filter = (Gtk.TreeModelFilter)category_view.personal_iconview.get_model ();
+                    break;
+                case Switchboard.Plug.Category.HARDWARE:
+                    model_filter = (Gtk.TreeModelFilter)category_view.hardware_iconview.get_model ();
+                    break;
+                case Switchboard.Plug.Category.NETWORK:
+                    model_filter = (Gtk.TreeModelFilter)category_view.network_iconview.get_model ();
+                    break;
+                case Switchboard.Plug.Category.SYSTEM:
+                    model_filter = (Gtk.TreeModelFilter)category_view.system_iconview.get_model ();
+                    break;
+                default:
+                    return null;
             }
 
-            build ();
-        }
-
-        // Updates items in quicklist menu using the Unity quicklist api.
-        void update_libunity_quicklist () {
-            // Fetch launcher
-            var launcher = Unity.LauncherEntry.get_for_desktop_id (app_launcher);
-            var quicklist = new Dbusmenu.Menuitem ();
-
-            // Add menuitems for every category.
-            for (int i = 0; i < category_view.category_names.length; i++) {
-                // Create menuitem for this category
-                var category_item = new Dbusmenu.Menuitem ();
-                var category_name = category_view.category_names[i];
-                category_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _(category_name));
-
-                // Loop through every plug and add a quicklist item
-                var category_id = category_view.category_ids[i];
-                var category_store = category_view.category_store[category_id];
-                category_store.foreach ((model, path, iter) => {
-                    string title, exec, @extern;
-                    category_store.get (iter, 1, out title, 2, out exec, 4, out @extern);
-
-                    var item = new Dbusmenu.Menuitem ();
-                    item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, title);
-
-                    // When item is clicked, open corresponding plug
-                    item.item_activated.connect (() => {
-                        load_plug (title, exec, @extern == "1");
-                        activate ();
-                    });
-
-                    // Add item to correct category
-                    category_item.child_append (item);
-
-                    return false;
+            var category_store = model_filter.child_model as Gtk.ListStore;
+            bool empty = true;
+
+            category_store.foreach ((model, path, iter) => {
+                Switchboard.Plug plug;
+                category_store.get (iter, CategoryView.Columns.PLUG, out plug);
+
+                var item = new Dbusmenu.Menuitem ();
+                item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, plug.display_name);
+
+                // When item is clicked, open corresponding plug
+                item.item_activated.connect (() => {
+                    load_plug (plug);
+                    activate ();
                 });
 
-                quicklist.child_append (category_item);
-            }
-
-            launcher.quicklist = quicklist;
+                // Add item to correct category
+                category_item.child_append (item);
+                empty = false;
+
+                return false;
+            });
+
+            return (empty ? null : category_item);
         }
     }
-
-    static const OptionEntry[] entries = {
-            { "open-plug", 'o', 0, OptionArg.STRING, ref plug_to_open, N_("Open a plug"), "PLUG_NAME" },
-            { null }
-    };
-
-    public static int main (string[] args) {
-
-        var logger = new Granite.Services.Logger ();
-        logger.initialize(APP_TITLE);
-        logger.DisplayLevel = Granite.Services.LogLevel.INFO;
-        message(_(@"Welcome to $APP_TITLE"));
-        message(_(@"Version: $VERSION"));
-        message(_("Report any issues/bugs you mind find to lp:switchboard"));
-
-        Gtk.init (ref args);
-
-        var context = new OptionContext("");
-        context.add_main_entries(entries, "switchboard ");
-        context.add_group(Gtk.get_option_group(true));
-        try {
-            context.parse(ref args);
-        } catch(Error e) { warning (e.message); }
-
-        // In the future, the plug_root_dir should be overridable by CLI flags.
-        var switchboard_app = new SwitchboardApp ();
-
-        GLib.Bus.own_name (BusType.SESSION, "org.elementary.switchboard",
-                BusNameOwnerFlags.NONE,
-                (conn) => {
-                    try {
-                        conn.register_object("/org/elementary/switchboard", switchboard_app);
-                    } catch (IOError e) { warning (e.message); }
-                },
-                () => {},
-                () => {logger.notification(_("Switchboard already running. Exiting..")); Process.exit(1);});
-
-        return switchboard_app.run (args);
-    }
-}
+}
\ No newline at end of file

=== removed directory 'vapi'
=== removed file 'vapi/config.vapi'
--- vapi/config.vapi	2011-06-23 05:56:29 +0000
+++ vapi/config.vapi	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
-namespace Build {
-	public const string DATADIR;
-	public const string PKGDATADIR;
-	public const string GETTEXT_PACKAGE;
-	public const string RELEASE_NAME;
-	public const string VERSION;
-	public const string VERSION_INFO;
-}