Merge lp:~elementary-pantheon/wingpanel/new-wingpanel into lp:~elementary-pantheon/wingpanel/old-trunk

[Fabian Thoma]

Merged lp:~elementary-pantheon/wingpanel/new-wingpanel by GiulioC to add better shadows and rendering to wingpanel

[Fabian Thoma (fabianthoma)]

This changes are ready to merge back into the development focus branch

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-12-11 16:57:25 +0000
@@ -0,0 +1,1 @@
+build

=== modified file 'AUTHORS'
--- AUTHORS	2011-07-08 20:09:06 +0000
+++ AUTHORS	2011-12-11 16:57:25 +0000
@@ -3,3 +3,4 @@
 Written by Wingpanel Developers:
 * Maxwell Barvian <[e-mail]>
 * ammonkey <[e-mail]>
+* Giulio Collura <[e-mail]>

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-07-08 20:09:06 +0000
+++ CMakeLists.txt	2011-12-11 16:57:25 +0000
@@ -1,41 +1,79 @@
-# Check http://elementaryos.org/docs/developer-guide/cmake for documentation
+# Check http://webdev.elementaryos.org/docs/developer-guide/cmake for documentation
 
 cmake_minimum_required (VERSION 2.6)
-cmake_policy(VERSION 2.6)
-
-project(wingpanel)
-
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/vala )
-
-add_subdirectory (src)
-add_subdirectory (data)
-
-# GSettings schema
-
-SET (SCHEMAS_NAME "desktop.pantheon.wingpanel.gschema.xml")
-# Have an option to not install the schema into where GLib is
-
-option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" OFF)
-
-if (GSETTINGS_LOCALINSTALL)
-    SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
-else (GSETTINGS_LOCALINSTALL)
-    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
-    set (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
-endif (GSETTINGS_LOCALINSTALL)
-# Run the validator and error if it fails
-
-execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMAS_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-if (_schemas_invalid)
-    message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
-endif (_schemas_invalid)
-
-# Actually install and recomple schemas
-
-message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
-
-install (FILES ${SCHEMAS_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
-install (CODE "message (STATUS \"Compiling GSettings schemas\")")
-install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
+cmake_policy (VERSION 2.6)
+list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+
+project (wingpanel)
+
+set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
+set (PKGDATADIR "${DATADIR}/wingpanel")
+set (GETTEXT_PACKAGE "wingpanel")
+set (RELEASE_NAME "A super sexy space-saving top panel.")
+set (VERSION "0.3.0")
+set (VERSION_INFO "Testing")
+set (CMAKE_C_FLAGS "-ggdb")
+
+# Indicators
+
+execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable indicatordir OUTPUT_VARIABLE _indicatordir OUTPUT_STRIP_TRAILING_WHITESPACE)
+set (INDICATORDIR "${_indicatordir}")
+
+# Files
+
+file (GLOB stylesheets "${CMAKE_CURRENT_SOURCE_DIR}/data/style/*.css")
+file (GLOB desktop_entry "${CMAKE_CURRENT_SOURCE_DIR}/data/wingpanel.desktop")
+
+# Configure file
+
+configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
+
+# Slingshot
+
+set (WINGPANEL_DEPS "gobject-2.0;glib-2.0;gio-2.0;gee-1.0;gdk-x11-3.0;x11;gtk+-3.0;granite")
+
+find_package (PkgConfig)
+pkg_check_modules (DEPS REQUIRED ${WINGPANEL_DEPS})
+pkg_check_modules (INDICATOR REQUIRED indicator3-0.4)
+
+find_package (Vala REQUIRED)
+include (ValaVersion)
+ensure_vala_version ("0.12.0" MINIMUM)
+
+include (ValaPrecompile)
+vala_precompile (VALA_C
+    src/WingpanelApp.vala
+    src/Settings.vala
+    src/Utils.vala
+    src/Widgets/Panel.vala
+    src/Widgets/AppsButton.vala
+    src/Services/WingpanelObjectEntry.vala
+    src/Services/IndicatorFileModel.vala
+PACKAGES
+	${WINGPANEL_DEPS}
+CUSTOM_VAPIS
+    vapi/config.vapi
+    vapi/indicator.vapi
+    vapi/indicators-gtk.vapi
+OPTIONS
+	--thread
+    -g
+)
+
+add_definitions (${DEPS_CFLAGS} ${INDICATOR_CFLAGS} -include config.h)
+link_libraries (${DEPS_LIBRARIES} ${INDICATOR_LIBRARIES})
+link_directories (${DEPS_LIBRARY_DIRS} ${INDICATOR_LIBRARY_DIRS})
+
+add_executable (wingpanel ${VALA_C})
+
+# Installation
+install (TARGETS wingpanel RUNTIME DESTINATION bin)
+install (FILES ${stylesheets} DESTINATION ${PKGDATADIR}/style)
+install (FILES ${desktop_entry} DESTINATION ${DATADIR}/applications)
+
+# GSettings Schema
+include (GSettings)
+add_schema ("org.elementary.wingpanel.gschema.xml")
+
+# Translations
+add_subdirectory (po)

=== added file 'cmake/FindVala.cmake'
--- cmake/FindVala.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindVala.cmake	2011-12-11 16:57:25 +0000
@@ -0,0 +1,65 @@
+##
+# 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 Vala compiler (valac)
+#
+# This module determines wheter a Vala compiler is installed on the current
+# system and where its executable is.
+#
+# Call the module using "find_package(Vala) from within your CMakeLists.txt.
+#
+# The following variables will be set after an invocation:
+#
+#  VALA_FOUND       Whether the vala compiler has been found or not
+#  VALA_EXECUTABLE  Full path to the valac executable if it has been found
+#  VALA_VERSION     Version number of the available valac
+##
+
+
+# Search for the valac executable in the usual system paths.
+find_program(VALA_EXECUTABLE
+  NAMES valac)
+
+# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.
+# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka.
+# VALA_EXECUTABLE is set)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Vala DEFAULT_MSG VALA_EXECUTABLE)
+
+mark_as_advanced(VALA_EXECUTABLE)
+
+# Determine the valac version
+if(VALA_FOUND)
+    execute_process(COMMAND ${VALA_EXECUTABLE} "--version" 
+                    OUTPUT_VARIABLE "VALA_VERSION")
+    string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION})
+    string(STRIP ${VALA_VERSION} "VALA_VERSION")
+endif(VALA_FOUND)

=== added file 'cmake/GSettings.cmake'
--- cmake/GSettings.cmake	1970-01-01 00:00:00 +0000
+++ cmake/GSettings.cmake	2011-12-11 16:57:25 +0000
@@ -0,0 +1,42 @@
+# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
+
+option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" ON)
+
+option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL})
+
+if(GSETTINGS_LOCALINSTALL)
+    message(STATUS "GSettings schemas will be installed locally.")
+endif()
+
+if(GSETTINGS_COMPILE)
+    message(STATUS "GSettings shemas will be compiled.")
+endif()
+
+macro(add_schema SCHEMA_NAME)
+
+    set(PKG_CONFIG_EXECUTABLE pkg-config)
+    # Have an option to not install the schema into where GLib is
+    if (GSETTINGS_LOCALINSTALL)
+        SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
+    else (GSETTINGS_LOCALINSTALL)
+        execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
+        SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
+    endif (GSETTINGS_LOCALINSTALL)
+
+    # Run the validator and error if it fails
+    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    if (_schemas_invalid)
+      message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
+    endif (_schemas_invalid)
+
+    # Actually install and recomple schemas
+    message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
+    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
+
+    if (GSETTINGS_COMPILE)
+        install (CODE "message (STATUS \"Compiling GSettings schemas\")")
+        install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
+    endif ()
+endmacro()

=== added file 'cmake/Makefile'
--- cmake/Makefile	1970-01-01 00:00:00 +0000
+++ cmake/Makefile	2011-12-11 16:57:25 +0000
@@ -0,0 +1,286 @@
+# 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
+

=== added file 'cmake/ParseArguments.cmake'
--- cmake/ParseArguments.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ParseArguments.cmake	2011-12-11 16:57:25 +0000
@@ -0,0 +1,36 @@
+##
+# This is a helper Macro to parse optional arguments in Macros/Functions
+# It has been taken from the public CMake wiki.  
+# See http://www.cmake.org/Wiki/CMakeMacroParseArguments for documentation and
+# licensing.
+##
+macro(parse_arguments prefix arg_names option_names)
+  set(DEFAULT_ARGS)
+  foreach(arg_name ${arg_names})
+    set(${prefix}_${arg_name})
+  endforeach(arg_name)
+  foreach(option ${option_names})
+    set(${prefix}_${option} FALSE)
+  endforeach(option)
+
+  set(current_arg_name DEFAULT_ARGS)
+  set(current_arg_list)
+  foreach(arg ${ARGN})
+    set(larg_names ${arg_names})
+    list(FIND larg_names "${arg}" is_arg_name)
+    if(is_arg_name GREATER -1)
+      set(${prefix}_${current_arg_name} ${current_arg_list})
+      set(current_arg_name ${arg})
+      set(current_arg_list)
+    else(is_arg_name GREATER -1)
+      set(loption_names ${option_names})
+      list(FIND loption_names "${arg}" is_option)
+      if(is_option GREATER -1)
+	    set(${prefix}_${arg} TRUE)
+      else(is_option GREATER -1)
+	    set(current_arg_list ${current_arg_list} ${arg})
+      endif(is_option GREATER -1)
+    endif(is_arg_name GREATER -1)
+  endforeach(arg)
+  set(${prefix}_${current_arg_name} ${current_arg_list})
+endmacro(parse_arguments)

=== added file 'cmake/README'
--- cmake/README	1970-01-01 00:00:00 +0000
+++ cmake/README	2011-12-11 16:57:25 +0000
@@ -0,0 +1,10 @@
+        Elementary CMake modules
+
+This is a set of CMake modules: Translations, GSettings, and Vala modules.
+
+For all the Vala related modules see README.Vala.rst: 
+    - ParseArguments.cmake
+    - ValaPrecompile.cmake
+    - ValaVersion.cmake
+    - FindVala.cmake
+

=== added file 'cmake/README.Vala.rst'
--- cmake/README.Vala.rst	1970-01-01 00:00:00 +0000
+++ cmake/README.Vala.rst	2011-12-11 16:57:25 +0000
@@ -0,0 +1,173 @@
+==========
+Vala CMake
+==========
+:Author: 
+    Jakob Westhoff
+:Version:
+    Draft
+
+
+Overview
+========
+
+Vala CMake is a collection of macros for the CMake_ build system to allow the
+creation and management of projects developed using the Vala_ programming
+language or its "Genie" flavor (less tested).
+
+
+Installation
+============
+
+To use the Vala macros in your own project you need to copy the macro files to
+an arbitrary folder in your projects directory and reference them in your
+``CMakeLists.txt`` file.
+
+Assuming the macros are stored under ``cmake/vala`` in your projects folder you
+need to add the following information to your base ``CMakeLists.txt``::
+
+    list(APPEND CMAKE_MODULE_PATH 
+        ${CMAKE_SOURCE_DIR}/cmake/vala
+    )
+
+After the new module path as been added you can simply include the provided
+modules or use the provided find routines.
+
+
+Finding Vala
+============
+
+The find module for vala works like any other Find module in CMake.
+You can use it by simply calling the usual ``find_package`` function. Default
+parameters like ``REQUIRED`` and ``QUIETLY`` are supported.
+
+::
+
+    find_package(Vala REQUIRED)
+
+After a successful call to the find_package function the following variables 
+will be set:
+
+VALA_FOUND
+    Whether the vala compiler has been found or not
+
+VALA_EXECUTABLE
+    Full path to the valac executable if it has been found
+
+VALA_VERSION
+    Version number of the available valac
+
+
+Precompiling Vala sources
+=========================
+
+CMake is mainly supposed to handle c or c++ based projects. Luckily every vala
+program is translated into plain c code using the vala compiler, followed by
+normal compilation of the generated c program using gcc.
+
+The macro ``vala_precompile`` uses that fact to create c files from your .vala
+sources for further CMake processing. 
+
+The first parameter provided is a variable, which will be filled with a list of
+c files outputted by the vala compiler. This list can than be used in
+conjunction with functions like ``add_executable`` or others to create the
+necessary compile rules with CMake.
+
+The initial variable is followed by a list of .vala files to be compiled.
+Please take care to add every vala file belonging to the currently compiled
+project or library as Vala will otherwise not be able to resolve all
+dependencies.
+
+The following sections may be specified afterwards to provide certain options
+to the vala compiler:
+
+PACKAGES  
+    A list of vala packages/libraries to be used during the compile cycle. The
+    package names are exactly the same, as they would be passed to the valac
+    "--pkg=" option.
+
+OPTIONS
+    A list of optional options to be passed to the valac executable. This can be
+    used to pass "--thread" for example to enable multi-threading support.
+
+DIRECTORY
+    Specify the directory where the output source files will be stored. If 
+    ommitted, the source files will be stored in CMAKE_CURRENT_BINARY_DIR.
+
+CUSTOM_VAPIS
+    A list of custom vapi files to be included for compilation. This can be
+    useful to include freshly created vala libraries without having to install
+    them in the system.
+
+GENERATE_VAPI
+    Pass all the needed flags to the compiler to create an internal vapi for
+    the compiled library. The provided name will be used for this and a
+    <provided_name>.vapi file will be created.
+
+GENERATE_HEADER
+    Let the compiler generate a header file for the compiled code. There will
+    be a header file as well as an internal header file being generated called
+    <provided_name>.h and <provided_name>_internal.h
+
+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
+        source1.vala
+        source2.vala
+        source3.vala
+    PACKAGES
+        gtk+-2.0
+        gio-1.0
+        posix
+    OPTIONS
+        --thread
+    CUSTOM_VAPIS
+        some_vapi.vapi
+    GENERATE_VAPI
+        myvapi
+    GENERATE_HEADER
+        myheader
+    )
+
+Most important is the variable VALA_C which will contain all the generated c
+file names after the call. The easiest way to use this information is to tell
+CMake to create an executable out of it.
+
+::
+
+    add_executable(myexecutable ${VALA_C})
+
+
+Further reading
+===============
+
+The `Pdf Presenter Console`__ , which is a vala based project of mine, makes
+heavy usage of the here described macros.  To look at a real world example of
+these macros the mentioned project is the right place to take a look. The svn
+trunk of it can be found at::
+
+	svn://pureenergy.cc/pdf_presenter_console/trunk
+
+
+__ http://westhoffswelt.de/projects/pdf_presenter_console.html
+
+
+Acknowledgments
+===============
+
+Thanks go out to Florian Sowade, a fellow local PHP-Usergroupie, who helped me
+a lot with the initial version of this macros and always answered my mostly
+dumb CMake questions.
+
+.. _CMake: http://cmake.org
+.. _Vala: http://live.gnome.org/Vala
+.. _Genie: http://live.gnome.org/Genie
+
+
+

+..
+   Local Variables:
+   mode: rst
+   fill-column: 79
+   End: 
+   vim: et syn=rst tw=79

=== removed file 'cmake/README.rst'
--- cmake/README.rst	2011-07-08 20:09:06 +0000
+++ cmake/README.rst	1970-01-01 00:00:00 +0000
@@ -1,173 +0,0 @@
-==========
-Vala CMake
-==========
-:Author: 
-    Jakob Westhoff
-:Version:
-    Draft
-
-
-Overview
-========
-
-Vala CMake is a collection of macros for the CMake_ build system to allow the
-creation and management of projects developed using the Vala_ programming
-language or its "Genie" flavor (less tested).
-
-
-Installation
-============
-
-To use the Vala macros in your own project you need to copy the macro files to
-an arbitrary folder in your projects directory and reference them in your
-``CMakeLists.txt`` file.
-
-Assuming the macros are stored under ``cmake/vala`` in your projects folder you
-need to add the following information to your base ``CMakeLists.txt``::
-
-    list(APPEND CMAKE_MODULE_PATH 
-        ${CMAKE_SOURCE_DIR}/cmake/vala
-    )
-
-After the new module path as been added you can simply include the provided
-modules or use the provided find routines.
-
-
-Finding Vala
-============
-
-The find module for vala works like any other Find module in CMake.
-You can use it by simply calling the usual ``find_package`` function. Default
-parameters like ``REQUIRED`` and ``QUIETLY`` are supported.
-
-::
-
-    find_package(Vala REQUIRED)
-
-After a successful call to the find_package function the following variables 
-will be set:
-
-VALA_FOUND
-    Whether the vala compiler has been found or not
-
-VALA_EXECUTABLE
-    Full path to the valac executable if it has been found
-
-VALA_VERSION
-    Version number of the available valac
-
-
-Precompiling Vala sources
-=========================
-
-CMake is mainly supposed to handle c or c++ based projects. Luckily every vala
-program is translated into plain c code using the vala compiler, followed by
-normal compilation of the generated c program using gcc.
-
-The macro ``vala_precompile`` uses that fact to create c files from your .vala
-sources for further CMake processing. 
-
-The first parameter provided is a variable, which will be filled with a list of
-c files outputted by the vala compiler. This list can than be used in
-conjunction with functions like ``add_executable`` or others to create the
-necessary compile rules with CMake.
-
-The initial variable is followed by a list of .vala files to be compiled.
-Please take care to add every vala file belonging to the currently compiled
-project or library as Vala will otherwise not be able to resolve all
-dependencies.
-
-The following sections may be specified afterwards to provide certain options
-to the vala compiler:
-
-PACKAGES  
-    A list of vala packages/libraries to be used during the compile cycle. The
-    package names are exactly the same, as they would be passed to the valac
-    "--pkg=" option.
-
-OPTIONS
-    A list of optional options to be passed to the valac executable. This can be
-    used to pass "--thread" for example to enable multi-threading support.
-
-DIRECTORY
-    Specify the directory where the output source files will be stored. If 
-    ommitted, the source files will be stored in CMAKE_CURRENT_BINARY_DIR.
-
-CUSTOM_VAPIS
-    A list of custom vapi files to be included for compilation. This can be
-    useful to include freshly created vala libraries without having to install
-    them in the system.
-
-GENERATE_VAPI
-    Pass all the needed flags to the compiler to create an internal vapi for
-    the compiled library. The provided name will be used for this and a
-    <provided_name>.vapi file will be created.
-
-GENERATE_HEADER
-    Let the compiler generate a header file for the compiled code. There will
-    be a header file as well as an internal header file being generated called
-    <provided_name>.h and <provided_name>_internal.h
-
-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
-        source1.vala
-        source2.vala
-        source3.vala
-    PACKAGES
-        gtk+-2.0
-        gio-1.0
-        posix
-    OPTIONS
-        --thread
-    CUSTOM_VAPIS
-        some_vapi.vapi
-    GENERATE_VAPI
-        myvapi
-    GENERATE_HEADER
-        myheader
-    )
-
-Most important is the variable VALA_C which will contain all the generated c
-file names after the call. The easiest way to use this information is to tell
-CMake to create an executable out of it.
-
-::
-
-    add_executable(myexecutable ${VALA_C})
-
-
-Further reading
-===============
-
-The `Pdf Presenter Console`__ , which is a vala based project of mine, makes
-heavy usage of the here described macros.  To look at a real world example of
-these macros the mentioned project is the right place to take a look. The svn
-trunk of it can be found at::
-
-	svn://pureenergy.cc/pdf_presenter_console/trunk
-
-
-__ http://westhoffswelt.de/projects/pdf_presenter_console.html
-
-
-Acknowledgments
-===============
-
-Thanks go out to Florian Sowade, a fellow local PHP-Usergroupie, who helped me
-a lot with the initial version of this macros and always answered my mostly
-dumb CMake questions.
-
-.. _CMake: http://cmake.org
-.. _Vala: http://live.gnome.org/Vala
-.. _Genie: http://live.gnome.org/Genie
-
-
-

-..
-   Local Variables:
-   mode: rst
-   fill-column: 79
-   End: 
-   vim: et syn=rst tw=79

=== added file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Translations.cmake	2011-12-11 16:57:25 +0000
@@ -0,0 +1,41 @@
+# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
+
+macro(add_translations_directory NLS_PACKAGE)
+    add_custom_target (i18n ALL COMMENT “Building i18n messages.”)
+    find_program (MSGFMT_EXECUTABLE msgfmt)
+    file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
+    foreach (PO_INPUT ${PO_FILES})
+        get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
+        set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
+        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
+
+        install (FILES ${MO_OUTPUT} DESTINATION
+            share/locale/${PO_INPUT_BASE}/LC_MESSAGES
+            RENAME ${NLS_PACKAGE}.mo)
+    endforeach (PO_INPUT ${PO_FILES})
+endmacro(add_translations_directory)
+
+
+macro(add_translations_catalog NLS_PACKAGE)
+    add_custom_target (pot COMMENT “Building translation catalog.”)
+    find_program (XGETTEXT_EXECUTABLE xgettext)
+
+
+    set(C_SOURCE "")
+
+    foreach(FILES_INPUT ${ARGN})
+        file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+        file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+    endforeach()
+
+    add_custom_command (TARGET pot COMMAND
+        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --from-code=UTF-8
+        )
+endmacro()

=== added file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ValaPrecompile.cmake	2011-12-11 16:57:25 +0000
@@ -0,0 +1,175 @@
+##
+# 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
+##
+
+include(ParseArguments)
+find_package(Vala REQUIRED)
+
+##
+# Compile vala files to their c equivalents for further processing. 
+#
+# The "vala_precompile" macro takes care of calling the valac executable on the
+# given source to produce c files which can then be processed further using
+# default cmake functions.
+# 
+# The first parameter provided is a variable, which will be filled with a list
+# of c files outputted by the vala compiler. This list can than be used in
+# conjuction with functions like "add_executable" or others to create the
+# neccessary compile rules with CMake.
+# 
+# The initial variable is followed by a list of .vala files to be compiled.
+# Please take care to add every vala file belonging to the currently compiled
+# project or library as Vala will otherwise not be able to resolve all
+# dependencies.
+# 
+# The following sections may be specified afterwards to provide certain options
+# to the vala compiler:
+# 
+# PACKAGES
+#   A list of vala packages/libraries to be used during the compile cycle. The
+#   package names are exactly the same, as they would be passed to the valac
+#   "--pkg=" option.
+# 
+# OPTIONS
+#   A list of optional options to be passed to the valac executable. This can be
+#   used to pass "--thread" for example to enable multi-threading support.
+#
+# CUSTOM_VAPIS
+#   A list of custom vapi files to be included for compilation. This can be
+#   useful to include freshly created vala libraries without having to install
+#   them in the system.
+#
+# GENERATE_VAPI
+#   Pass all the needed flags to the compiler to create an internal vapi for
+#   the compiled library. The provided name will be used for this and a
+#   <provided_name>.vapi file will be created.
+# 
+# GENERATE_HEADER
+#   Let the compiler generate a header file for the compiled code. There will
+#   be a header file as well as an internal header file being generated called
+#   <provided_name>.h and <provided_name>_internal.h
+#
+# 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
+#       source1.vala
+#       source2.vala
+#       source3.vala
+#   PACKAGES
+#       gtk+-2.0
+#       gio-1.0
+#       posix
+#   DIRECTORY
+#       gen
+#   OPTIONS
+#       --thread
+#   CUSTOM_VAPIS
+#       some_vapi.vapi
+#   GENERATE_VAPI
+#       myvapi
+#   GENERATE_HEADER
+#       myheader
+#   )
+#
+# 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})
+    if(ARGS_DIRECTORY)
+        set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY})
+    else(ARGS_DIRECTORY)
+        set(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    endif(ARGS_DIRECTORY)
+    include_directories(${DIRECTORY})
+    set(vala_pkg_opts "")
+    foreach(pkg ${ARGS_PACKAGES})
+        list(APPEND vala_pkg_opts "--pkg=${pkg}")
+    endforeach(pkg ${ARGS_PACKAGES})
+    set(in_files "")
+    set(out_files "")
+    set(${output} "")
+    foreach(src ${ARGS_DEFAULT_ARGS})
+        list(APPEND in_files "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
+        string(REPLACE ".vala" ".c" src ${src})
+        string(REPLACE ".gs" ".c" src ${src})
+        set(out_file "${DIRECTORY}/${src}")
+        list(APPEND out_files "${DIRECTORY}/${src}")
+        list(APPEND ${output} ${out_file})
+    endforeach(src ${ARGS_DEFAULT_ARGS})
+
+    set(custom_vapi_arguments "")
+    if(ARGS_CUSTOM_VAPIS)
+        foreach(vapi ${ARGS_CUSTOM_VAPIS})
+            if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+                list(APPEND custom_vapi_arguments ${vapi})
+            else (${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+                list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi})
+            endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+        endforeach(vapi ${ARGS_CUSTOM_VAPIS})
+    endif(ARGS_CUSTOM_VAPIS)
+
+    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")
+
+        # Header and internal header is needed to generate internal vapi
+        if (NOT ARGS_GENERATE_HEADER)
+            set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI})
+        endif(NOT ARGS_GENERATE_HEADER)
+    endif(ARGS_GENERATE_VAPI)
+
+    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")
+    endif(ARGS_GENERATE_HEADER)
+
+    add_custom_command(OUTPUT ${out_files} 
+    COMMAND 
+        ${VALA_EXECUTABLE} 
+    ARGS 
+        "-C" 
+        ${header_arguments} 
+        ${vapi_arguments}
+        "-b" ${CMAKE_CURRENT_SOURCE_DIR} 
+        "-d" ${DIRECTORY} 
+        ${vala_pkg_opts} 
+        ${ARGS_OPTIONS} 
+        ${in_files} 
+        ${custom_vapi_arguments}
+    DEPENDS 
+        ${in_files} 
+        ${ARGS_CUSTOM_VAPIS}
+    )
+endmacro(vala_precompile)

=== added file 'cmake/ValaVersion.cmake'
--- cmake/ValaVersion.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ValaVersion.cmake	2011-12-11 16:57:25 +0000
@@ -0,0 +1,96 @@
+##
+# 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
+##
+
+include(ParseArguments)
+find_package(Vala REQUIRED)
+
+##
+# Ensure a certain valac version is available
+#
+# The initial argument is the version to check for
+# 
+# It may be followed by a optional parameter to specifiy a version range. The
+# following options are valid:
+# 
+# EXACT
+#   Vala needs to be available in the exact version given
+# 
+# MINIMUM
+#   The provided version is the minimum version. Therefore Vala needs to be
+#   available in the given version or any higher version
+#
+# MAXIMUM
+#   The provided version is the maximum. Therefore Vala needs to be available
+#   in the given version or any version older than this
+#
+# If no option is specified the version will be treated as a minimal version.
+##
+macro(ensure_vala_version version)
+    parse_arguments(ARGS "" "MINIMUM;MAXIMUM;EXACT" ${ARGN})
+	set(compare_message "")
+	set(error_message "")
+	if(ARGS_MINIMUM)
+		set(compare_message "a minimum ")
+		set(error_message "or greater ")
+	elseif(ARGS_MAXIMUM)
+		set(compare_message "a maximum ")
+		set(error_message "or less ")
+	endif(ARGS_MINIMUM)
+	
+	message(STATUS 
+		"checking for ${compare_message}Vala version of ${version}"
+	)
+
+	unset(version_accepted)
+	
+	# MINIMUM is the default if no option is specified
+	if(ARGS_EXACT)
+		if(${VALA_VERSION} VERSION_EQUAL ${version} )
+			set(version_accepted TRUE)	
+		endif(${VALA_VERSION} VERSION_EQUAL ${version})
+	elseif(ARGS_MAXIMUM)
+		if(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
+			set(version_accepted TRUE)	
+		endif(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
+	else(ARGS_MAXIMUM)
+		if(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
+			set(version_accepted TRUE)	
+		endif(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
+	endif(ARGS_EXACT)
+
+	if (NOT version_accepted)
+		message(FATAL_ERROR 
+			"Vala version ${version} ${error_message}is required."
+		)
+	endif(NOT version_accepted)
+
+	message(STATUS
+		"  found Vala, version ${VALA_VERSION}"
+	)
+endmacro(ensure_vala_version)

=== removed directory 'cmake/vala'
=== removed file 'cmake/vala/FindVala.cmake'
--- cmake/vala/FindVala.cmake	2011-07-08 20:09:06 +0000
+++ cmake/vala/FindVala.cmake	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-##
-# 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 Vala compiler (valac)
-#
-# This module determines wheter a Vala compiler is installed on the current
-# system and where its executable is.
-#
-# Call the module using "find_package(Vala) from within your CMakeLists.txt.
-#
-# The following variables will be set after an invocation:
-#
-#  VALA_FOUND       Whether the vala compiler has been found or not
-#  VALA_EXECUTABLE  Full path to the valac executable if it has been found
-#  VALA_VERSION     Version number of the available valac
-##
-
-
-# Search for the valac executable in the usual system paths.
-find_program(VALA_EXECUTABLE
-  NAMES valac)
-
-# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.
-# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka.
-# VALA_EXECUTABLE is set)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Vala DEFAULT_MSG VALA_EXECUTABLE)
-
-mark_as_advanced(VALA_EXECUTABLE)
-
-# Determine the valac version
-if(VALA_FOUND)
-    execute_process(COMMAND ${VALA_EXECUTABLE} "--version" 
-                    OUTPUT_VARIABLE "VALA_VERSION")
-    string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION})
-    string(STRIP ${VALA_VERSION} "VALA_VERSION")
-endif(VALA_FOUND)

=== removed file 'cmake/vala/ParseArguments.cmake'
--- cmake/vala/ParseArguments.cmake	2011-07-08 20:09:06 +0000
+++ cmake/vala/ParseArguments.cmake	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-##
-# This is a helper Macro to parse optional arguments in Macros/Functions
-# It has been taken from the public CMake wiki.  
-# See http://www.cmake.org/Wiki/CMakeMacroParseArguments for documentation and
-# licensing.
-##
-macro(parse_arguments prefix arg_names option_names)
-  set(DEFAULT_ARGS)
-  foreach(arg_name ${arg_names})
-    set(${prefix}_${arg_name})
-  endforeach(arg_name)
-  foreach(option ${option_names})
-    set(${prefix}_${option} FALSE)
-  endforeach(option)
-
-  set(current_arg_name DEFAULT_ARGS)
-  set(current_arg_list)
-  foreach(arg ${ARGN})
-    set(larg_names ${arg_names})
-    list(FIND larg_names "${arg}" is_arg_name)
-    if(is_arg_name GREATER -1)
-      set(${prefix}_${current_arg_name} ${current_arg_list})
-      set(current_arg_name ${arg})
-      set(current_arg_list)
-    else(is_arg_name GREATER -1)
-      set(loption_names ${option_names})
-      list(FIND loption_names "${arg}" is_option)
-      if(is_option GREATER -1)
-	    set(${prefix}_${arg} TRUE)
-      else(is_option GREATER -1)
-	    set(current_arg_list ${current_arg_list} ${arg})
-      endif(is_option GREATER -1)
-    endif(is_arg_name GREATER -1)
-  endforeach(arg)
-  set(${prefix}_${current_arg_name} ${current_arg_list})
-endmacro(parse_arguments)

=== removed file 'cmake/vala/ValaPrecompile.cmake'
--- cmake/vala/ValaPrecompile.cmake	2011-07-08 20:09:06 +0000
+++ cmake/vala/ValaPrecompile.cmake	1970-01-01 00:00:00 +0000
@@ -1,175 +0,0 @@
-##
-# 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
-##
-
-include(ParseArguments)
-find_package(Vala REQUIRED)
-
-##
-# Compile vala files to their c equivalents for further processing. 
-#
-# The "vala_precompile" macro takes care of calling the valac executable on the
-# given source to produce c files which can then be processed further using
-# default cmake functions.
-# 
-# The first parameter provided is a variable, which will be filled with a list
-# of c files outputted by the vala compiler. This list can than be used in
-# conjuction with functions like "add_executable" or others to create the
-# neccessary compile rules with CMake.
-# 
-# The initial variable is followed by a list of .vala files to be compiled.
-# Please take care to add every vala file belonging to the currently compiled
-# project or library as Vala will otherwise not be able to resolve all
-# dependencies.
-# 
-# The following sections may be specified afterwards to provide certain options
-# to the vala compiler:
-# 
-# PACKAGES
-#   A list of vala packages/libraries to be used during the compile cycle. The
-#   package names are exactly the same, as they would be passed to the valac
-#   "--pkg=" option.
-# 
-# OPTIONS
-#   A list of optional options to be passed to the valac executable. This can be
-#   used to pass "--thread" for example to enable multi-threading support.
-#
-# CUSTOM_VAPIS
-#   A list of custom vapi files to be included for compilation. This can be
-#   useful to include freshly created vala libraries without having to install
-#   them in the system.
-#
-# GENERATE_VAPI
-#   Pass all the needed flags to the compiler to create an internal vapi for
-#   the compiled library. The provided name will be used for this and a
-#   <provided_name>.vapi file will be created.
-# 
-# GENERATE_HEADER
-#   Let the compiler generate a header file for the compiled code. There will
-#   be a header file as well as an internal header file being generated called
-#   <provided_name>.h and <provided_name>_internal.h
-#
-# 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
-#       source1.vala
-#       source2.vala
-#       source3.vala
-#   PACKAGES
-#       gtk+-2.0
-#       gio-1.0
-#       posix
-#   DIRECTORY
-#       gen
-#   OPTIONS
-#       --thread
-#   CUSTOM_VAPIS
-#       some_vapi.vapi
-#   GENERATE_VAPI
-#       myvapi
-#   GENERATE_HEADER
-#       myheader
-#   )
-#
-# 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})
-    if(ARGS_DIRECTORY)
-        set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY})
-    else(ARGS_DIRECTORY)
-        set(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    endif(ARGS_DIRECTORY)
-    include_directories(${DIRECTORY})
-    set(vala_pkg_opts "")
-    foreach(pkg ${ARGS_PACKAGES})
-        list(APPEND vala_pkg_opts "--pkg=${pkg}")
-    endforeach(pkg ${ARGS_PACKAGES})
-    set(in_files "")
-    set(out_files "")
-    set(${output} "")
-    foreach(src ${ARGS_DEFAULT_ARGS})
-        list(APPEND in_files "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
-        string(REPLACE ".vala" ".c" src ${src})
-        string(REPLACE ".gs" ".c" src ${src})
-        set(out_file "${DIRECTORY}/${src}")
-        list(APPEND out_files "${DIRECTORY}/${src}")
-        list(APPEND ${output} ${out_file})
-    endforeach(src ${ARGS_DEFAULT_ARGS})
-
-    set(custom_vapi_arguments "")
-    if(ARGS_CUSTOM_VAPIS)
-        foreach(vapi ${ARGS_CUSTOM_VAPIS})
-            if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
-                list(APPEND custom_vapi_arguments ${vapi})
-            else (${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
-                list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi})
-            endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
-        endforeach(vapi ${ARGS_CUSTOM_VAPIS})
-    endif(ARGS_CUSTOM_VAPIS)
-
-    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")
-
-        # Header and internal header is needed to generate internal vapi
-        if (NOT ARGS_GENERATE_HEADER)
-            set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI})
-        endif(NOT ARGS_GENERATE_HEADER)
-    endif(ARGS_GENERATE_VAPI)
-
-    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")
-    endif(ARGS_GENERATE_HEADER)
-
-    add_custom_command(OUTPUT ${out_files} 
-    COMMAND 
-        ${VALA_EXECUTABLE} 
-    ARGS 
-        "-C" 
-        ${header_arguments} 
-        ${vapi_arguments}
-        "-b" ${CMAKE_CURRENT_SOURCE_DIR} 
-        "-d" ${DIRECTORY} 
-        ${vala_pkg_opts} 
-        ${ARGS_OPTIONS} 
-        ${in_files} 
-        ${custom_vapi_arguments}
-    DEPENDS 
-        ${in_files} 
-        ${ARGS_CUSTOM_VAPIS}
-    )
-endmacro(vala_precompile)

=== removed file 'cmake/vala/ValaVersion.cmake'
--- cmake/vala/ValaVersion.cmake	2011-07-08 20:09:06 +0000
+++ cmake/vala/ValaVersion.cmake	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-##
-# 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
-##
-
-include(ParseArguments)
-find_package(Vala REQUIRED)
-
-##
-# Ensure a certain valac version is available
-#
-# The initial argument is the version to check for
-# 
-# It may be followed by a optional parameter to specifiy a version range. The
-# following options are valid:
-# 
-# EXACT
-#   Vala needs to be available in the exact version given
-# 
-# MINIMUM
-#   The provided version is the minimum version. Therefore Vala needs to be
-#   available in the given version or any higher version
-#
-# MAXIMUM
-#   The provided version is the maximum. Therefore Vala needs to be available
-#   in the given version or any version older than this
-#
-# If no option is specified the version will be treated as a minimal version.
-##
-macro(ensure_vala_version version)
-    parse_arguments(ARGS "" "MINIMUM;MAXIMUM;EXACT" ${ARGN})
-	set(compare_message "")
-	set(error_message "")
-	if(ARGS_MINIMUM)
-		set(compare_message "a minimum ")
-		set(error_message "or greater ")
-	elseif(ARGS_MAXIMUM)
-		set(compare_message "a maximum ")
-		set(error_message "or less ")
-	endif(ARGS_MINIMUM)
-	
-	message(STATUS 
-		"checking for ${compare_message}Vala version of ${version}"
-	)
-
-	unset(version_accepted)
-	
-	# MINIMUM is the default if no option is specified
-	if(ARGS_EXACT)
-		if(${VALA_VERSION} VERSION_EQUAL ${version} )
-			set(version_accepted TRUE)	
-		endif(${VALA_VERSION} VERSION_EQUAL ${version})
-	elseif(ARGS_MAXIMUM)
-		if(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
-			set(version_accepted TRUE)	
-		endif(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
-	else(ARGS_MAXIMUM)
-		if(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
-			set(version_accepted TRUE)	
-		endif(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
-	endif(ARGS_EXACT)
-
-	if (NOT version_accepted)
-		message(FATAL_ERROR 
-			"Vala version ${version} ${error_message}is required."
-		)
-	endif(NOT version_accepted)
-
-	message(STATUS
-		"  found Vala, version ${VALA_VERSION}"
-	)
-endmacro(ensure_vala_version)

=== added file 'config.h.cmake'
--- config.h.cmake	1970-01-01 00:00:00 +0000
+++ config.h.cmake	2011-12-11 16:57:25 +0000
@@ -0,0 +1,12 @@
+#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@"
+#cmakedefine INDICATORDIR "@INDICATORDIR@"
+
+#endif // CONFIG_H

=== removed file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2011-07-08 20:09:06 +0000
+++ data/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-set (PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/wingpanel")
-
-install (FILES wingpanel.desktop DESTINATION share/applications)
-install (FILES gtk-theme-style.css wingpanel-hud-style.css DESTINATION ${PKGDATADIR})

=== removed file 'data/gtk-theme-style.css'
--- data/gtk-theme-style.css	2011-07-08 20:09:06 +0000
+++ data/gtk-theme-style.css	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-@define-color panel_fg_color #ddddde;
-/*@define-color np_bg_color #333;*/
-
-* {
-    -GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;
-}
-
-.wingpanel-menubar {
-    border-width: 0;
-    border-style: none;
-    padding: 4;
-
-    -GtkMenuBar-internal-padding: 0;
-}
-

=== added directory 'data/style'
=== added file 'data/style/default.css'
--- data/style/default.css	1970-01-01 00:00:00 +0000
+++ data/style/default.css	2011-12-11 16:57:25 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2011 Giulio Collura
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@define-color shadow_color rgba (0, 0, 0, 0.4);
+
+.gnome-panel-menu-bar {
+    padding: 0;
+}
+
+.shadow {
+    background-color: @shadow_color;
+    background-image: -gtk-gradient (linear,
+                     left top, left bottom,
+                     from (@shadow_color),
+                     to (alpha (@shadow_color, 0.0)));
+}

=== removed file 'data/wingpanel-hud-style.css'
--- data/wingpanel-hud-style.css	2011-07-08 20:09:06 +0000
+++ data/wingpanel-hud-style.css	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-@define-color panel_fg_color #ddddde;
-/*@define-color np_bg_color #333;*/
-
-* {
-    -GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;
-}
-
-.wingpanel-menubar {
-    border-width: 0;
-    border-style: none;
-    padding: 4;
-    color: @panel_fg_color;
-    background-color: alpha(#000, 0.75);
-    /* needed to play well with rgba otherwise it perform an uneeded draw_background */
-    -GtkMenuBar-shadow-type : none;
-
-    -GtkMenuBar-internal-padding: 0;
-}
-

=== removed file 'desktop.pantheon.wingpanel.gschema.xml'
--- desktop.pantheon.wingpanel.gschema.xml	2011-07-08 20:09:06 +0000
+++ desktop.pantheon.wingpanel.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-<schemalist>	
-	<schema path="/desktop/pantheon/wingpanel/" id="desktop.pantheon.wingpanel" gettext-domain="wingpanel">
-		<key type="as" name="blacklist">
-			<default>[ 'libappmenu.so' ]</default>
-			<summary>List of indicators.</summary>
-			<description>These indicators will not be displayed in Wingpanel.</description>
-		</key>
-		<key type="b" name="use-gtk-theme">
-			<default>false</default>
-			<summary>Use gtk theme.</summary>
-			<description>Use gtk theme defined by gnome-panel-menu-bar css entry.</description>
-		</key>
-	</schema>
-</schemalist>

=== added file 'org.elementary.wingpanel.gschema.xml'
--- org.elementary.wingpanel.gschema.xml	1970-01-01 00:00:00 +0000
+++ org.elementary.wingpanel.gschema.xml	2011-12-11 16:57:25 +0000
@@ -0,0 +1,14 @@
+<schemalist>	
+	<schema path="/desktop/pantheon/wingpanel/" id="desktop.pantheon.wingpanel" gettext-domain="wingpanel">
+		<key type="as" name="blacklist">
+			<default>[ 'libappmenu.so' ]</default>
+			<summary>List of indicators.</summary>
+			<description>These indicators will not be displayed in Wingpanel.</description>
+		</key>
+        <key type="s" name="default-launcher">
+            <default>"slingshot"</default>
+            <summary>The default program to use as App launcher.</summary>
+            <description>Description</description>
+        </key>
+	</schema>
+</schemalist>

=== added directory 'po'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2011-12-11 16:57:25 +0000
@@ -0,0 +1,8 @@
+# Translations
+include (Translations)
+add_translations_directory ("wingpanel")
+add_translations_catalog ("wingpanel"
+    ../src/Widgets
+    ../src/Services
+    ../src
+)

=== added file 'po/wingpanel.pot'
--- po/wingpanel.pot	1970-01-01 00:00:00 +0000
+++ po/wingpanel.pot	2011-12-11 16:57:25 +0000
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-03 22:32+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: /home/random/Projects/wingpanel/po/../src/Widgets/AppsButton.vala:36
+msgid "<b>Applications</b>"
+msgstr ""

=== removed file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2011-07-08 21:31:14 +0000
+++ src/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-# Vala stuff
-find_package(Vala REQUIRED)
-# pkgconfig, real C code
-find_package(PkgConfig)
-pkg_check_modules(DEPS REQUIRED gtk+-3.0 glib-2.0 gio-2.0 gee-1.0 indicator3-0.4 x11 gdk-x11-3.0)
-
-include(ValaVersion)
-ensure_vala_version("0.12" MINIMUM)
-include(ValaPrecompile)
-
-execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable indicatordir OUTPUT_VARIABLE _indicatordir OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-# Base bits
-
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-set (PKGDATADIR "${DATADIR}/wingpanel")
-set (GETTEXT_PACKAGE "wingpanel")
-set (RELEASE_NAME "A super sexy space-saving top panel.")
-set (VERSION "0.2.0")
-set (VERSION_INFO "Release")
-
-set (INDICATORDIR "${_indicatordir}")
-#set (INDICATORDIR "grrrrrrrr")
-
-#include_directories(${CMAKE_CURRENT_BINARY_DIR}/../vapi)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(CFLAGS
-	${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
-)
-set(LIB_PATHS
-	${DEPS_LIBRARY_DIRS}
-)
-link_directories(${LIB_PATHS})
-add_definitions(${CFLAGS})
-
-vala_precompile(VALA_C
-    wingpanel-panel.vala
-    wingpanel-indicator-file-model.vala
-    wingpanel-object-entry.vala
-    log.vala
-    cardapio.vala
-PACKAGES
-    gtk+-3.0
-    glib-2.0
-    gio-2.0
-    gee-1.0
-    x11
-    gdk-x11-3.0
-OPTIONS
-    --thread
-CUSTOM_VAPIS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../vapi/config.vapi
-    ${CMAKE_CURRENT_SOURCE_DIR}/../vapi/indicator.vapi
-    ${CMAKE_CURRENT_SOURCE_DIR}/../vapi/indicators-gtk.vapi
-    )
-
-add_executable(wingpanel
-    ${VALA_C} )
-
-target_link_libraries(wingpanel ${DEPS_LIBRARIES})
-
-configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-install(TARGETS wingpanel RUNTIME DESTINATION bin)

=== added directory 'src/Services'
=== added file 'src/Services/IndicatorFileModel.vala'
--- src/Services/IndicatorFileModel.vala	1970-01-01 00:00:00 +0000
+++ src/Services/IndicatorFileModel.vala	2011-12-11 16:57:25 +0000
@@ -0,0 +1,158 @@
+/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by canonical.com
+ *
+ */
+
+using Gee;
+
+namespace Wingpanel {
+
+    public abstract class IndicatorsModel : GLib.Object {
+
+        private static IndicatorsModel _global_model = null;
+
+        public static IndicatorsModel get_default () {
+
+            if (_global_model == null) {
+                _global_model = new IndicatorsFileModel ();
+            }
+
+            return _global_model;
+        }
+
+        public static void set_default (IndicatorsModel model) {
+            _global_model = model;
+        }
+
+        public abstract Gee.ArrayList<Indicator.Object> get_indicators ();
+        public abstract string get_indicator_name (Indicator.Object o);
+    }
+
+    public class IndicatorsFileModel : IndicatorsModel {
+
+        public static HashMap<string, int> indicator_order = null;
+        public HashMap<GLib.Object, string> indicator_map;
+        public ArrayList<GLib.Object> indicator_list;
+
+        public IndicatorsFileModel () {
+
+            string skip_list;
+
+            //indicator_map = new Gee.HashMap<Indicator.Object, string> ();
+            indicator_map = new Gee.HashMap<GLib.Object, string> ();
+            indicator_order = new Gee.HashMap<string, int> ();
+            indicator_list = new Gee.ArrayList<GLib.Object> ();
+
+            /* Static order of indicators. We always want the session indicators
+             * to be on the far right end of the panel. That is why it the session
+             * indicator is the last one set in indicator_order.
+             */
+            //indicator_order.set ("libappmenu.so", 7);
+            indicator_order.set ("libapplication.so", 6);
+            indicator_order.set ("libnetworkmenu.so", 5);
+            indicator_order.set ("libsoundmenu.so", 4);
+            indicator_order.set ("libmessaging.so", 3);
+            indicator_order.set ("libpower.so", 2);
+            indicator_order.set ("libsession.so", 1);
+
+            /* Indicators we don't want to load */
+            skip_list = Environment.get_variable ("UNITY_PANEL_INDICATORS_SKIP");
+            if (skip_list == null)
+                skip_list = "";
+
+            if (skip_list == "all") {
+                log("wingpanel", LogLevelFlags.LEVEL_WARNING, "Skipping all indicator loading");
+                return;
+            }
+
+            /* Don't load appmenu-gtk */
+            skip_list += ",libappmenu.so";
+
+            /* We need to look for icons in an specific location */
+            //Gtk.IconTheme.get_default ().append_search_path (Wingpanel.Config.INDICATORICONSDIR);
+
+            File dir = File.new_for_path (Build.INDICATORDIR);
+            try {
+                var e = dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME, 0, null);
+                ArrayList<string> sos = new ArrayList<string> ();
+
+                FileInfo file_info;
+                while ((file_info = e.next_file (null)) != null)
+                {
+                    string leaf = file_info.get_name ();
+
+                    if (leaf in skip_list)
+                    {
+                        log("wingpanel", LogLevelFlags.LEVEL_WARNING, "SKIP LOADING: %s", leaf);
+                        continue;
+                    }
+
+                    if (leaf.has_suffix (".so"))
+                    {
+                        sos.add (leaf);
+                        log("wingpanel", LogLevelFlags.LEVEL_DEBUG, "LOADING: %s", leaf);
+                    }
+                }
+
+                /* Order the so's before we load them */
+                sos.sort ((CompareFunc)indicator_sort_func);
+
+                foreach (string leaf in sos)
+                    this.load_indicator (dir.get_path() + "/" + leaf, leaf);
+            }
+            catch (Error error)
+            {
+                log("wingpanel",LogLevelFlags.LEVEL_ERROR, "Unable to read indicators: %s\n", error.message);
+            }
+        }
+
+        public static int indicator_sort_func (string a, string b)
+        {
+            return indicator_order[a] - indicator_order[b];
+        }
+
+        private void load_indicator (string filename, string leaf)
+        {
+            Indicator.Object o;
+
+            o = new Indicator.Object.from_file (filename);
+
+            if (o is Indicator.Object)
+            {
+                this.indicator_map[o] = leaf;
+                indicator_list.add (o);
+            }
+            else
+            {
+                log("wingpanel", LogLevelFlags.LEVEL_ERROR, "Unable to load %s\n", filename);
+            }
+        }
+
+        //public override ArrayList<Indicator.Object> get_indicators ()
+        public override ArrayList<GLib.Object> get_indicators ()
+        {
+            return indicator_list;
+        }
+
+        public override string get_indicator_name (Indicator.Object o)
+        {
+            return indicator_map[o];
+        }
+    }
+}
+

=== added file 'src/Services/WingpanelObjectEntry.vala'
--- src/Services/WingpanelObjectEntry.vala	1970-01-01 00:00:00 +0000
+++ src/Services/WingpanelObjectEntry.vala	2011-12-11 16:57:25 +0000
@@ -0,0 +1,41 @@
+using Gdk;
+
+namespace  Wingpanel 
+{
+    public class IndicatorObjectEntry: Gtk.MenuItem
+    {
+        Indicator.Object object;
+
+        public IndicatorObjectEntry (Indicator.ObjectEntry entry, Indicator.Object iobject)
+        {
+            object = iobject;
+            
+            IndicatorsModel model = IndicatorsModel.get_default ();
+
+            Gtk.HBox box = new Gtk.HBox (false, 0);
+            box.spacing = 2;
+            if (entry.image != null && entry.image is Gtk.Image) {
+                GLib.log("wingpanel", LogLevelFlags.LEVEL_DEBUG, "Indicator: %s has attribute image", model.get_indicator_name(object));
+                box.pack_start (entry.image, false, false, 0);
+            }
+            if (entry.label != null && entry.label is Gtk.Label) {
+                GLib.log("wingpanel", LogLevelFlags.LEVEL_DEBUG, "Indicator: %s has attribute label", model.get_indicator_name(object));
+                box.pack_end (entry.label, false, false, 0);
+            }
+            add (box);
+            box.show ();
+            if (entry.menu != null)
+                set_submenu (entry.menu);
+            show ();
+            scroll_event.connect (on_scroll_event);
+        }
+
+        private bool on_scroll_event (EventScroll event)
+        {
+            Signal.emit_by_name (object, "scroll", 1, event.direction);
+            
+            return false;
+        }
+
+    }
+}

=== added file 'src/Settings.vala'
--- src/Settings.vala	1970-01-01 00:00:00 +0000
+++ src/Settings.vala	2011-12-11 16:57:25 +0000
@@ -0,0 +1,33 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+//  
+//  Copyright (C) 2011 Wingpanel Developers
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program 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 General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using Granite.Services;
+
+namespace Wingpanel {
+
+    public class Settings : Granite.Services.Settings {
+
+        public string default_launcher { get; set; }
+
+        public Settings () {
+            base ("desktop.pantheon.wingpanel");
+        }
+
+    }
+
+}

=== added file 'src/Utils.vala'
--- src/Utils.vala	1970-01-01 00:00:00 +0000
+++ src/Utils.vala	2011-12-11 16:57:25 +0000
@@ -0,0 +1,37 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+//  
+//  Copyright (C) 2011 Wingpanel Developers
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program 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 General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using Gtk;
+
+namespace Wingpanel.Utils {
+
+    public static Alignment set_padding (Gtk.Widget widget, int top, int right, 
+                                         int bottom, int left) {
+
+        var alignment = new Alignment (0.0f, 0.0f, 1.0f, 1.0f);
+        alignment.top_padding = top;
+        alignment.right_padding = right;
+        alignment.bottom_padding = bottom;
+        alignment.left_padding = left;
+    
+        alignment.add (widget);
+        return alignment;
+
+    }
+
+}

=== added directory 'src/Widgets'
=== added file 'src/Widgets/AppsButton.vala'
--- src/Widgets/AppsButton.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/AppsButton.vala	2011-12-11 16:57:25 +0000
@@ -0,0 +1,49 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+//  
+//  Copyright (C) 2011 Wingpanel Developers
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program 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 General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using Gtk;
+using Gdk;
+using Cairo;
+
+namespace Wingpanel.Widgets {
+
+    public class AppsButton : EventBox {
+
+        private Label app_label;
+
+        construct {
+
+            can_focus = true;
+        }
+
+        public AppsButton () {
+
+            app_label = new Label (_("<b>Applications</b>"));
+            app_label.use_markup = true;
+
+            add (Utils.set_padding (app_label, 0, 14, 0, 14));
+
+            get_style_context ().add_class ("menubar");
+            get_style_context ().add_class ("gnome-panel-menu-bar");
+            get_style_context ().add_class ("wingpanel-app-button");
+
+        }
+
+    }
+
+}

=== added file 'src/Widgets/Panel.vala'
--- src/Widgets/Panel.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/Panel.vala	2011-12-11 16:57:25 +0000
@@ -0,0 +1,332 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+//  
+//  Copyright (C) 2011 Wingpanel Developers
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program 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 General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using Gtk;
+using Gdk;
+using Cairo;
+
+using Granite;
+using Granite.Services;
+
+namespace Wingpanel {
+
+    public enum Struts {
+        LEFT,
+        RIGHT,
+        TOP,
+        BOTTOM,
+        LEFT_START,
+        LEFT_END,
+        RIGHT_START,
+        RIGHT_END,
+        TOP_START,
+        TOP_END,
+        BOTTOM_START,
+        BOTTOM_END,
+        N_VALUES
+    }
+
+    private class Shadow : Granite.Widgets.CompositedWindow {
+
+        private MenuBar menubar;
+
+        public Shadow () {
+
+            menubar = new MenuBar ();
+
+            skip_taskbar_hint = true; // no taskbar
+            //skip_pager_hint = true;
+            menubar.get_style_context ().add_class ("shadow");
+            set_type_hint (WindowTypeHint.DROPDOWN_MENU);
+            set_keep_below (true);
+            stick ();
+            set_accept_focus (false);
+
+        }
+
+        protected override bool draw (Context cr) {
+
+            Allocation size;
+            get_allocation (out size);
+            
+            var ctx = menubar.get_style_context ();
+            render_background (ctx, cr, size.x, size.y, 
+                               size.width, size.height);
+
+            return true;
+
+        }
+
+    }
+
+    public class Panel : Gtk.Window {
+
+        public const int panel_height = 24;
+        public const int stroke_width = 0;
+        public uint animation_timer = 0;
+        public int panel_displacement = -panel_height;
+
+        private HBox container;
+        private HBox left_wrapper;
+        private HBox right_wrapper;
+        private MenuBar menubar;
+        private MenuBar clock;
+
+        private Shadow shadow;
+        private int shadow_size = 16;
+
+        private IndicatorsModel model;
+        private Gee.HashMap<string, Gtk.MenuItem> menuhash;
+        private Gdk.Rectangle monitor_dimensions;
+
+        private WingpanelApp app;
+
+        public Panel (WingpanelApp app) {
+
+            this.app = app;
+            set_application (app as Gtk.Application);
+
+            //Window properties
+            skip_taskbar_hint = true; // no taskbar
+            decorated = false; // no window decoration
+            app_paintable = true;
+            set_visual (get_screen ().get_rgba_visual ());
+
+            shadow = new Shadow ();
+            shadow.move (0, panel_height);
+
+            panel_resize (false);
+            /* update the panel size on screen size or monitor changes */
+            screen.size_changed.connect (() => {
+                panel_resize (true);
+            });
+            screen.monitors_changed.connect (() => {
+                panel_resize (true);
+            });
+
+            menuhash = new Gee.HashMap<string, Gtk.MenuItem> ();
+
+            // Window properties
+            set_type_hint (WindowTypeHint.DOCK);
+            move (0, panel_displacement);
+            get_style_context ().add_provider_for_screen (get_screen (), app.provider, 600);
+
+            // HBox container
+            container = new HBox (false, 0);
+            left_wrapper = new HBox (false, 0);
+            right_wrapper = new HBox (false, 0);
+            resizable = false;
+
+            add (container);
+
+            // Add default widgets
+            add_defaults ();
+
+            model = IndicatorsModel.get_default ();
+            var indicators_list = model.get_indicators ();
+
+            foreach (Indicator.Object o in indicators_list) {
+                 load_indicator (o);
+            }
+
+            // Signals
+            realize.connect (() => { set_struts ();});
+            destroy.connect (Gtk.main_quit);
+
+        }
+
+        private void panel_resize (bool redraw)  {
+
+            screen.get_monitor_geometry (this.screen.get_primary_monitor(), out this.monitor_dimensions);
+            set_size_request (monitor_dimensions.width, -1);
+            shadow.set_size_request (monitor_dimensions.width, shadow_size);
+
+            set_struts ();
+            if (redraw)
+                queue_draw ();
+        }
+
+        private void create_entry (Indicator.ObjectEntry entry,
+                                   Indicator.Object      object) {
+
+            //delete_entry(entry, object);
+            Gtk.MenuItem menuitem = new IndicatorObjectEntry (entry, object);
+            menuhash[model.get_indicator_name(object)] = menuitem;
+
+            if (model.get_indicator_name(object) == "libdatetime.so") { // load libdatetime in center
+                /* Bold clock label font */
+                var font = new Pango.FontDescription ();
+                font.set_weight (Pango.Weight.HEAVY);
+                var box = menuitem.get_child () as Gtk.Container;
+                box.get_children ().nth_data (0).modify_font (font);
+                clock.prepend(menuitem);
+            } else {
+                menubar.prepend (menuitem);
+            }
+        
+        }
+
+        private void delete_entry (Indicator.ObjectEntry entry,
+                                   Indicator.Object     object) {
+
+            if (menuhash.has_key(model.get_indicator_name(object))) {
+
+                var menuitem = menuhash[model.get_indicator_name(object)];
+                this.menubar.remove (menuitem);
+
+            }
+        }
+
+        private void on_entry_added (Indicator.Object      object,
+                                     Indicator.ObjectEntry entry) {
+
+            create_entry (entry, object);
+        }
+
+        private void on_entry_removed (Indicator.Object      object,
+                                       Indicator.ObjectEntry entry) {
+
+            delete_entry (entry, object);
+        }
+
+        public void load_indicator (Indicator.Object indicator) {
+
+            if (indicator is Indicator.Object) {
+                indicator.entry_added.connect (this.on_entry_added);
+                indicator.entry_removed.connect (this.on_entry_removed);
+                indicator.ref();
+
+                unowned GLib.List<Indicator.ObjectEntry> list = indicator.get_entries ();
+
+                for (int i = 0; i < list.length (); i++) {
+                    unowned Indicator.ObjectEntry entry = (Indicator.ObjectEntry) list.nth_data (i);
+                    this.create_entry (entry, indicator);
+                }
+                message ("Loaded indicator %s", model.get_indicator_name(indicator));
+            } else {
+                warning ("Unable to load %s", model.get_indicator_name(indicator));
+            }
+        }
+
+        private void add_defaults () {
+
+            // Apps button
+            var apps = new Widgets.AppsButton ();
+            apps.button_press_event.connect (launch_launcher);
+
+            left_wrapper.pack_start (apps, false, true, 0);
+            container.pack_start (left_wrapper);
+
+            clock = new Gtk.MenuBar ();
+            clock.can_focus = true;
+            clock.border_width = 0;
+            clock.get_style_context ().add_class ("gnome-panel-menu-bar");
+            container.pack_start (clock, false, false, 0);
+
+            // Menubar for storing indicators
+            menubar = new Gtk.MenuBar ();
+            menubar.can_focus = true;
+            menubar.border_width = 0;
+            menubar.get_style_context ().add_class ("gnome-panel-menu-bar");
+            
+            right_wrapper.pack_end (menubar, false, false, 0);
+            container.pack_end (right_wrapper);
+
+            get_style_context ().add_class ("menubar");
+            get_style_context ().add_class ("gnome-panel-menu-bar");
+            
+            SizeGroup gpr = new SizeGroup (SizeGroupMode.HORIZONTAL);
+            gpr.add_widget (left_wrapper);
+            gpr.add_widget (right_wrapper);
+
+        }
+
+        private bool launch_launcher (Gtk.Widget widget, Gdk.EventButton event) {
+
+            debug ("Starting launcher!");
+        
+            string? launcher = Environment.find_program_in_path (app.settings.default_launcher);
+            if (launcher != null)
+                System.execute_command (launcher);
+            else
+                System.open_uri ("file:///usr/share/applications");
+
+            return true;
+        
+        }
+
+        protected override bool draw (Context cr) {
+
+            Allocation size;
+            get_allocation (out size);
+
+            var ctx = menubar.get_style_context ();
+            render_background (ctx, cr, size.x, size.y, 
+                               size.width, size.height);
+
+            // Slide in
+            if (animation_timer == 0) {
+                animation_timer = GLib.Timeout.add (300/panel_height, () => {
+                    if (panel_displacement >= 0 ) {
+                        return false;
+                    } else {
+                        panel_displacement += 1;
+                        move (0, panel_displacement);
+                        return true;
+                    }
+                });
+            }
+            propagate_draw (container, cr);
+
+            if (!shadow.visible)
+                shadow.show_all ();
+
+            return true;
+        }
+
+        private void set_struts () {
+
+            if (!get_realized ()) {
+                return;
+            }
+
+            int x, y;
+            this.get_position (out x, out y);
+
+            // since uchar is 8 bits in vala but the struts are 32 bits
+            // we have to allocate 4 times as much and do bit-masking
+            ulong[] struts = new ulong [Struts.N_VALUES];
+
+            struts [Struts.TOP] = this.panel_height;
+            struts [Struts.TOP_START] = monitor_dimensions.x;
+            struts [Struts.TOP_END] = monitor_dimensions.x + monitor_dimensions.width - 1;
+
+            var first_struts = new ulong [Struts.BOTTOM + 1];
+            for (var i = 0; i < first_struts.length; i++)
+                first_struts [i] = struts [i];
+
+            unowned X.Display display = X11Display.get_xdisplay (get_window ().get_display ());
+            var xid = X11Window.get_xid (get_window ());
+
+            display.change_property (xid, display.intern_atom ("_NET_WM_STRUT_PARTIAL", false), X.XA_CARDINAL,
+                                  32, X.PropMode.Replace, (uchar[]) struts, struts.length);
+            display.change_property (xid, display.intern_atom ("_NET_WM_STRUT", false), X.XA_CARDINAL,
+                                  32, X.PropMode.Replace, (uchar[]) first_struts, first_struts.length);
+        }
+    }
+}

=== added file 'src/WingpanelApp.vala'
--- src/WingpanelApp.vala	1970-01-01 00:00:00 +0000
+++ src/WingpanelApp.vala	2011-12-11 16:57:25 +0000
@@ -0,0 +1,93 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+//  
+//  Copyright (C) 2011 Wingpanel Developers
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program 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 General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+using Gtk;
+using Granite;
+
+namespace Wingpanel {
+
+    public class WingpanelApp : Granite.Application {
+
+        private Panel panel = null;
+
+        public Settings settings { get; private set; default = null; }
+        public CssProvider provider { get; private set; default = null; }
+
+        construct {
+
+            build_data_dir = Build.DATADIR;
+            build_pkg_data_dir = Build.PKGDATADIR;
+            build_release_name = Build.RELEASE_NAME;
+            build_version = Build.VERSION;
+            build_version_info = Build.VERSION_INFO;
+            
+            program_name = "Wingpanel";
+		    exec_name = "wingpanel";
+		    app_copyright = "GPLv3";
+		    app_icon = "";
+		    app_launcher = "";
+            application_id = "net.launchpad.wingpanel";
+		    main_url = "https://launchpad.net/wingpanel";
+		    bug_url = "https://bugs.launchpad.net/wingpanel";
+		    help_url = "https://answers.launchpad.net/wingpanel";
+		    translate_url = "https://translations.launchpad.net/wingpanel";
+
+		    about_authors = {"Giulio Collura <[e-mail]>"};
+		    about_artists = {"Daniel Foré <[e-mail]>"};
+
+        }
+
+        public WingpanelApp () {
+
+            debug ("In wingpanel");
+
+            settings = new Settings ();
+            provider = new CssProvider ();
+
+            try {
+                provider.load_from_path (Build.PKGDATADIR + "/style/default.css");
+            } catch (Error e) {
+                warning ("Error: %s\n", e.message);
+            }
+
+            DEBUG = false;
+
+        }
+
+        protected override void activate () {
+
+            debug ("Activating");
+
+            if (get_windows () == null) {
+                panel = new Panel (this);
+                panel.show_all ();
+            } else {
+                panel.show_all ();
+            }
+        
+        }
+
+        public static int main (string[] args) {
+
+            return new WingpanelApp ().run (args);
+
+        }
+
+    }
+
+}

=== removed file 'src/cardapio.vala'
--- src/cardapio.vala	2011-07-08 20:09:06 +0000
+++ src/cardapio.vala	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-namespace Cardapio {
-    [DBus (name = "org.varal.Cardapio")]
-    interface dbus : GLib.Object {
-        [DBus (name = "show_hide")]
-        public abstract void show_hide() throws GLib.IOError;
-        [DBus (name = "show_hide_near_mouse")]
-        public abstract void show_hide_near_mouse() throws GLib.IOError;
-        [DBus (name = "show_hide_near_point")]
-        public abstract void show_hide_near_point(int32 x, int32 y, bool force_anchor_right, bool force_anchor_bottom) throws GLib.IOError;
-    }
-}

=== removed file 'src/config.h.cmake'
--- src/config.h.cmake	2011-07-08 20:09:06 +0000
+++ src/config.h.cmake	1970-01-01 00:00:00 +0000
@@ -1,12 +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@"
-#cmakedefine INDICATORDIR "@INDICATORDIR@"
-
-#endif // CONFIG_H

=== removed file 'src/log.vala'
--- src/log.vala	2011-07-08 20:09:06 +0000
+++ src/log.vala	1970-01-01 00:00:00 +0000
@@ -1,186 +0,0 @@
-public class Log : Object{
-
-    public enum Color{
-        Black,
-        DarkRed,
-        DarkGreen,
-        DarkYellow,
-        DarkBlue,
-        DarkMagenta,
-        DarkCyan,
-        Gray,
-
-        // Light colors
-        DarkGray,
-        Red,
-        Green,
-        Yellow,
-        Blue,
-        Magenta,
-        Cyan,
-        White,
-
-        // Reset sequence
-        Reset
-    }
-
-    public static void log_handler (string? domain, LogLevelFlags lvl, string message) {
-
-        if(!should_log(lvl))
-            return;
-        
-        var output = preprocess(message);
-        
-        prelude(domain, lvl);
-        
-        stdout.printf(output);
-
-        stdout.printf("\n");
-    }
-    
-    private static string preprocess(string message) {
-        string[] output;
-        string[] strings = message.split(":");
-        if(strings[0].length > 5)
-        {
-            if(strings[0].has_suffix(".vala"))
-            {
-                output = strings[2:strings.length];
-                if(output[0].has_prefix(" "))
-                    output[0] = output[0].strip();
-            } else {
-                output = strings;
-            }
-        } else {
-            output = strings;
-        }
-        return string.joinv(":",output);
-    }
-
-    private static string get_color_code(Color color, bool foreground){
-        var light = false;
-        var color_id = 0;
-        var reset = false;
-
-        switch (color) {
-            // Dark colors
-            case Color.Black:        color_id = 0;                  break;
-            case Color.DarkRed:      color_id = 1;                  break;
-            case Color.DarkGreen:    color_id = 2;                  break;
-            case Color.DarkYellow:   color_id = 3;                  break;
-            case Color.DarkBlue:     color_id = 4;                  break;
-            case Color.DarkMagenta:  color_id = 5;                  break;
-            case Color.DarkCyan:     color_id = 6;                  break;
-            case Color.Gray:         color_id = 7;                  break;
-
-            // Light colors
-            case Color.DarkGray:    color_id = 0; light = true;     break;
-            case Color.Red:         color_id = 1; light = true;     break;
-            case Color.Green:       color_id = 2; light = true;     break;
-            case Color.Yellow:      color_id = 3; light = true;     break;
-            case Color.Blue:        color_id = 4; light = true;     break;
-            case Color.Magenta:     color_id = 5; light = true;     break;
-            case Color.Cyan:        color_id = 6; light = true;     break;
-            case Color.White:       color_id = 7; light = true;     break;
-
-            // Reset sequence
-            case Color.Reset:       reset = true;                   break;
-        }
-
-        if(reset)
-            return "\x001b[0m";
-
-        int code = color_id + (foreground ? 30 : 40) + (light ? 60 : 0);
-        return "\x001b["+code.to_string()+"m";
-    }
-
-    private static void color(Color? foreground, Color? background = null){
-        if(foreground != null)
-            stdout.printf(get_color_code(foreground, true));
-
-        if(background != null)
-            stdout.printf(get_color_code(background, false));
-    }
-
-    private static void reset(){
-        stdout.printf(get_color_code(Color.Reset, true));
-    }
-
-    protected static void prelude(string? domain, LogLevelFlags level){
-        stdout.printf ("[%15.15s]", domain);
-        
-        string name = "";
-        
-        switch (level) {
-            case LogLevelFlags.FLAG_RECURSION:
-                color(Color.Red, Color.White);
-                name = "Recursion";
-                break;
-            case LogLevelFlags.FLAG_FATAL:
-                color(Color.Red, Color.White);
-                name = "Fatal";
-                break;
-            case LogLevelFlags.LEVEL_CRITICAL:
-                color(Color.Red, Color.White);
-                name = "Critical";
-                break;
-            case LogLevelFlags.LEVEL_ERROR:
-                color(Color.Yellow);
-                name = "Error";
-                break;
-            case LogLevelFlags.LEVEL_WARNING:
-                color(Color.Yellow);
-                name = "Warning";
-                break;
-            case LogLevelFlags.LEVEL_MESSAGE:
-                color(Color.DarkMagenta);
-                name = "Message";
-                break;
-            case LogLevelFlags.LEVEL_INFO:
-                color(Color.Blue);
-                name = "Info";
-                break;
-            case LogLevelFlags.LEVEL_DEBUG:
-                color(Color.Green);
-                name = "Debug";
-                break;
-            case LogLevelFlags.LEVEL_MASK:
-                color(Color.Green);
-                name = "Mask";
-                break;
-            default:
-                color(Color.Black, Color.DarkYellow);
-                name = "undefined";
-                break;
-        }
-
-        stdout.printf ("[%9s]", name);
-        reset();
-
-        stdout.printf(" ");
-    }
-
-    private static bool should_log(LogLevelFlags request_level){
-//        switch (request_level) {
-//            case Level.FATAL:
-//                return true;
-//            case Level.ERROR:
-//                return true;
-//            case Level.WARN:
-//                return true;
-//            case Level.NOTIFY:
-//                return true;
-//            case Level.INFO:
-//                return true;
-//            case Level.DEBUG:
-//                return true;
-//            case Level.UNDEFINED:
-//                return true;
-//        }
-
-//        return false;
-
-        return true;//request_level <= level;
-    }
-}
-

=== removed file 'src/wingpanel-indicator-file-model.vala'
--- src/wingpanel-indicator-file-model.vala	2011-07-20 07:27:22 +0000
+++ src/wingpanel-indicator-file-model.vala	1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
-/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
-/*
- * Copyright (C) 2010 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by canonical.com
- *
- */
-
-using Gee;
-
-namespace Wingpanel
-{
-    public abstract class IndicatorsModel : GLib.Object
-    {
-        private static IndicatorsModel _global_model = null;
-
-        public static IndicatorsModel get_default ()
-        {
-            if (_global_model == null)
-            {
-                _global_model = new IndicatorsFileModel ();
-            }
-
-            return _global_model;
-        }
-
-        public static void set_default (IndicatorsModel model)
-        {
-            _global_model = model;
-        }
-
-        public abstract Gee.ArrayList<Indicator.Object> get_indicators ();
-        public abstract string get_indicator_name (Indicator.Object o);
-    }
-
-    public class IndicatorsFileModel : IndicatorsModel
-    {
-        public static HashMap<string, int> indicator_order = null;
-        public HashMap<GLib.Object, string> indicator_map;
-        public ArrayList<GLib.Object> indicator_list;
-
-        public IndicatorsFileModel ()
-        {
-            string skip_list;
-
-            //indicator_map = new Gee.HashMap<Indicator.Object, string> ();
-            indicator_map = new Gee.HashMap<GLib.Object, string> ();
-            indicator_order = new Gee.HashMap<string, int> ();
-            indicator_list = new Gee.ArrayList<GLib.Object> ();
-
-            /* Static order of indicators. We always want the session indicators
-             * to be on the far right end of the panel. That is why it the session
-             * indicator is the last one set in indicator_order.
-             */
-            //indicator_order.set ("libappmenu.so", 7);
-            indicator_order.set ("libapplication.so", 6);
-            indicator_order.set ("libnetworkmenu.so", 5);
-            indicator_order.set ("libsoundmenu.so", 4);
-            indicator_order.set ("libmessaging.so", 3);
-            indicator_order.set ("libpower.so", 2);
-            indicator_order.set ("libsession.so", 1);
-
-            /* Indicators we don't want to load */
-            skip_list = Environment.get_variable ("UNITY_PANEL_INDICATORS_SKIP");
-            if (skip_list == null)
-                skip_list = "";
-
-            if (skip_list == "all")
-            {
-                log("wingpanel", LogLevelFlags.LEVEL_WARNING, "Skipping all indicator loading");
-                return;
-            }
-
-            /* Don't load appmenu-gtk */
-            skip_list += ",libappmenu.so";
-
-            /* We need to look for icons in an specific location */
-            //Gtk.IconTheme.get_default ().append_search_path (Wingpanel.Config.INDICATORICONSDIR);
-
-            File dir = File.new_for_path (Build.INDICATORDIR);
-            try
-            {
-                var e = dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME, 0, null);
-                ArrayList<string> sos = new ArrayList<string> ();
-
-                FileInfo file_info;
-                while ((file_info = e.next_file (null)) != null)
-                {
-                    string leaf = file_info.get_name ();
-
-                    if (leaf in skip_list)
-                    {
-                        log("wingpanel", LogLevelFlags.LEVEL_WARNING, "SKIP LOADING: %s", leaf);
-                        continue;
-                    }
-
-                    if (leaf.has_suffix (".so"))
-                    {
-                        sos.add (leaf);
-                        log("wingpanel", LogLevelFlags.LEVEL_DEBUG, "LOADING: %s", leaf);
-                    }
-                }
-
-                /* Order the so's before we load them */
-                sos.sort ((CompareFunc)indicator_sort_func);
-
-                foreach (string leaf in sos)
-                    this.load_indicator (dir.get_path() + "/" + leaf, leaf);
-            }
-            catch (Error error)
-            {
-                log("wingpanel",LogLevelFlags.LEVEL_ERROR, "Unable to read indicators: %s\n", error.message);
-            }
-        }
-
-        public static int indicator_sort_func (string a, string b)
-        {
-            return indicator_order[a] - indicator_order[b];
-        }
-
-        private void load_indicator (string filename, string leaf)
-        {
-            Indicator.Object o;
-
-            o = new Indicator.Object.from_file (filename);
-
-            if (o is Indicator.Object)
-            {
-                this.indicator_map[o] = leaf;
-                indicator_list.add (o);
-            }
-            else
-            {
-                log("wingpanel", LogLevelFlags.LEVEL_ERROR, "Unable to load %s\n", filename);
-            }
-        }
-
-        //public override ArrayList<Indicator.Object> get_indicators ()
-        public override ArrayList<GLib.Object> get_indicators ()
-        {
-            return indicator_list;
-        }
-
-        public override string get_indicator_name (Indicator.Object o)
-        {
-            return indicator_map[o];
-        }
-    }
-}
-

=== removed file 'src/wingpanel-object-entry.vala'
--- src/wingpanel-object-entry.vala	2011-07-08 20:09:06 +0000
+++ src/wingpanel-object-entry.vala	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-using Gdk;
-
-namespace  Wingpanel 
-{
-    public class IndicatorObjectEntry: Gtk.MenuItem
-    {
-        Indicator.Object object;
-
-        public IndicatorObjectEntry (Indicator.ObjectEntry entry, Indicator.Object iobject)
-        {
-            object = iobject;
-            
-            IndicatorsModel model = IndicatorsModel.get_default ();
-
-            Gtk.HBox box = new Gtk.HBox (false, 0);
-            box.spacing = 2;
-            if (entry.image != null && entry.image is Gtk.Image) {
-                GLib.log("wingpanel", LogLevelFlags.LEVEL_DEBUG, "Indicator: %s has attribute image", model.get_indicator_name(object));
-                box.pack_start (entry.image, false, false, 0);
-            }
-            if (entry.label != null && entry.label is Gtk.Label) {
-                GLib.log("wingpanel", LogLevelFlags.LEVEL_DEBUG, "Indicator: %s has attribute label", model.get_indicator_name(object));
-                box.pack_end (entry.label, false, false, 0);
-            }
-            add (box);
-            box.show ();
-            if (entry.menu != null)
-                set_submenu (entry.menu);
-            show ();
-            scroll_event.connect (on_scroll_event);
-        }
-
-        private bool on_scroll_event (EventScroll event)
-        {
-            Signal.emit_by_name (object, "scroll", 1, event.direction);
-            
-            return false;
-        }
-
-    }
-}

=== removed file 'src/wingpanel-panel.vala'
--- src/wingpanel-panel.vala	2011-07-20 10:32:13 +0000
+++ src/wingpanel-panel.vala	1970-01-01 00:00:00 +0000
@@ -1,413 +0,0 @@
-using Gtk;
-using Gdk;
-using Cairo;
-
-namespace Wingpanel {
-
-    public enum Struts {
-        LEFT,
-        RIGHT,
-        TOP,
-        BOTTOM,
-        LEFT_START,
-        LEFT_END,
-        RIGHT_START,
-        RIGHT_END,
-        TOP_START,
-        TOP_END,
-        BOTTOM_START,
-        BOTTOM_END,
-        N_VALUES
-    }
-
-    public static WingpanelApp app;
-
-    public class WingpanelApp : Gtk.Application {
-
-        public Gtk.CssProvider provider = null;
-        public bool use_gtk_theme = false;
-        private GLib.Settings settings;
-        private Panel panel;
-
-        construct {
-            application_id = "org.elementary.Wingpanel";
-            flags = GLib.ApplicationFlags.IS_SERVICE;
-        }
-
-        protected override void startup () 
-        {
-            log("wingpanel", LogLevelFlags.LEVEL_INFO, "Welcome to Wingpanel");
-            log("wingpanel", LogLevelFlags.LEVEL_INFO, "Version: %s", "0.1");
-            log("wingpanel", LogLevelFlags.LEVEL_INFO, "Report any issues/bugs you might find to lp:wingpanel");
-            settings = new GLib.Settings ("desktop.pantheon.wingpanel");
-            use_gtk_theme = settings.get_boolean ("use-gtk-theme");
-            settings.changed.connect (key_changed);
-
-            define_style ();
-            panel = new Panel ();
-            panel.show_all ();
-
-            Gtk.main ();
-        }
-
-        private void define_style () {
-            provider = new Gtk.CssProvider();
-            
-            try {
-                if (!use_gtk_theme)
-                    provider.load_from_path(Build.PKGDATADIR + "/wingpanel-hud-style.css");
-                else
-                    provider.load_from_path(Build.PKGDATADIR + "/gtk-theme-style.css");
-            } catch (Error e) {
-                stderr.printf("Error: %s\n", e.message);
-            }
-            Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(),
-                                                     provider, 600);
-        }
-
-        private void key_changed (string key) {
-            if (key == "use-gtk-theme") {
-                use_gtk_theme = settings.get_boolean ("use-gtk-theme");
-                if (provider != null)
-                    Gtk.StyleContext.remove_provider_for_screen (Gdk.Screen.get_default(), provider);
-                define_style ();
-                panel.update_use_gtk_theme ();
-            }
-        }
-
-    }
-
-    //public class Panel : ElementaryWidgets.CompositedWindow {
-    public class Panel : Gtk.Window {
-
-        public const int panel_height = 24;
-        public const int stroke_width = 4;
-        public uint animation_timer = 0;
-        public int panel_displacement = (-1) * panel_height;
-
-        private Gtk.HBox container;
-        private Gtk.HBox left_wrapper;
-        private Gtk.HBox right_wrapper;
-        private Gtk.MenuBar menubar;
-        private Gtk.MenuBar clock;
-
-        private Gtk.StyleContext ctx_apps_label;
-        private Gtk.StyleContext ctx_clock;
-        private Gtk.StyleContext ctx_menubar;
-
-        private IndicatorsModel model;
-        private Gee.HashMap<string, Gtk.MenuItem> menuhash;
-        private Cardapio.dbus cardapio;
-        private Gdk.Rectangle monitor_dimensions;
-
-        public Panel () {
-            //Window properties
-            skip_taskbar_hint = true; // no taskbar
-            decorated = false; // no window decoration
-            app_paintable = true;
-
-            if (!app.use_gtk_theme)
-                set_visual (screen.get_rgba_visual());
-            //set_opacity (0.8);
-
-            panel_resize (false);
-            /* update the panel size on screen size or monitor changes */
-            screen.size_changed.connect (() => {
-                panel_resize (true);
-            });
-            screen.monitors_changed.connect (() => {
-                panel_resize (true);
-            });
-
-            menuhash = new Gee.HashMap<string, Gtk.MenuItem> ();
-
-            // Window properties
-            set_type_hint (Gdk.WindowTypeHint.DOCK);
-            move (0, panel_displacement);
-
-            // HBox container
-            container = new Gtk.HBox(false, 0);
-            left_wrapper = new Gtk.HBox(false, 0);
-            right_wrapper = new Gtk.HBox(false, 0);
-            resizable = false;
-
-            add (container);
-
-            // Add default widgets
-            add_defaults();
-
-            model = IndicatorsModel.get_default ();
-            var indicators_list = model.get_indicators ();
-
-            foreach (Indicator.Object o in indicators_list)
-            {
-                 load_indicator(o);
-            }
-
-            // Signals
-            realize.connect (() => { set_struts();});
-            destroy.connect (Gtk.main_quit);
-
-            //Check if Carpadio is installed
-            try {
-                cardapio = Bus.get_proxy_sync (BusType.SESSION, "org.varal.Cardapio",
-                                                  "/org/varal/Cardapio");
-            //} catch (IOError e) {
-            //    GLib.log("wingpanel", LogLevelFlags.LEVEL_DEBUG, "Error connecting to Cardapio!");
-            } catch {
-                GLib.log("wingpanel", LogLevelFlags.LEVEL_CRITICAL, "Cardapio not installed!");
-            }
-        }
-
-        private void panel_resize (bool redraw) 
-        {
-                screen.get_monitor_geometry(this.screen.get_primary_monitor(), out this.monitor_dimensions);
-                set_size_request (monitor_dimensions.width, -1);
-                set_struts ();
-                if (redraw)
-                    queue_draw ();
-        }
-
-        private void create_entry (Indicator.ObjectEntry entry,
-                                   Indicator.Object      object)
-        {
-            //delete_entry(entry, object);
-            Gtk.MenuItem menuitem = new IndicatorObjectEntry (entry, object);
-            menuhash[model.get_indicator_name(object)] = menuitem;
-
-            if (model.get_indicator_name(object) == "libdatetime.so") { // load libdatetime in center
-                /* Bold clock label font */
-                var font = new Pango.FontDescription ();
-                font.set_weight (Pango.Weight.HEAVY);
-                var box = menuitem.get_child () as Gtk.Container;
-                box.get_children ().nth_data (0).modify_font (font);
-                clock.prepend(menuitem);
-           } else {
-               menubar.prepend (menuitem);
-           }
-        }
-
-        private void delete_entry(Indicator.ObjectEntry entry,
-                                   Indicator.Object     object)
-        {
-            if (menuhash.has_key(model.get_indicator_name(object)))
-            {
-                var menuitem = menuhash[model.get_indicator_name(object)];
-                this.menubar.remove (menuitem);
-            }
-        }
-
-        private void on_entry_added (Indicator.Object      object,
-                                     Indicator.ObjectEntry entry)
-        {
-            create_entry (entry, object);
-        }
-
-        private void on_entry_removed(Indicator.Object      object,
-                                      Indicator.ObjectEntry entry)
-        {
-            delete_entry(entry, object);
-        }
-
-        public void load_indicator(Indicator.Object indicator) {
-            if (indicator is Indicator.Object)
-            {
-                indicator.entry_added.connect (this.on_entry_added);
-                indicator.entry_removed.connect (this.on_entry_removed);
-                indicator.ref();
-
-                unowned GLib.List<Indicator.ObjectEntry> list = indicator.get_entries ();
-
-                for (int i = 0; i < list.length (); i++)
-                {
-                    unowned Indicator.ObjectEntry entry = (Indicator.ObjectEntry) list.nth_data (i);
-                    this.create_entry (entry, indicator);
-                }
-                stdout.printf("Loaded indicator %s\n", model.get_indicator_name(indicator));
-            } else {
-                //Log.printf(Log.Level.ERROR, "Unable to load %s\n", model.get_indicator_name(indicator));
-            }
-        }
-
-        private void add_defaults() {
-            // Apps button
-            var apps = new Gtk.EventBox();
-            apps.set_visible_window (false);
-            var apps_label = new Gtk.Label("<span weight='heavy' size='9500'>Apps</span>");
-            
-            ctx_apps_label = apps_label.get_style_context ();
-            ctx_apps_label.add_class ("gnome-panel-menu-bar");
-            /* FIXME:Ambiance got a missing context (missing text color), 
-               we have to fallback to menubar */
-            ctx_apps_label.add_class ("menubar");
-            if (app.use_gtk_theme)
-                ctx_apps_label.add_class ("gnome-panel-menu-bar");
-            ctx_apps_label.add_class ("wingpanel-menubar");
-
-            apps_label.use_markup = true;
-            apps.add(apps_label);
-            apps.button_press_event.connect(launch_launcher);
-
-            left_wrapper.pack_start(apps, false, true, 5);
-            container.pack_start(left_wrapper);
-
-            clock = new Gtk.MenuBar ();
-            clock.can_focus = true;
-            clock.border_width = 0;
-            ctx_clock = clock.get_style_context ();
-            if (app.use_gtk_theme)
-                ctx_clock.add_class ("gnome-panel-menu-bar");
-            ctx_clock.add_class ("wingpanel-menubar");
-            container.pack_start(clock, false, false, 0);
-
-            // Menubar for storing indicators
-            menubar = new Gtk.MenuBar ();
-            menubar.can_focus = true;
-            menubar.border_width = 0;
-            //menubar.set_name ("indicator-applet-menubar");
-            ctx_menubar = menubar.get_style_context ();
-            if (app.use_gtk_theme)
-               ctx_menubar.add_class ("gnome-panel-menu-bar");
-            ctx_menubar.add_class ("wingpanel-menubar");
-            
-            get_style_context ().add_class ("wingpanel-menubar");
-
-            right_wrapper.pack_end(menubar, false, false, 0);
-            container.pack_start(right_wrapper);
-            
-            SizeGroup gpr = new SizeGroup(SizeGroupMode.HORIZONTAL);
-            gpr.add_widget (left_wrapper);
-            gpr.add_widget (right_wrapper);
-
-        }
-
-        public void update_use_gtk_theme () {
-            /* Add and remove class styles */
-            if (!app.use_gtk_theme) {
-                set_visual (screen.get_rgba_visual());
-                ctx_apps_label.remove_class ("gnome-panel-menu-bar");
-                ctx_clock.remove_class ("gnome-panel-menu-bar");
-                ctx_menubar.remove_class ("gnome-panel-menu-bar");
-            } else {
-                set_visual (null);
-                ctx_apps_label.add_class ("gnome-panel-menu-bar");
-                ctx_clock.add_class ("gnome-panel-menu-bar");
-                ctx_menubar.add_class ("gnome-panel-menu-bar");
-            }
-                
-            /* make sure to remove the style before readding it, order matter */
-            ctx_apps_label.remove_class ("wingpanel-menubar");
-            ctx_clock.remove_class ("wingpanel-menubar");
-            ctx_menubar.remove_class ("wingpanel-menubar");
-            
-            ctx_apps_label.add_class ("wingpanel-menubar");
-            ctx_clock.add_class ("wingpanel-menubar");
-            ctx_menubar.add_class ("wingpanel-menubar");
-                
-            clock.reset_style ();
-            menubar.reset_style ();
-        }
-
-        private bool launch_launcher(Gtk.Widget widget, Gdk.EventButton event) {
-            GLib.log("wingpanel",LogLevelFlags.LEVEL_DEBUG, "Starting launcher!");
-            try {
-                string? slingshot = Environment.find_program_in_path("slingshot");
-                if (slingshot != null)
-                    GLib.Process.spawn_command_line_async(slingshot);
-                else
-                    cardapio.show_hide_near_point(0,0,false,false);
-            } catch {
-                try {
-                    Gtk.show_uri(get_screen (), "file:///usr/share/applications",
-                                 Gtk.get_current_event_time ());
-                } catch {
-                    GLib.critical("Failed to open launcher");
-                }
-            }
-            return true;
-        }
-
-        protected override bool draw (Context cr) {
-
-            Gtk.Allocation size;
-            get_allocation(out size);
-
-            // Draw shadow
-            /*var linear_shadow = new Cairo.Pattern.linear(size.x, size.y + this.panel_height, size.x, size.y + this.panel_height + this.stroke_width);
-            linear_shadow.add_color_stop_rgba(0.0,  0.0, 0.0, 0.0, 0.4);
-            linear_shadow.add_color_stop_rgba(0.8,  0.0, 0.0, 0.0, 0.1);
-            linear_shadow.add_color_stop_rgba(1.0,  0.0, 0.0, 0.0, 0.0);
-            context.set_source(linear_shadow);
-            context.fill();*/
-
-            if (app.use_gtk_theme) {
-                int border = 0;
-                var ctx = menubar.get_style_context ();
-                render_background (ctx, cr,
-                                   size.x - border, size.y - border, 
-                                   size.width + 2 * border, size.height + 2 * border);
-            }
-
-            // Slide in
-            if (animation_timer == 0) {
-                animation_timer = GLib.Timeout.add (250/panel_height, () => {
-                    if (panel_displacement >= 0 ) {
-                           return false;
-                    } else {
-                        panel_displacement += 1;
-                        move(0, panel_displacement);
-                        return true;
-                    }
-                });
-            }
-            propagate_draw (container, cr);
-
-            return true;
-        }
-
-        private void set_struts () {
-            if (!get_realized ()) {
-                return;
-            }
-
-            int x, y;
-            this.get_position (out x, out y);
-
-            // since uchar is 8 bits in vala but the struts are 32 bits
-            // we have to allocate 4 times as much and do bit-masking
-            ulong[] struts = new ulong [Struts.N_VALUES];
-
-            struts [Struts.TOP] = this.panel_height;
-            struts [Struts.TOP_START] = monitor_dimensions.x;
-            struts [Struts.TOP_END] = monitor_dimensions.x + monitor_dimensions.width - 1;
-
-            var first_struts = new ulong [Struts.BOTTOM + 1];
-            for (var i = 0; i < first_struts.length; i++)
-                first_struts [i] = struts [i];
-
-            //amtest
-            //var display = x11_drawable_get_xdisplay (get_window ());
-            unowned X.Display display = X11Display.get_xdisplay (get_window ().get_display ());
-            //var xid = x11_drawable_get_xid (get_window ());
-            var xid = X11Window.get_xid (get_window ());
-            //var xid = get_xid (get_window ());
-
-            display.change_property (xid, display.intern_atom ("_NET_WM_STRUT_PARTIAL", false), X.XA_CARDINAL,
-                                  32, X.PropMode.Replace, (uchar[])struts, struts.length);
-            display.change_property (xid, display.intern_atom ("_NET_WM_STRUT", false), X.XA_CARDINAL,
-                                  32, X.PropMode.Replace, (uchar[])first_struts, first_struts.length);
-        }
-    }
-
-    static int main (string[] args) {
-        GLib.Log.set_default_handler(Log.log_handler);
-
-        Gtk.init (ref args);
-
-        app = new WingpanelApp ();
-        app.run (args);
-
-        return 0;
-    }
-}
-