Merge lp:~elementary-apps/pantheon-files/granite into lp:~elementary-apps/pantheon-files/trunk

[Mario Guerriero]

[Victor Martinez (victored)]

Mario, thank you for your work :)

I found a couple of trivial issues:

1) Configuring the project fails. Line 126 in src/CMakeList.txt should be:
   > target_link_libraries (pantheon-files marlincore marlinwidgets ${UNITY_LIBRARIES})
   instead of:
   > target_link_libraries (marlin marlincore marlinwidgets ${UNITY_LIBRARIES})

2) I would have preferred not to do any kind of re-branding in this branch, but you've kept it minimal, so I don't see any problem with it :)

3) Why is it still using VarkaWidgetsCollapsiblePaned? We have the same widget in Granite. If Varka's version has some kind of improvement, we should merge it in Granite first.

4) Let's ditch the Varka.Widgets namespace. The fact that a widget is not actually in Granite shouldn't prevent us from using its namespace. If we use Granite.Widgets there would be no complications if the file is ever moved from pantheon-files to granite.

review: Needs Fixing

[lp:~elementary-apps/pantheon-files/granite]

805. By Victor Martinez on 2012-05-12

Merge Mario's work, resolve conflict in data/desktop.in, and fix minor cmake issue.

806. By Victor Martinez on 2012-05-12

Use Granite.Widgets.CollapsiblePaned

807. By Victor Martinez on 2012-05-12

Use Granite.Widgets instead of Varka.Widgets

[Victor Martinez (victored)]

Just fixed the remaining issues. Let's do the re-branding on a separate branch :)

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-11-06 17:28:37 +0000
+++ CMakeLists.txt	2012-05-12 02:06:17 +0000
@@ -14,7 +14,7 @@
 configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 add_subdirectory (src)
 add_subdirectory (data)
-add_subdirectory (marlin-daemon)
+add_subdirectory (pantheon-files-daemon)
 add_subdirectory (icons)
 add_subdirectory (libcore)
 add_subdirectory (libwidgets)

=== modified file 'data/marlin.desktop.in'
--- data/marlin.desktop.in	2012-05-07 19:06:49 +0000
+++ data/marlin.desktop.in	2012-05-12 02:06:17 +0000
@@ -1,56 +1,5 @@
 [Desktop Entry]
-Name=Marlin File Manager
-Name[ar]=مدير الملفات سونار
-Name[ast]=Alministrador de ficheros Marlin
-Name[be]=Кіраўнік файлаў Marlin
-Name[bn]=Marlin ফাইল ম্যানেজার
-Name[ca]=Gestor de fitxers Marlin
-Name[cs]=Správce souborů Marlin
-Name[da]=Marlin-filhåndtering
-Name[de]=Dateimanager Marlin
-Name[dz]=ཐུ་ནར་ཡིག་སྣོད་འཛིན་སྐྱོང་པ།
-Name[el]=Διαχειριστής αρχείων Marlin
-Name[en_GB]=Marlin
-Name[eo]=Marlin dosier-administrilo
-Name[es]=Administrador de archivos Marlin
-Name[et]=Failihaldur Marlin
-Name[eu]=Marlin fitxategi kudeatzailea
-Name[fi]=Marlin-tiedostonhallinta
-Name[fr]=Gestionnaire de Fichiers Marlin
-Name[gl]=Xestor de ficheiros Marlin
-Name[he]=מנהל הקבצים ‎Marlin
-Name[hr]=Marlin Upravitelj Datoteka
-Name[hu]=Marlin fájlkezelő
-Name[id]=Manajer Berkas Marlin
-Name[it]=Il gestore di file Marlin
-Name[ja]=Marlin ファイルマネージャ
-Name[kk]=Marlin файлдар басқарушысы
-Name[ko]=Marlin 화일 관리자
-Name[ku]=Marlin, Gerinendeyê Pelan
-Name[lt]=Marlin failų tvarkyklė
-Name[lv]=Marlin failu pārvaldnieks
-Name[mk]=Marlin менаџер на датотеки
-Name[nb]=Marlin Filbehandler
-Name[nl]=Marlin bestandsbeheerder
-Name[nn]=Marlin filhandsaming
-Name[pa]=ਥੰਨਰ ਫਾਇਲ ਮੈਨੇਜਰ
-Name[pl]=Menedżer plików Marlin
-Name[pt]=Gestor de Ficheiros Marlin
-Name[pt_BR]=Gerenciador de arquivos Marlin
-Name[ro]=Managerul de fișiere Marlin
-Name[ru]=Файловый менеджер Marlin
-Name[si]=Marlin ගොනු කළමණාකරු
-Name[sk]=Správca súborov Marlin
-Name[sq]=Përgjegjësi i Kartelave Marlin
-Name[sv]=Filhanteraren Marlin
-Name[tr]=Marlin Dosya Yöneticisi
-Name[ug]=Marlin ھۆججەت باشقۇرغۇ
-Name[uk]=Файловий менеджер Marlin
-Name[ur]=تھنر فائل منیجر
-Name[ur_PK]=تھنر فائل منیجر
-Name[vi]=Trình quản lý tập tin Marlin
-Name[zh_CN]=Marlin 文件管理器
-Name[zh_TW]=Marlin 檔案管理員
+Name=Files
 Comment=Browse your files
 Comment[ar]=تصفح ملفات النظام بمدير الملفات
 Comment[ast]=Restolar el sistema de ficheros col alministrador de ficheros
@@ -151,8 +100,8 @@
 GenericName[ur_PK]=فائل منیجر
 GenericName[zh_CN]=文件管理器
 GenericName[zh_TW]=檔案管理員
-Exec=marlin %U
-Icon=marlin
+Exec=pantheon-files %U
+Icon=system-file-manager
 Terminal=false
 StartupNotify=true
 Type=Application
@@ -163,12 +112,12 @@
 
 [TabNew Shortcut Group]
 Name=New _Tab
-Exec=marlin -t
+Exec=pantheon-files -t
 TargetEnvironment=Unity
 
 [WindowNew Shortcut Group]
 Name=New _Window
-Exec=marlin
+Exec=pantheon-files
 TargetEnvironment=Unity
 
 [Root Shortcut Group]

=== modified file 'libcore/CMakeLists.txt'
--- libcore/CMakeLists.txt	2012-02-07 19:56:47 +0000
+++ libcore/CMakeLists.txt	2012-05-12 02:06:17 +0000
@@ -23,6 +23,7 @@
     Plugin.vala
     marlincore-C.vapi
 PACKAGES
+    granite
     gtk+-3.0
     gio-2.0
     gee-1.0
@@ -184,4 +185,4 @@
 )
 add_test(core marlincore_tests)
 target_link_libraries(marlincore_tests marlincore ${DEPS_LIBRARIES})
-#target_link_libraries(marlincore ${DEPS_LIBRARIES})
+target_link_libraries(marlincore ${DEPS_LIBRARIES})

=== modified file 'libcore/marlincore.deps'
--- libcore/marlincore.deps	2011-11-16 18:52:37 +0000
+++ libcore/marlincore.deps	2012-05-12 02:06:17 +0000
@@ -1,1 +1,2 @@
 marlincore-C
+gee-1.0
\ No newline at end of file

=== modified file 'libwidgets/CMakeLists.txt'
--- libwidgets/CMakeLists.txt	2011-12-26 10:39:24 +0000
+++ libwidgets/CMakeLists.txt	2012-05-12 02:06:17 +0000
@@ -66,3 +66,4 @@
                        )
 install (TARGETS ${PKGNAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/)
 add_subdirectory(tests)
+target_link_libraries(marlinwidgets ${DEPS_LIBRARIES})
\ No newline at end of file

=== removed directory 'marlin-daemon'
=== removed file 'marlin-daemon/CMakeLists.txt'
--- marlin-daemon/CMakeLists.txt	2011-08-08 16:57:40 +0000
+++ marlin-daemon/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-# Vala stuff
-
-find_package(Vala REQUIRED)
-include(ValaVersion)
-ensure_vala_version("0.11.3" MINIMUM)
-include(ValaPrecompile)
-# pkgconfig, real C code
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libcore/)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/../libwidgets/)
-find_package(PkgConfig)
-pkg_check_modules(DEPS REQUIRED
-	glib-2.0>=2.29.0
-	gthread-2.0
-	gio-2.0
-	pango>=1.1.2
-	gtk+-3.0>=3.0.3
-	gail-3.0
-	gee-1.0
-	sqlite3
-    dbus-glib-1
-	libnotify>=0.7.2)
-set(CFLAGS
-	${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
-)
-set(LIB_PATHS
-	${DEPS_LIBRARY_DIRS}
-)
-link_directories(${LIB_PATHS})
-add_definitions(${CFLAGS}
-    "-DGETTEXT_PACKAGE=\"marlin\""
-     -O2
-    )
-vala_precompile(VALA_C
-    marlind-tagging.vala
-PACKAGES
-    gtk+-3.0
-    gio-2.0
-    gee-1.0
-    sqlite3
-OPTIONS
-    --thread)
-add_executable(marlin-daemon
-    ${VALA_C} )
-target_link_libraries(marlin-daemon ${DEPS_LIBRARIES})
-install(TARGETS marlin-daemon RUNTIME DESTINATION bin)

=== removed file 'marlin-daemon/client.vala'
--- marlin-daemon/client.vala	2010-11-24 18:15:11 +0000
+++ marlin-daemon/client.vala	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-
-[DBus (name = "org.elementary.marlin.db")]
-interface Demo : Object {
-    public abstract bool   	showTable	(string table) 	throws IOError;
-    public abstract int 	getColor 	(string uri) 	throws IOError;
-    public abstract bool 	setColor 	(string uri, int color) 	throws IOError;
-    public abstract bool 	deleteEntry	(string uri)	throws IOError;
-    public abstract bool	clearDB		()				throws IOError;
-}
-
-void main () {
-    try {
-        Demo demo = Bus.get_proxy_sync (BusType.SESSION, "org.elementary.marlin.db",
-                                        "/org/elementary/marlin/db");
-
-        //demo.setColor("file:///home/jordi", 3);
-        //demo.isFileInDB("file:///home/jordi");
-        //print("\n\nColor for file is %i\n",   demo.getColor("file:///home/jordi"));
-        //demo.deleteEntry("file:///home/jordi");
-        //demo.clearDB();
-        demo.showTable ("tags");
-
-        //demo.clearDB();
-
-    } catch (IOError e) {
-        stderr.printf ("%s\n", e.message);
-    }
-}
-

=== removed file 'marlin-daemon/marlind-tagging.vala'
--- marlin-daemon/marlind-tagging.vala	2012-01-02 15:55:50 +0000
+++ marlin-daemon/marlind-tagging.vala	1970-01-01 00:00:00 +0000
@@ -1,380 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
-/*
- * Copyright (C) 2010 Jordi Puigdellívol <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * version 3.0 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3.0 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Authors: Jordi Puigdellívol <[e-mail]>
- *          ammonkey <[e-mail]>
- *
-
- Marlin Tagging system
-
-//Dependences
-libsqlite3-dev
-
-//To create de table
-create table tags (uri TEXT, color INT, tags TEXT);
-
-//To compile this sample
-valac --pkg sqlite3 -o sqlitesample SqliteSample.vala
-valac --pkg sqlite3 --pkg gio-2.0 -o sqlitesample marlin_tagging.vala && ./sqlitesample
-
-*/
-
-using GLib;
-using Sqlite;
-
-[DBus (name = "org.elementary.marlin.db")]
-public class MarlinTags : Object {
-
-    protected static Sqlite.Database db;
-
-    public MarlinTags(){
-        openMarlinDB();
-    }
-
-    protected static void fatal(string op, int res) {
-        error("%s: [%d] %s", op, res, db.errmsg());
-    }
-
-    private static int show_table_callback (int n_columns, string[] values, string[] column_names)
-    {
-        for (int i = 0; i < n_columns; i++) {
-            stdout.printf ("%s = %s\n", column_names[i], values[i]);
-        }
-        stdout.printf ("\n");
-
-        return 0;
-    }
-
-    public bool openMarlinDB()
-    {
-        File home_dir = File.new_for_path (Environment.get_home_dir ());
-        File data_dir = home_dir.get_child(".config").get_child("marlin");
-
-        try {
-            if (!data_dir.query_exists(null))
-                data_dir.make_directory_with_parents(null);
-        } catch (Error err) {
-            stderr.printf("Unable to create data directory %s: %s", data_dir.get_path(), err.message);
-        }
-
-        string marlin_db_path = data_dir.get_child("marlin.db").get_path();
-        //The database must exists, add here the full path
-        print("Database path: %s \n", marlin_db_path);
-        openDB(marlin_db_path);
-
-        return true;
-    }
-
-    private bool openDB(string dbpath){
-        int rc = Sqlite.Database.open_v2(dbpath, out db, Sqlite.OPEN_READWRITE | Sqlite.OPEN_CREATE, null);
-
-        if (rc != Sqlite.OK) {
-            stderr.printf ("Can't open database: %d, %s\n", rc, db.errmsg ());
-            return false;
-        }
-
-        // disable synchronized commits for performance reasons ... this is not vital
-        rc = db.exec("PRAGMA synchronous=OFF");
-        if (rc != Sqlite.OK)
-            stdout.printf("Unable to disable synchronous mode %d, %s\n", rc, db.errmsg ());
-
-        Sqlite.Statement stmt;
-        int res = db.prepare_v2("CREATE TABLE IF NOT EXISTS tags ("
-                                + "id INTEGER PRIMARY KEY, "
-                                + "uri TEXT UNIQUE NOT NULL, "
-                                + "color INTEGER DEFAULT 0, "
-                                + "tags TEXT NULL, "
-                                + "content_type TEXT, "
-                                + "modified_time INTEGER DEFAULT 0, "
-                                + "dir TEXT "
-                                + ")", -1, out stmt);
-        assert(res == Sqlite.OK);
-        res = stmt.step();
-        if (res != Sqlite.DONE)
-            fatal("create tags table", res);
-
-        /* TODO check result of the last sql command */
-        upgrade_database ();
-
-        return true;
-    }
-
-#if 0
-    public async bool record_uri (string raw_uri, string content_type, int modified_time) {
-        var uri = escape(raw_uri);
-
-        var sql = "INSERT OR REPLACE INTO tags (uri,content_type,modified_time) VALUES ('"+uri+"','"+content_type+"',"+modified_time.to_string()+");\n";	
-        //var c = "INSERT OR IGNORE INTO tags (uri,content_type,modified_time) VALUES ('"+uri+"','"+content_type+"',"+modified_time.to_string()+");\n";	
-
-        int rc = db.exec (sql, null, null);
-        if (rc != Sqlite.OK) { 
-            stderr.printf ("[record_uri: SQL error]  %d, %s\n", rc, db.errmsg ());
-            return false;
-        }
-        //stdout.printf("[Consult]: %s\n",c);
-
-        return true;		
-    }
-#endif
-
-    public async bool record_uris (Variant[] locations, string directory) {
-        string sql = "";
-        foreach (var location_variant in locations) {
-            VariantIter iter = location_variant.iterator();
-
-            var uri = iter.next_value ().get_string ();
-            var content_type = iter.next_value ().get_string ();
-            var modified_time = iter.next_value ().get_string ();
-            var color = iter.next_value ().get_string ();
-            sql += "INSERT OR REPLACE INTO tags (uri, content_type, color, modified_time, dir) VALUES ('%s', '%s', %s, %s, '%s');\n".printf (uri, content_type, color, modified_time, directory);
-        }
-
-        int rc = db.exec (sql, null, null);
-        if (rc != Sqlite.OK) { 
-            stderr.printf ("[record_uri: SQL error]  %d, %s\n", rc, db.errmsg ());
-            return false;
-        }
-        //stdout.printf("[Consult]: %s\n",sql);
-
-        return true;		
-    }
-
-    private string escape(string input){
-        return input.replace("'", "''");
-    }
-
-    public async Variant get_uri_infos (string raw_uri)
-    {
-        Idle.add (get_uri_infos.callback);
-        yield;
-        var uri = escape (raw_uri);
-        Statement stmt;
-
-        var vb = new VariantBuilder (new VariantType ("(as)"));
-        int rc = db.prepare_v2 ("select modified_time, content_type, color from tags where uri='%s'".printf (uri),
-                                -1, out stmt);
-        assert (rc == Sqlite.OK); 
-        rc = stmt.step();
-
-        vb.open (new VariantType ("as"));
-
-        switch (rc) {
-        case Sqlite.DONE:
-            break;
-        case Sqlite.ROW:
-            vb.add ("s", stmt.column_text (0));
-            var content_type = stmt.column_text (1);
-            vb.add ("s", (content_type != null) ? content_type : "");
-            vb.add ("s", stmt.column_text (2));
-            break;
-        default:
-            printerr ("[get_uri_infos]: Error: %d, %s\n", rc, db.errmsg ());
-            break;
-        }
-
-        vb.close ();
-        return vb.end ();
-    }
-
-#if 0
-    public async int getColor(string raw_uri)
-    {
-        Idle.add (getColor.callback);
-        yield;
-        var uri = escape(raw_uri);
-        string c = "select color from tags where uri='" + uri + "'";
-        Statement stmt;
-        int rc = 0;
-        int col, cols;
-        string txt = "0";
-
-        if ((rc = db.prepare_v2 (c, -1, out stmt, null)) == 1) {
-            printerr ("[getColor]: SQL error: %d, %s\n", rc, db.errmsg ());
-            return -1;
-        }
-        cols = stmt.column_count();
-        do {
-            rc = stmt.step();
-            switch (rc) {
-            case Sqlite.DONE:
-                break;
-            case Sqlite.ROW:
-                for (col = 0; col < cols; col++) {
-                    txt = stmt.column_text(col);
-                    //print ("%s = %s\n", stmt.column_name (col), txt);
-                }
-                break;
-            default:
-                printerr ("[getColor]: Error: %d, %s\n", rc, db.errmsg ());
-                break;
-            }
-        } while (rc == Sqlite.ROW);
-        //stdout.printf("[getColor]: %s\n", txt);
-
-        int ret = int.parse(txt);
-        /* It appears that a db error return -1, we got to check the value just in case */
-        if(ret == -1){
-            ret = 0;
-        }
-
-        return ret;
-    }
-#endif
-
-    public async bool deleteEntry(string uri)
-    {
-        Idle.add (deleteEntry.callback);
-        yield;
-        string c = "delete from tags where uri='" + uri + "'";
-        int   rc = db.exec (c, null, null);
-
-        if (rc != Sqlite.OK) { 
-            stderr.printf ("[deleteEntry: SQL error]  %d, %s\n", rc, db.errmsg ());
-            return false;
-        }
-
-        return true;		
-    }
-
-    public bool showTable(string table){
-        stdout.printf("showTable\n");
-        string consult = "select * from " + table;
-        int rc = db.exec (consult, show_table_callback, null);
-
-        if (rc != Sqlite.OK) { 
-            stderr.printf ("[showTable: SQL error]: %d, %s\n", rc, db.errmsg ());
-            return false;
-        }
-
-        return true;
-    }
-
-    public bool clearDB(){
-        string c = "delete from tags"; 
-        int   rc = db.exec (c, null, null);
-
-        if (rc != Sqlite.OK) { 
-            stderr.printf ("[clearDB: SQL error]  %d, %s\n", rc, db.errmsg ());
-            return false;
-        }
-
-        return true;	
-    }
-
-    private bool has_column(string table_name, string column_name) {
-        Sqlite.Statement stmt;
-        int res = db.prepare_v2("PRAGMA table_info(%s)".printf(table_name), -1, out stmt);
-        assert(res == Sqlite.OK);
-        
-        for (;;) {
-            res = stmt.step();
-            if (res == Sqlite.DONE) {
-                break;
-            } else if (res != Sqlite.ROW) {
-                fatal("has_column %s".printf(table_name), res);
-                
-                break;
-            } else {
-                string column = stmt.column_text(1);
-                if (column != null && column == column_name)
-                    return true;
-            }
-        }
-        
-        return false;
-    }
-
-    private bool add_column(string table_name, string column_name, string column_constraints) {
-        Sqlite.Statement stmt;
-        int res = db.prepare_v2("ALTER TABLE %s ADD COLUMN %s %s".printf(table_name, column_name,
-            column_constraints), -1, out stmt);
-        assert(res == Sqlite.OK);
-        
-        res = stmt.step();
-        if (res != Sqlite.DONE) {
-            critical("Unable to add column %s %s %s: (%d) %s", table_name, column_name, column_constraints,
-                res, db.errmsg());
-            
-            return false;
-        }
-        
-        return true;
-    }
-
-    private void upgrade_database () {
-
-        // version 2
-
-        if (!has_column("tags", "content_type")) {
-            message("upgrade_database: adding content_type column to tags");
-            if (!add_column("tags", "content_type", "TEXT"))
-                warning ("UPGRADE_ERROR");
-        }
-        if (!has_column("tags", "modified_time")) {
-            message("upgrade_database: adding modified_time column to tags");
-            if (!add_column("tags", "modified_time", "INTEGER DEFAULT 0"))
-                warning ("UPGRADE_ERROR");
-        }
-        if (!has_column("tags", "dir")) {
-            message("upgrade_database: adding dir column to tags");
-            if (!add_column("tags", "dir", "TEXT"))
-                warning ("UPGRADE_ERROR");
-        }
-    }
-
-}
-
-/* =============== Main ==================== */
-/*void main (string[] args) {
-
-  MarlinTags t = new MarlinTags();
-
-  t.openMarlinDB();
-
-  t.setColor("file:///home/jordi"	,MARLIN_RED);
-  t.setColor("file:///home/dev"	,MARLIN_YELLOW);
-
-//t.deleteEntry(File.new_for_path ("/home/dev"));	//When deleting files
-//t.deleteEntry("/home/documents");
-
-//t.clearDB();
-t.showTable("tags");
-
-
-// DBUS Things
-print("\n\nColor for file is %i\n", 
-t.getColor("file:///home/jordi"));
-}*/
-
-
-void on_bus_aquired (DBusConnection conn) {
-    try {
-        conn.register_object ("/org/elementary/marlin/db", new MarlinTags ());
-    } catch (IOError e) {
-        error ("Could not register service");
-    }
-}
-
-void main () {
-    Bus.own_name (BusType.SESSION, "org.elementary.marlin.db", BusNameOwnerFlags.NONE,
-                  on_bus_aquired,
-                  () => {},
-                  () => error ("Could not aquire name"));
-
-    new MainLoop ().run ();
-}
-

=== removed file 'marlin-daemon/miner.vala'
--- marlin-daemon/miner.vala	2012-01-02 15:55:50 +0000
+++ marlin-daemon/miner.vala	1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
-[DBus (name = "org.elementary.marlin.db")]
-interface Tags : Object {
-    public abstract bool   	showTable	(string table) 	throws IOError;
-    public abstract bool 	record_uris	(Variant[] entries, string directory) 	throws IOError;
-    /*public abstract bool 	deleteEntry	(string uri)	throws IOError;
-      public abstract bool	clearDB		()				throws IOError;*/
-}
-
-public class Miner : Object {
-
-    public signal void done_loading ();
-
-    public File location;
-    public Cancellable cancellable;
-
-    private Tags tags;
-    private List<File> ufiles = null;
-    private List<File> ufiles_hidden = null;
-
-    public class Miner (File directory) 
-    {
-        location = directory;
-        cancellable = new Cancellable ();
-
-        try {
-            tags = Bus.get_proxy_sync (BusType.SESSION, "org.elementary.marlin.db",
-                                       "/org/elementary/marlin/db");
-        } catch (IOError e) {
-            stderr.printf ("%s\n", e.message);
-        }
-        done_loading.connect (process_unknown_files);
-    }
-
-    private Variant add_entry (string uri, string content_type, int modified_time)
-    {
-        //var vb = new VariantBuilder (new VariantType ("as"));
-
-        char* ptr_arr[4];
-        ptr_arr[0] = uri;
-        ptr_arr[1] = content_type;
-        ptr_arr[2] = modified_time.to_string ();
-        ptr_arr[3] = "0"; /* color */
-        return new Variant.strv ((string[]) ptr_arr);
-
-        /*vb.add ("s", uri);
-        vb.add ("s", content_type);
-        vb.add ("s", modified_time.to_string ());
-
-        return vb.end ();*/
-    }
-
-    private void process_unknown_files ()
-    {
-        warning ("process_unknown_files");
-        //HashTable<string,string>[] entries = null;
-        Variant[] entries = null;
-
-        try {
-            foreach (var file in ufiles) {
-                var info = file.query_info (gio_full_attrs, 0, cancellable);
-                //message ("%s : %s", info.get_name (), info.get_content_type ());
-                /*tags.record_uri (file.get_uri (), 
-                                 info.get_content_type (),
-                                 (int) info.get_attribute_uint64 (FILE_ATTRIBUTE_TIME_MODIFIED));*/
-                entries += add_entry (file.get_uri (), 
-                                      info.get_content_type (),
-                                      (int) info.get_attribute_uint64 (FILE_ATTRIBUTE_TIME_MODIFIED));
-            }
-
-            tags.record_uris (entries, location.get_uri ());
-        } catch (Error err) {
-            warning ("%s", err.message);
-        }
-        loop.quit ();
-    }
-
-    private string gio_attrs = "standard::name,standard::type,standard::is-hidden,standard::is-backup,standard::fast-content-type,time::modified";
-    private string gio_full_attrs = "standard::name,standard::type,standard::is-hidden,standard::is-backup,standard::content-type,time::modified";
-
-    public async void process_directory ()
-    {
-        try {
-            var enumerator = yield location.enumerate_children_async (gio_attrs, 0, 0, cancellable);
-            while (true) {
-                var files = yield enumerator.next_files_async (1024, 0, cancellable);
-                if (files == null)
-                    break;
-
-                foreach (var f in files)
-                {
-                    //unowned string name = f.get_name ();
-                    /*if (f.get_file_type () == FileType.REGULAR && name.has_suffix (".desktop")
-                      && !filenames_cache.contains (name))*/
-                    //yield load_eaction_file (directory.get_child (name));
-                    var ftype = f.get_attribute_string (FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
-                    if (ftype == "application/octet-stream") {
-                        //message ("%s", name);
-                        if (f.get_is_hidden () || f.get_is_backup ())
-                            ufiles_hidden.prepend (location.get_child (f.get_name()));
-                        else
-                            ufiles.prepend (location.get_child (f.get_name()));
-                    }
-                }
-            }
-        } catch (Error err) {
-            warning ("%s", err.message);
-        }
-        done_loading ();
-    }
-}
-
-MainLoop loop;
-
-public static int main () {
-    //Miner miner = new Miner (File.new_for_path ("/home/kitkat"));
-    Miner miner = new Miner (File.new_for_path ("/usr/bin"));
-    miner.process_directory ();
-
-    loop = new MainLoop ();
-    loop.run ();
-
-    return 0;
-}
-

=== added directory 'pantheon-files-daemon'
=== added file 'pantheon-files-daemon/CMakeLists.txt'
--- pantheon-files-daemon/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ pantheon-files-daemon/CMakeLists.txt	2012-05-12 02:06:17 +0000
@@ -0,0 +1,49 @@
+# Vala stuff
+
+find_package(Vala REQUIRED)
+include(ValaVersion)
+ensure_vala_version("0.11.3" MINIMUM)
+include(ValaPrecompile)
+# pkgconfig, real C code
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libcore/)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../libwidgets/)
+find_package(PkgConfig)
+pkg_check_modules(DEPS REQUIRED
+	glib-2.0>=2.29.0
+	gthread-2.0
+	gio-2.0
+	pango>=1.1.2
+	gtk+-3.0>=3.0.3
+	gail-3.0
+	gee-1.0
+	sqlite3
+    dbus-glib-1
+	libnotify>=0.7.2)
+set(CFLAGS
+	${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
+)
+set(LIB_PATHS
+	${DEPS_LIBRARY_DIRS}
+)
+link_directories(${LIB_PATHS})
+add_definitions(${CFLAGS}
+    "-DGETTEXT_PACKAGE=\"pantheon-files\""
+     -O2
+    )
+vala_precompile(VALA_C
+    marlind-tagging.vala
+PACKAGES
+    gtk+-3.0
+    gio-2.0
+    gee-1.0
+    sqlite3
+OPTIONS
+    --thread)
+add_executable(pantheon-files-daemon
+    ${VALA_C} )
+target_link_libraries(pantheon-files-daemon ${DEPS_LIBRARIES})
+install(TARGETS pantheon-files-daemon RUNTIME DESTINATION bin)

=== added file 'pantheon-files-daemon/client.vala'
--- pantheon-files-daemon/client.vala	1970-01-01 00:00:00 +0000
+++ pantheon-files-daemon/client.vala	2012-05-12 02:06:17 +0000
@@ -0,0 +1,29 @@
+
+[DBus (name = "org.elementary.marlin.db")]
+interface Demo : Object {
+    public abstract bool   	showTable	(string table) 	throws IOError;
+    public abstract int 	getColor 	(string uri) 	throws IOError;
+    public abstract bool 	setColor 	(string uri, int color) 	throws IOError;
+    public abstract bool 	deleteEntry	(string uri)	throws IOError;
+    public abstract bool	clearDB		()				throws IOError;
+}
+
+void main () {
+    try {
+        Demo demo = Bus.get_proxy_sync (BusType.SESSION, "org.elementary.marlin.db",
+                                        "/org/elementary/marlin/db");
+
+        //demo.setColor("file:///home/jordi", 3);
+        //demo.isFileInDB("file:///home/jordi");
+        //print("\n\nColor for file is %i\n",   demo.getColor("file:///home/jordi"));
+        //demo.deleteEntry("file:///home/jordi");
+        //demo.clearDB();
+        demo.showTable ("tags");
+
+        //demo.clearDB();
+
+    } catch (IOError e) {
+        stderr.printf ("%s\n", e.message);
+    }
+}
+

=== added file 'pantheon-files-daemon/marlind-tagging.vala'
--- pantheon-files-daemon/marlind-tagging.vala	1970-01-01 00:00:00 +0000
+++ pantheon-files-daemon/marlind-tagging.vala	2012-05-12 02:06:17 +0000
@@ -0,0 +1,380 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * Copyright (C) 2010 Jordi Puigdellívol <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * version 3.0 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3.0 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Jordi Puigdellívol <[e-mail]>
+ *          ammonkey <[e-mail]>
+ *
+
+ Marlin Tagging system
+
+//Dependences
+libsqlite3-dev
+
+//To create de table
+create table tags (uri TEXT, color INT, tags TEXT);
+
+//To compile this sample
+valac --pkg sqlite3 -o sqlitesample SqliteSample.vala
+valac --pkg sqlite3 --pkg gio-2.0 -o sqlitesample marlin_tagging.vala && ./sqlitesample
+
+*/
+
+using GLib;
+using Sqlite;
+
+[DBus (name = "org.elementary.marlin.db")]
+public class MarlinTags : Object {
+
+    protected static Sqlite.Database db;
+
+    public MarlinTags(){
+        openMarlinDB();
+    }
+
+    protected static void fatal(string op, int res) {
+        error("%s: [%d] %s", op, res, db.errmsg());
+    }
+
+    private static int show_table_callback (int n_columns, string[] values, string[] column_names)
+    {
+        for (int i = 0; i < n_columns; i++) {
+            stdout.printf ("%s = %s\n", column_names[i], values[i]);
+        }
+        stdout.printf ("\n");
+
+        return 0;
+    }
+
+    public bool openMarlinDB()
+    {
+        File home_dir = File.new_for_path (Environment.get_home_dir ());
+        File data_dir = home_dir.get_child(".config").get_child("marlin");
+
+        try {
+            if (!data_dir.query_exists(null))
+                data_dir.make_directory_with_parents(null);
+        } catch (Error err) {
+            stderr.printf("Unable to create data directory %s: %s", data_dir.get_path(), err.message);
+        }
+
+        string marlin_db_path = data_dir.get_child("marlin.db").get_path();
+        //The database must exists, add here the full path
+        print("Database path: %s \n", marlin_db_path);
+        openDB(marlin_db_path);
+
+        return true;
+    }
+
+    private bool openDB(string dbpath){
+        int rc = Sqlite.Database.open_v2(dbpath, out db, Sqlite.OPEN_READWRITE | Sqlite.OPEN_CREATE, null);
+
+        if (rc != Sqlite.OK) {
+            stderr.printf ("Can't open database: %d, %s\n", rc, db.errmsg ());
+            return false;
+        }
+
+        // disable synchronized commits for performance reasons ... this is not vital
+        rc = db.exec("PRAGMA synchronous=OFF");
+        if (rc != Sqlite.OK)
+            stdout.printf("Unable to disable synchronous mode %d, %s\n", rc, db.errmsg ());
+
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2("CREATE TABLE IF NOT EXISTS tags ("
+                                + "id INTEGER PRIMARY KEY, "
+                                + "uri TEXT UNIQUE NOT NULL, "
+                                + "color INTEGER DEFAULT 0, "
+                                + "tags TEXT NULL, "
+                                + "content_type TEXT, "
+                                + "modified_time INTEGER DEFAULT 0, "
+                                + "dir TEXT "
+                                + ")", -1, out stmt);
+        assert(res == Sqlite.OK);
+        res = stmt.step();
+        if (res != Sqlite.DONE)
+            fatal("create tags table", res);
+
+        /* TODO check result of the last sql command */
+        upgrade_database ();
+
+        return true;
+    }
+
+#if 0
+    public async bool record_uri (string raw_uri, string content_type, int modified_time) {
+        var uri = escape(raw_uri);
+
+        var sql = "INSERT OR REPLACE INTO tags (uri,content_type,modified_time) VALUES ('"+uri+"','"+content_type+"',"+modified_time.to_string()+");\n";	
+        //var c = "INSERT OR IGNORE INTO tags (uri,content_type,modified_time) VALUES ('"+uri+"','"+content_type+"',"+modified_time.to_string()+");\n";	
+
+        int rc = db.exec (sql, null, null);
+        if (rc != Sqlite.OK) { 
+            stderr.printf ("[record_uri: SQL error]  %d, %s\n", rc, db.errmsg ());
+            return false;
+        }
+        //stdout.printf("[Consult]: %s\n",c);
+
+        return true;		
+    }
+#endif
+
+    public async bool record_uris (Variant[] locations, string directory) {
+        string sql = "";
+        foreach (var location_variant in locations) {
+            VariantIter iter = location_variant.iterator();
+
+            var uri = iter.next_value ().get_string ();
+            var content_type = iter.next_value ().get_string ();
+            var modified_time = iter.next_value ().get_string ();
+            var color = iter.next_value ().get_string ();
+            sql += "INSERT OR REPLACE INTO tags (uri, content_type, color, modified_time, dir) VALUES ('%s', '%s', %s, %s, '%s');\n".printf (uri, content_type, color, modified_time, directory);
+        }
+
+        int rc = db.exec (sql, null, null);
+        if (rc != Sqlite.OK) { 
+            stderr.printf ("[record_uri: SQL error]  %d, %s\n", rc, db.errmsg ());
+            return false;
+        }
+        //stdout.printf("[Consult]: %s\n",sql);
+
+        return true;		
+    }
+
+    private string escape(string input){
+        return input.replace("'", "''");
+    }
+
+    public async Variant get_uri_infos (string raw_uri)
+    {
+        Idle.add (get_uri_infos.callback);
+        yield;
+        var uri = escape (raw_uri);
+        Statement stmt;
+
+        var vb = new VariantBuilder (new VariantType ("(as)"));
+        int rc = db.prepare_v2 ("select modified_time, content_type, color from tags where uri='%s'".printf (uri),
+                                -1, out stmt);
+        assert (rc == Sqlite.OK); 
+        rc = stmt.step();
+
+        vb.open (new VariantType ("as"));
+
+        switch (rc) {
+        case Sqlite.DONE:
+            break;
+        case Sqlite.ROW:
+            vb.add ("s", stmt.column_text (0));
+            var content_type = stmt.column_text (1);
+            vb.add ("s", (content_type != null) ? content_type : "");
+            vb.add ("s", stmt.column_text (2));
+            break;
+        default:
+            printerr ("[get_uri_infos]: Error: %d, %s\n", rc, db.errmsg ());
+            break;
+        }
+
+        vb.close ();
+        return vb.end ();
+    }
+
+#if 0
+    public async int getColor(string raw_uri)
+    {
+        Idle.add (getColor.callback);
+        yield;
+        var uri = escape(raw_uri);
+        string c = "select color from tags where uri='" + uri + "'";
+        Statement stmt;
+        int rc = 0;
+        int col, cols;
+        string txt = "0";
+
+        if ((rc = db.prepare_v2 (c, -1, out stmt, null)) == 1) {
+            printerr ("[getColor]: SQL error: %d, %s\n", rc, db.errmsg ());
+            return -1;
+        }
+        cols = stmt.column_count();
+        do {
+            rc = stmt.step();
+            switch (rc) {
+            case Sqlite.DONE:
+                break;
+            case Sqlite.ROW:
+                for (col = 0; col < cols; col++) {
+                    txt = stmt.column_text(col);
+                    //print ("%s = %s\n", stmt.column_name (col), txt);
+                }
+                break;
+            default:
+                printerr ("[getColor]: Error: %d, %s\n", rc, db.errmsg ());
+                break;
+            }
+        } while (rc == Sqlite.ROW);
+        //stdout.printf("[getColor]: %s\n", txt);
+
+        int ret = int.parse(txt);
+        /* It appears that a db error return -1, we got to check the value just in case */
+        if(ret == -1){
+            ret = 0;
+        }
+
+        return ret;
+    }
+#endif
+
+    public async bool deleteEntry(string uri)
+    {
+        Idle.add (deleteEntry.callback);
+        yield;
+        string c = "delete from tags where uri='" + uri + "'";
+        int   rc = db.exec (c, null, null);
+
+        if (rc != Sqlite.OK) { 
+            stderr.printf ("[deleteEntry: SQL error]  %d, %s\n", rc, db.errmsg ());
+            return false;
+        }
+
+        return true;		
+    }
+
+    public bool showTable(string table){
+        stdout.printf("showTable\n");
+        string consult = "select * from " + table;
+        int rc = db.exec (consult, show_table_callback, null);
+
+        if (rc != Sqlite.OK) { 
+            stderr.printf ("[showTable: SQL error]: %d, %s\n", rc, db.errmsg ());
+            return false;
+        }
+
+        return true;
+    }
+
+    public bool clearDB(){
+        string c = "delete from tags"; 
+        int   rc = db.exec (c, null, null);
+
+        if (rc != Sqlite.OK) { 
+            stderr.printf ("[clearDB: SQL error]  %d, %s\n", rc, db.errmsg ());
+            return false;
+        }
+
+        return true;	
+    }
+
+    private bool has_column(string table_name, string column_name) {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2("PRAGMA table_info(%s)".printf(table_name), -1, out stmt);
+        assert(res == Sqlite.OK);
+        
+        for (;;) {
+            res = stmt.step();
+            if (res == Sqlite.DONE) {
+                break;
+            } else if (res != Sqlite.ROW) {
+                fatal("has_column %s".printf(table_name), res);
+                
+                break;
+            } else {
+                string column = stmt.column_text(1);
+                if (column != null && column == column_name)
+                    return true;
+            }
+        }
+        
+        return false;
+    }
+
+    private bool add_column(string table_name, string column_name, string column_constraints) {
+        Sqlite.Statement stmt;
+        int res = db.prepare_v2("ALTER TABLE %s ADD COLUMN %s %s".printf(table_name, column_name,
+            column_constraints), -1, out stmt);
+        assert(res == Sqlite.OK);
+        
+        res = stmt.step();
+        if (res != Sqlite.DONE) {
+            critical("Unable to add column %s %s %s: (%d) %s", table_name, column_name, column_constraints,
+                res, db.errmsg());
+            
+            return false;
+        }
+        
+        return true;
+    }
+
+    private void upgrade_database () {
+
+        // version 2
+
+        if (!has_column("tags", "content_type")) {
+            message("upgrade_database: adding content_type column to tags");
+            if (!add_column("tags", "content_type", "TEXT"))
+                warning ("UPGRADE_ERROR");
+        }
+        if (!has_column("tags", "modified_time")) {
+            message("upgrade_database: adding modified_time column to tags");
+            if (!add_column("tags", "modified_time", "INTEGER DEFAULT 0"))
+                warning ("UPGRADE_ERROR");
+        }
+        if (!has_column("tags", "dir")) {
+            message("upgrade_database: adding dir column to tags");
+            if (!add_column("tags", "dir", "TEXT"))
+                warning ("UPGRADE_ERROR");
+        }
+    }
+
+}
+
+/* =============== Main ==================== */
+/*void main (string[] args) {
+
+  MarlinTags t = new MarlinTags();
+
+  t.openMarlinDB();
+
+  t.setColor("file:///home/jordi"	,MARLIN_RED);
+  t.setColor("file:///home/dev"	,MARLIN_YELLOW);
+
+//t.deleteEntry(File.new_for_path ("/home/dev"));	//When deleting files
+//t.deleteEntry("/home/documents");
+
+//t.clearDB();
+t.showTable("tags");
+
+
+// DBUS Things
+print("\n\nColor for file is %i\n", 
+t.getColor("file:///home/jordi"));
+}*/
+
+
+void on_bus_aquired (DBusConnection conn) {
+    try {
+        conn.register_object ("/org/elementary/marlin/db", new MarlinTags ());
+    } catch (IOError e) {
+        error ("Could not register service");
+    }
+}
+
+void main () {
+    Bus.own_name (BusType.SESSION, "org.elementary.marlin.db", BusNameOwnerFlags.NONE,
+                  on_bus_aquired,
+                  () => {},
+                  () => error ("Could not aquire name"));
+
+    new MainLoop ().run ();
+}
+

=== added file 'pantheon-files-daemon/miner.vala'
--- pantheon-files-daemon/miner.vala	1970-01-01 00:00:00 +0000
+++ pantheon-files-daemon/miner.vala	2012-05-12 02:06:17 +0000
@@ -0,0 +1,124 @@
+[DBus (name = "org.elementary.marlin.db")]
+interface Tags : Object {
+    public abstract bool   	showTable	(string table) 	throws IOError;
+    public abstract bool 	record_uris	(Variant[] entries, string directory) 	throws IOError;
+    /*public abstract bool 	deleteEntry	(string uri)	throws IOError;
+      public abstract bool	clearDB		()				throws IOError;*/
+}
+
+public class Miner : Object {
+
+    public signal void done_loading ();
+
+    public File location;
+    public Cancellable cancellable;
+
+    private Tags tags;
+    private List<File> ufiles = null;
+    private List<File> ufiles_hidden = null;
+
+    public class Miner (File directory) 
+    {
+        location = directory;
+        cancellable = new Cancellable ();
+
+        try {
+            tags = Bus.get_proxy_sync (BusType.SESSION, "org.elementary.marlin.db",
+                                       "/org/elementary/marlin/db");
+        } catch (IOError e) {
+            stderr.printf ("%s\n", e.message);
+        }
+        done_loading.connect (process_unknown_files);
+    }
+
+    private Variant add_entry (string uri, string content_type, int modified_time)
+    {
+        //var vb = new VariantBuilder (new VariantType ("as"));
+
+        char* ptr_arr[4];
+        ptr_arr[0] = uri;
+        ptr_arr[1] = content_type;
+        ptr_arr[2] = modified_time.to_string ();
+        ptr_arr[3] = "0"; /* color */
+        return new Variant.strv ((string[]) ptr_arr);
+
+        /*vb.add ("s", uri);
+        vb.add ("s", content_type);
+        vb.add ("s", modified_time.to_string ());
+
+        return vb.end ();*/
+    }
+
+    private void process_unknown_files ()
+    {
+        warning ("process_unknown_files");
+        //HashTable<string,string>[] entries = null;
+        Variant[] entries = null;
+
+        try {
+            foreach (var file in ufiles) {
+                var info = file.query_info (gio_full_attrs, 0, cancellable);
+                //message ("%s : %s", info.get_name (), info.get_content_type ());
+                /*tags.record_uri (file.get_uri (), 
+                                 info.get_content_type (),
+                                 (int) info.get_attribute_uint64 (FILE_ATTRIBUTE_TIME_MODIFIED));*/
+                entries += add_entry (file.get_uri (), 
+                                      info.get_content_type (),
+                                      (int) info.get_attribute_uint64 (FILE_ATTRIBUTE_TIME_MODIFIED));
+            }
+
+            tags.record_uris (entries, location.get_uri ());
+        } catch (Error err) {
+            warning ("%s", err.message);
+        }
+        loop.quit ();
+    }
+
+    private string gio_attrs = "standard::name,standard::type,standard::is-hidden,standard::is-backup,standard::fast-content-type,time::modified";
+    private string gio_full_attrs = "standard::name,standard::type,standard::is-hidden,standard::is-backup,standard::content-type,time::modified";
+
+    public async void process_directory ()
+    {
+        try {
+            var enumerator = yield location.enumerate_children_async (gio_attrs, 0, 0, cancellable);
+            while (true) {
+                var files = yield enumerator.next_files_async (1024, 0, cancellable);
+                if (files == null)
+                    break;
+
+                foreach (var f in files)
+                {
+                    //unowned string name = f.get_name ();
+                    /*if (f.get_file_type () == FileType.REGULAR && name.has_suffix (".desktop")
+                      && !filenames_cache.contains (name))*/
+                    //yield load_eaction_file (directory.get_child (name));
+                    var ftype = f.get_attribute_string (FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
+                    if (ftype == "application/octet-stream") {
+                        //message ("%s", name);
+                        if (f.get_is_hidden () || f.get_is_backup ())
+                            ufiles_hidden.prepend (location.get_child (f.get_name()));
+                        else
+                            ufiles.prepend (location.get_child (f.get_name()));
+                    }
+                }
+            }
+        } catch (Error err) {
+            warning ("%s", err.message);
+        }
+        done_loading ();
+    }
+}
+
+MainLoop loop;
+
+public static int main () {
+    //Miner miner = new Miner (File.new_for_path ("/home/kitkat"));
+    Miner miner = new Miner (File.new_for_path ("/usr/bin"));
+    miner.process_directory ();
+
+    loop = new MainLoop ();
+    loop.run ();
+
+    return 0;
+}
+

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2011-08-11 10:22:14 +0000
+++ po/CMakeLists.txt	2012-05-12 02:06:17 +0000
@@ -1,6 +1,6 @@
 include(Translations)
-add_translations_directory("marlin")
-add_translations_catalog("marlin"
+add_translations_directory("pantheon-files")
+add_translations_catalog("pantheon-files"
     ../src/View
     ../src
     ../libcore

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-01-10 15:11:58 +0000
+++ src/CMakeLists.txt	2012-05-12 02:06:17 +0000
@@ -15,7 +15,8 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../libwidgets/)
 find_package(PkgConfig)
 pkg_check_modules(DEPS REQUIRED
-    varka>=0.1
+    varka
+    granite
 	glib-2.0>=2.29.0
 	gthread-2.0
 	gio-2.0
@@ -36,9 +37,9 @@
 
 link_directories(${LIB_PATHS})
 add_definitions(${CFLAGS}
-    "-DGETTEXT_PACKAGE=\"marlin\""
-    "-DPIXMAP_DIR=\"${CMAKE_INSTALL_PREFIX}/share/pixmaps/marlin/\""
-    "-DUI_DIR=\"${CMAKE_INSTALL_PREFIX}/share/marlin/ui/\""
+    "-DGETTEXT_PACKAGE=\"pantheon-files\""
+    "-DPIXMAP_DIR=\"${CMAKE_INSTALL_PREFIX}/share/pixmaps/pantheon-files/\""
+    "-DUI_DIR=\"${CMAKE_INSTALL_PREFIX}/share/pantheon-files/ui/\""
      -O2
     )
 vala_precompile(VALA_C
@@ -60,6 +61,9 @@
     View/Chrome/TopMenu.vala
     View/Chrome/ViewSwicher.vala
     View/Chrome/ColorWidget.vala
+    View/Chrome/XsEntry.vala
+    View/Chrome/IconFactory.vala
+    View/Chrome/ImgEventBox.vala
 CUSTOM_VAPIS
     ${CMAKE_CURRENT_BINARY_DIR}/../libwidgets/marlinwidgets.vapi
     marlin.vapi
@@ -68,7 +72,7 @@
     gio-2.0
     posix
     gee-1.0
-    varka
+    granite
     marlincore
     marlincore-C
 GENERATE_HEADER
@@ -77,7 +81,7 @@
     --vapidir=${CMAKE_SOURCE_DIR}/libcore/
     --vapidir=${CMAKE_BINARY_DIR}/libcore/
     --thread)
-add_executable(marlin
+add_executable(pantheon-files
     eel-editable-label.c
     marlin-application.c
     gossip-cell-renderer-expander.c
@@ -110,19 +114,19 @@
     marlin-progress-info-widget.c
     ${VALA_C} )
 
-add_definitions("-DPLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/lib/marlin/plugins/\"")
-target_link_libraries(marlin marlincore marlinwidgets ${DEPS_LIBRARIES})
+add_definitions("-DPLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/lib/pantheon-files/plugins/\"")
+target_link_libraries(pantheon-files marlincore marlinwidgets ${DEPS_LIBRARIES})
 
 OPTION(WITH_UNITY "Add Unity launcher support" ON)
 pkg_check_modules(UNITY unity>=4.0.0)
 
 IF(WITH_UNITY AND UNITY_FOUND)
     include_directories(${UNITY_INCLUDE_DIRS})
-    target_link_libraries (marlin marlincore marlinwidgets ${UNITY_LIBRARIES})
+    target_link_libraries (pantheon-files marlincore marlinwidgets ${UNITY_LIBRARIES})
     add_definitions("-DHAVE_UNITY=1")
 ENDIF(WITH_UNITY AND UNITY_FOUND)
 
-install(TARGETS marlin RUNTIME DESTINATION bin)
-install(FILES marlin-ui.xml DESTINATION share/marlin/ui/)
-install(FILES fm-directory-view-ui.xml fm-icon-view-ui.xml DESTINATION share/marlin/ui/)
+install(TARGETS pantheon-files RUNTIME DESTINATION bin)
+install(FILES pantheon-files-ui.xml DESTINATION share/pantheon-files/ui/)
+install(FILES fm-directory-view-ui.xml fm-icon-view-ui.xml DESTINATION share/pantheon-files/ui/)
 include(Tests)

=== added file 'src/View/Chrome/IconFactory.vala'
--- src/View/Chrome/IconFactory.vala	1970-01-01 00:00:00 +0000
+++ src/View/Chrome/IconFactory.vala	2012-05-12 02:06:17 +0000
@@ -0,0 +1,53 @@
+/*  
+ * Copyright (C) 2011 ammonkey <[e-mail]>
+ * 
+ * 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/>.
+ */ 
+
+namespace Varka {
+
+    public static IconFactory? icon_factory = null;
+
+    public class IconFactory : GLib.Object {
+
+        private Gtk.IconTheme icon_theme;
+
+        public class IconFactory () {
+            icon_theme = Gtk.IconTheme.get_default ();
+        }
+
+        public static IconFactory get_default () {
+            if (icon_factory != null)
+                return icon_factory;
+
+            icon_factory = new IconFactory ();
+            return icon_factory;
+        }
+
+        public Gdk.Pixbuf? load_symbolic_icon (Gtk.StyleContext style, string iconname, int size) {
+            Gdk.Pixbuf px = null;
+
+            ThemedIcon themed_icon = new ThemedIcon.with_default_fallbacks (iconname);
+            Gtk.IconInfo icon_info = icon_theme.lookup_by_gicon ((GLib.Icon) themed_icon, size, Gtk.IconLookupFlags.GENERIC_FALLBACK);
+            try {
+                px = icon_info.load_symbolic_for_context (style);
+            } catch (Error err) {
+                stderr.printf ("Unable to load symbolic icon: %s", err.message);
+            }
+
+            return px;
+        }
+    
+    }
+}

=== added file 'src/View/Chrome/ImgEventBox.vala'
--- src/View/Chrome/ImgEventBox.vala	1970-01-01 00:00:00 +0000
+++ src/View/Chrome/ImgEventBox.vala	2012-05-12 02:06:17 +0000
@@ -0,0 +1,68 @@
+/*  
+ * Copyright (C) 2011 Elementary 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/>.
+ *
+ * Author: ammonkey <[e-mail]>
+ */ 
+
+using Gtk;
+using Gdk;
+using Cairo;
+
+namespace Granite.Widgets {
+
+    public class ImgEventBox : EventBox 
+    {
+        private Pixbuf? pix = null;
+        private int wpix;
+        private int hpix;
+
+        public Orientation orientation { get; set; }
+        
+        public ImgEventBox (Orientation o)
+        {
+            visible_window = false;
+            orientation = o;
+        }
+
+        protected override bool draw (Context cr) {
+            Allocation vba;
+            get_allocation (out vba);
+
+            if (pix != null) { 
+                //cairo_set_source_pixbuf (cr, pix, 0, 0);
+                if (orientation == Orientation.HORIZONTAL)
+                    cairo_set_source_pixbuf (cr, pix, vba.width/2 - wpix/2, 0);
+                else
+                    cairo_set_source_pixbuf (cr, pix, 3, vba.height/2 - hpix/2);
+                cr.paint();
+            }
+            
+            return true;
+        }
+
+        public void set_from_pixbuf (Pixbuf _pix) {
+            pix = _pix;
+            wpix = pix.get_width();
+            hpix = pix.get_height();
+            //message ("evbox set_from_pix %d %d", wpix, hpix);
+            if (orientation == Orientation.HORIZONTAL)
+                set_size_request (-1, hpix);
+            else
+                set_size_request (wpix+6, -1);
+            queue_draw ();
+        }
+    }
+}

=== modified file 'src/View/Chrome/TopMenu.vala'
--- src/View/Chrome/TopMenu.vala	2012-02-14 01:37:01 +0000
+++ src/View/Chrome/TopMenu.vala	2012-05-12 02:06:17 +0000
@@ -28,7 +28,7 @@
         public ViewSwitcher? view_switcher;
         public Gtk.Menu compact_menu;
         public Gtk.Menu toolbar_menu;
-        public Varka.Widgets.AppMenu app_menu;
+        public Granite.Widgets.AppMenu app_menu;
         public LocationBar? location_bar;
         public Window win;
 
@@ -42,7 +42,7 @@
             compact_menu = (Gtk.Menu) win.ui.get_widget("/CompactMenu");
             toolbar_menu = (Gtk.Menu) win.ui.get_widget("/ToolbarMenu");
 
-            app_menu = new Varka.Widgets.AppMenu (compact_menu);
+            app_menu = new Granite.Widgets.AppMenu (compact_menu);
             setup_items();
             show();
             
@@ -119,12 +119,12 @@
                 if (main_action != null)
                 {
                     if (name == "Forward"){
-                        win.button_forward = new Varka.Widgets.ToolButtonWithMenu.from_action(main_action);
+                        win.button_forward = new Granite.Widgets.ToolButtonWithMenu.from_action(main_action);
                         win.button_forward.show_all();
                         insert(win.button_forward, -1);
                     }
                     else if ( name == "Back"){
-                        win.button_back = new Varka.Widgets.ToolButtonWithMenu.from_action(main_action);
+                        win.button_back = new Granite.Widgets.ToolButtonWithMenu.from_action(main_action);
                         win.button_back.show_all();
                         insert(win.button_back, -1);
                     }else{

=== modified file 'src/View/Chrome/ViewSwicher.vala'
--- src/View/Chrome/ViewSwicher.vala	2012-02-07 20:55:31 +0000
+++ src/View/Chrome/ViewSwicher.vala	2012-05-12 02:06:17 +0000
@@ -21,7 +21,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using Gtk;
-using Varka.Widgets;
+using Granite.Widgets;
 using Config;
 
 namespace Marlin.View.Chrome
@@ -53,7 +53,7 @@
 
                 Preferences.settings.set_enum ("default-viewmode", value);
                 //switcher.focus(target);
-                switcher.set_active_widget (target);
+                //switcher.set_active_widget (target);
                 _mode = mode;
             }
             private get{
@@ -75,6 +75,8 @@
             margin = 3;
 
             switcher = new ModeButton ();
+            switcher.set_margin_top (5);
+            switcher.set_margin_bottom (5);
             Varka.IconFactory icon_factory = Varka.IconFactory.get_default ();
             Gtk.StyleContext style = get_style_context ();
 

=== added file 'src/View/Chrome/XsEntry.vala'
--- src/View/Chrome/XsEntry.vala	1970-01-01 00:00:00 +0000
+++ src/View/Chrome/XsEntry.vala	2012-05-12 02:06:17 +0000
@@ -0,0 +1,40 @@
+/*  
+ * Copyright (C) 2011 Elementary 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/>.
+ *
+ * Author: ammonkey <[e-mail]>
+ */ 
+
+using Gtk;
+
+/* Just a workarround Gtk.Entry which got a minimum fixed prefered width 
+With XsEntry we can set the exact width we want */
+public class Granite.Widgets.XsEntry : Entry 
+{
+    public int m_default_with = 25;
+
+    public XsEntry ()
+    {
+        width_request = m_default_with;
+    }
+
+    public override void get_preferred_width (out int minimum_width, out int natural_width)
+    {
+        if (width_request >= m_default_with)
+            minimum_width = natural_width = width_request;
+        else
+            minimum_width = natural_width = m_default_with;
+    }
+}

=== modified file 'src/View/ContextView.vala'
--- src/View/ContextView.vala	2012-01-09 03:13:39 +0000
+++ src/View/ContextView.vala	2012-05-12 02:06:17 +0000
@@ -24,7 +24,8 @@
 using Gdk;
 using Cairo;
 using Gee;
-using Varka.Widgets;
+using Granite.Widgets;
+using Granite.Widgets;
 
 namespace Marlin.View {
 

=== modified file 'src/View/LocationBar.vala'
--- src/View/LocationBar.vala	2012-05-07 19:02:04 +0000
+++ src/View/LocationBar.vala	2012-05-12 02:06:17 +0000
@@ -53,8 +53,8 @@
             set_expand(true);
                 
             //border_width = 0;
-            margin_top = 3;
-            margin_bottom = 3;
+            margin_top = 5;
+            margin_bottom = 5;
             
             add(bread);
         }

=== modified file 'src/View/PropertiesWindow.vala'
--- src/View/PropertiesWindow.vala	2012-05-07 19:16:24 +0000
+++ src/View/PropertiesWindow.vala	2012-05-12 02:06:17 +0000
@@ -20,13 +20,13 @@
 using Gtk;
 using Posix;
 using GLib;
-using Varka.Widgets;
+using Granite.Widgets;
 
 public class Marlin.View.PropertiesWindow : Gtk.Dialog
 {
     private Gee.LinkedList<Pair<string, string>> info;
-    private ImgEventBox evbox;
-    private XsEntry perm_code;
+    private Granite.Widgets.ImgEventBox evbox;
+    private Granite.Widgets.XsEntry perm_code;
     private bool perm_code_should_update = true;
     private Gtk.Label l_perm;
 
@@ -41,7 +41,7 @@
 
     private Gee.Set<string>? mimes;
 
-    private Varka.Widgets.WrapLabel header_title;
+    private Granite.Widgets.WrapLabel header_title;
     private Gtk.Label header_desc;
     private string ftype; /* common type */
 
@@ -235,7 +235,7 @@
         var vvbox = new Box (Gtk.Orientation.VERTICAL, 0);
         content.pack_start(vvbox);
 
-        header_title = new Varka.Widgets.WrapLabel ();
+        header_title = new Granite.Widgets.WrapLabel ();
         if (count > 1)
             header_title.set_markup ("<span weight='semibold' size='large'>" + "%u selected items".printf(count) + "</span>");
         else
@@ -388,7 +388,7 @@
 
         int n = 0;
         foreach(var pair in item_info){
-            var value_label = new Varka.Widgets.WrapLabel(pair.value);
+            var value_label = new Granite.Widgets.WrapLabel(pair.value);
             var key_label = create_label_key (pair.key);
             value_label.set_selectable (true);
             //value_label.set_size_request (150, -1);
@@ -855,7 +855,7 @@
         perm_grid.attach(key_label, 0, 5, 1, 1);
         perm_grid.attach(value_hlabel, 1, 5, 1, 1);
 
-        perm_code = new XsEntry();
+        perm_code = new Granite.Widgets.XsEntry();
         //var perm_code = new Label("705");
         //perm_code.margin_right = 2;
         perm_code.set_text("000");
@@ -1063,7 +1063,7 @@
     }
 
     private void construct_preview_panel (Box box) {
-        evbox = new ImgEventBox(Orientation.HORIZONTAL);
+        evbox = new Granite.Widgets.ImgEventBox(Orientation.HORIZONTAL);
         var pix = goffile.get_icon_pixbuf (256, false, GOF.FileIconFlags.USE_THUMBNAILS);
         evbox.set_from_pixbuf (pix);
 

=== modified file 'src/View/Resources.vala'
--- src/View/Resources.vala	2012-02-18 15:11:11 +0000
+++ src/View/Resources.vala	2012-05-12 02:06:17 +0000
@@ -1,11 +1,11 @@
 namespace Marlin {
-    public const string APP_TITLE = "Marlin";
+    public const string APP_TITLE = "Pantheon Files";
     public const string COPYRIGHT = "2010-2012 Marlin Developers";
     public const string LAUNCHPAD_LABEL = "Website";
-    public const string LAUNCHPAD_URL = "http://launchpad.net/marlin";
-    public const string HELP_URL = "https://answers.launchpad.net/marlin";
-    public const string BUG_URL = "https://bugs.launchpad.net/marlin/+filebug";
-    public const string TRANSLATE_URL = "https://translations.launchpad.net/marlin";
+    public const string LAUNCHPAD_URL = "http://launchpad.net/pantheon-files";
+    public const string HELP_URL = "https://answers.launchpad.net/pantheon-files";
+    public const string BUG_URL = "https://bugs.launchpad.net/pantheon-files/+filebug";
+    public const string TRANSLATE_URL = "https://translations.launchpad.net/pantheon-files";
     public const string COMMENTS = "File Manager";
     
     public const string[] AUTHORS = { 

=== modified file 'src/View/SettingsDialog.vala'
--- src/View/SettingsDialog.vala	2012-05-07 19:03:43 +0000
+++ src/View/SettingsDialog.vala	2012-05-12 02:06:17 +0000
@@ -20,7 +20,7 @@
  *
  */
 
-using Varka.Widgets;
+using Granite.Widgets;
 
 namespace Marlin.View
 {
@@ -33,7 +33,7 @@
             //width_request = 500;
             set_resizable(false);
 
-            var mai_notebook = new Varka.Widgets.StaticNotebook();
+            var mai_notebook = new Granite.Widgets.StaticNotebook();
 
             var first_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 3);
             first_vbox.border_width = 5;

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2012-02-17 19:31:44 +0000
+++ src/View/Window.vala	2012-05-12 02:06:17 +0000
@@ -24,7 +24,6 @@
 using Gdk;
 using Cairo;
 using Marlin.View.Chrome;
-using Varka.Widgets;
 using EelGtk.Window;
 
 namespace Marlin.View {
@@ -38,14 +37,14 @@
         public Marlin.Places.Sidebar sidebar;
 
         public ViewContainer? current_tab;
-        public CollapsiblePaned main_box;
+        public Granite.Widgets.CollapsiblePaned main_box;
         public ContextView? contextview = null;
 
         public Gtk.ActionGroup main_actions;
         public Gtk.AccelGroup accel_group;
 
-        public Varka.Widgets.ToolButtonWithMenu button_forward;
-        public Varka.Widgets.ToolButtonWithMenu button_back;
+        public Granite.Widgets.ToolButtonWithMenu button_forward;
+        public Granite.Widgets.ToolButtonWithMenu button_back;
 
         private const int horizontal_contextplane_max_width = 910;
         private const int horizontal_contextplane_max_height = 380; // after which we will go vertical
@@ -138,21 +137,22 @@
             Preferences.settings.bind("sidebar-icon-size", sidebar, "icon-size", SettingsBindFlags.DEFAULT);
 
             /* Devide main views into sidebars */
-            main_box = new CollapsiblePaned(Orientation.VERTICAL);
+            main_box = new Granite.Widgets.CollapsiblePaned (Orientation.VERTICAL);
             main_box.show();
 
-            var lside_pane = new HCollapsiblePaned();
+            var lside_pane = new Granite.Widgets.CollapsiblePaned (Gtk.Orientation.HORIZONTAL);
+            lside_pane.get_style_context ().add_class ("sidebar-pane-separator");
             lside_pane.show();
 
             lside_pane.pack1(sidebar, false, false);
             lside_pane.pack2(main_box, true, true);
-            lside_pane.collapse_mode = CollapseMode.LEFT;
+            lside_pane.collapse_mode = Granite.CollapseMode.LEFT;
 
             main_box.pack1(tabs, true, true);
 
             ((Gtk.ToggleAction) main_actions.get_action("Show Hide Context Pane")).set_active(Preferences.settings.get_boolean("start-with-contextview"));
 
-            main_box.collapse_mode = CollapseMode.RIGHT;
+            main_box.collapse_mode = Granite.CollapseMode.BOTTOM;
 
             /*/
             /* Pack up all the view
@@ -584,7 +584,7 @@
         }
 
         protected void show_about() {
-            Varka.Widgets.show_about_dialog ((Gtk.Window) this,
+            Granite.Widgets.show_about_dialog ((Gtk.Window) this,
                 "program-name", Marlin.APP_TITLE,
                 "version", Config.VERSION,
                 "comments", Marlin.COMMENTS,
@@ -594,7 +594,7 @@
                 "website-label",  Marlin.LAUNCHPAD_LABEL,
                 "authors", Marlin.AUTHORS,
                 "artists", Marlin.ARTISTS,
-                "logo-icon-name", "marlin",
+                "logo-icon-name", Marlin.ICON_ABOUT_LOGO,
                 "translator-credits",  Marlin.TRANSLATORS,
                 "help", Marlin.HELP_URL,
                 "translate", Marlin.TRANSLATE_URL,

=== modified file 'src/marlin-application.c'
--- src/marlin-application.c	2012-02-07 19:56:47 +0000
+++ src/marlin-application.c	2012-05-12 02:06:17 +0000
@@ -344,6 +344,8 @@
     application->priv =
         G_TYPE_INSTANCE_GET_PRIVATE (application, MARLIN_TYPE_APPLICATION,
                                      MarlinApplicationPriv);
+    /* Some app settings */
+    ((GraniteApplication*) application)->program_name = "Files";
 }
 
 static void
@@ -382,7 +384,7 @@
     //g_debug ("%s %d files", G_STRFUNC, n_files);
 
     if (self->priv->debug)
-        varka_logger_set_DisplayLevel (VARKA_LOG_LEVEL_DEBUG);
+        granite_services_logger_set_DisplayLevel (GRANITE_SERVICES_LOG_LEVEL_DEBUG);
 
     /* Create windows. */
     if (self->priv->open_intab)
@@ -604,15 +606,15 @@
      */
     G_APPLICATION_CLASS (marlin_application_parent_class)->startup (app);
 
-    varka_logger_initialize ("marlin");
-    varka_logger_set_DisplayLevel (VARKA_LOG_LEVEL_INFO);
+    granite_services_logger_initialize ("pantheon-files");
+    granite_services_logger_set_DisplayLevel (GRANITE_SERVICES_LOG_LEVEL_INFO);
 
-    g_message ("Welcome to Marlin");
+    g_message ("Welcome to Pantheon Files");
     g_message ("Version: %s", PACKAGE_VERSION);
-    g_message ("Report any issues/bugs you might find to http://bugs.launchpad.net/marlin");
+    g_message ("Report any issues/bugs you might find to http://bugs.launchpad.net/pantheon-files");
 
     if (self->priv->debug)
-        varka_logger_set_DisplayLevel (VARKA_LOG_LEVEL_DEBUG);
+        granite_services_logger_set_DisplayLevel (GRANITE_SERVICES_LOG_LEVEL_DEBUG);
 
     init_schemas ();
     init_gtk_accels ();

=== modified file 'src/marlin-application.h'
--- src/marlin-application.h	2011-11-25 09:21:06 +0000
+++ src/marlin-application.h	2012-05-12 02:06:17 +0000
@@ -20,6 +20,7 @@
 #ifndef __MARLIN_APPLICATION_H__
 #define __MARLIN_APPLICATION_H__
 
+#include <granite/granite.h>
 #include <gdk/gdk.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
@@ -39,13 +40,13 @@
 typedef struct _MarlinApplicationPriv MarlinApplicationPriv;
 
 typedef struct {
-    GtkApplication parent;
+    GraniteApplication parent;
 
     MarlinApplicationPriv *priv;
 } MarlinApplication;
 
 typedef struct {
-    GtkApplicationClass parent_class;
+    GraniteApplicationClass parent_class;
 } MarlinApplicationClass;
 
 GType marlin_application_get_type (void);

=== removed file 'src/marlin-ui.xml'
--- src/marlin-ui.xml	2012-02-17 19:38:21 +0000
+++ src/marlin-ui.xml	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-<ui>
-<accelerator action="ZoomInAccel"/>
-<accelerator action="ZoomInAccel2"/>
-<accelerator action="ZoomOutAccel"/>
-<accelerator action="Next Tab" />
-<accelerator action="Previous Tab" />
-<menubar name="MenuBar">
-	<menu action="File">
-        <placeholder name="New Items Placeholder">
-            <menuitem name="New Tab" action="New Tab"/>
-	    	<menuitem name="New Window" action="New Window"/>
-        </placeholder>
-		<separator/>
-        <placeholder name="Open Placeholder"/>
-		<separator/>
-		<separator/>
-		<menuitem name="Connect to Server" action="Connect to Server"/>
-		<separator/>
-		<!--<placeholder name="Close Items Placeholder"/>-->
-		<menuitem name="Close" action="Close"/>
-	</menu>
-	<menu name="Edit" action="Edit">
-        <!--<placeholder name="Undostack Actions"/>
-		<separator/>-->
-        <placeholder name="Undostack Actions">
-            <menuitem name="Undo" action="Undo"/>
-            <menuitem name="Redo" action="Redo"/>
-        </placeholder>
-		<separator/>
-		<placeholder name="Clipboard Actions"/>
-		<separator/>
-		<!--<placeholder name="Select Items"/>-->
-        <placeholder name="File Items Placeholder"/>
-		<separator/>
-        <placeholder name="Dangerous File Actions"/>
-		<separator/>
-		<menuitem name="ToolbarEditor" 	  action="ToolbarEditor"/>
-		<menuitem name="MarlinSettings"   action="MarlinSettings"/>
-                <!--<menu action="ColorMenu">-->
-                <!--    <menuitem action="set-color-clear" />
-                    <menuitem action="set-color-butter" />
-                    <menuitem action="set-color-orange" />
-                    <menuitem action="set-color-chocolate" />
-                    <menuitem action="set-color-chameleon" />
-                    <menuitem action="set-color-skyblue" />
-                    <menuitem action="set-color-plum" />
-                    <menuitem action="set-color-red" />
-                    <menuitem action="set-color-lightgray" />
-                    <menuitem action="set-color-darkgray" />-->
-                <!--</menu>-->
-
-		<!--<menuitem name="Preferences" action="Preferences"/>-->
-	</menu>
-	<menu action="View">
-		<!--<menuitem name="Stop" action="Stop"/>-->
-		<menuitem name="Reload" action="Reload"/>
-		<separator/>
-        <!--<menuitem name="Show Hide Toolbar" action="Show Hide Toolbar"/>-->
-	        <menuitem name="Show Hide Context Pane" action="Show Hide Context Pane"/>
-	        <menuitem name="Show Hide Menubar" action="Show Hide Menubar"/>
-            <menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
-            <separator/>
-            <menuitem name="Show Hidden Files" action="Show Hidden Files"/>
-            <menuitem name="Show Desktop Files" action="Show Desktop Files"/>
-		<placeholder name="View Preferences Placeholder"/>
-		<separator/>
-		<placeholder name="View Items Placeholder"/>
-		<separator/>
-		    <placeholder name="Zoom Items Placeholder">
-			    <menuitem name="Zoom In" action="Zoom In"/>
-			    <menuitem name="Zoom Out" action="Zoom Out"/>
-			    <menuitem name="Zoom Normal" action="Zoom Normal"/>
-		    </placeholder>
-        <!--<separator/>
-                <placeholder name="Show Hide Clutter">
-                        <menuitem name="Clutterflow" action="Show Hide Clutter"/>
-                </placeholder>
-                        <menuitem name="Embed Terminal" action="Show Hide Embed Terminal"/>
-		<placeholder name="View Choices">
-		        <separator/>
-			<placeholder name="Extra Viewer"/>
-			<separator name="Before Short List"/>
-			<placeholder name="Short List"/>
-		</placeholder>-->
-            <separator/>
-            <menuitem action="view-as-icons" />
-            <menuitem action="view-as-detailed-list" />
-            <menuitem action="view-as-compact" />
-            <menuitem action="view-as-columns" />
-	</menu>
-	<menu action="Go">
-        <menuitem name="Up" action="Up"/>
-        <menuitem name="Back" action="Back"/>
-	    <menuitem name="Forward"  action="Forward"/>
-	    <separator/>
-       	    <menuitem name="Home" action="Home"/>
-		<!--<menuitem name="Computer" action="Go to Computer"/>-->
-            <menuitem name="Go to Trash" action="Go to Trash"/>
-            <menuitem name="Go to Network" action="Go to Network"/>
-	<!--	<menuitem name="Go to Location" action="Go to Location"/>
-		<menuitem name="Search" action="Search"/>
-		<separator/>
-        <placeholder name="History Placeholder"/>-->
-	</menu>
-    <!--<menu action="Bookmarks">
-	    <menuitem name="Add Bookmark" action="Add Bookmark"/>
-		<menuitem name="Edit Bookmark" action="Edit Bookmarks"/>
-		<separator/>
-		<placeholder name="Bookmarks Placeholder"/>
-    </menu>-->
-	<menu action="Help">
-		<menuitem name="GetHelp" action="GetHelp"/>
-		<menuitem name="Translate" action="Translate"/>
-		<menuitem name="ReportProblem" action="ReportProblem"/>
-		<separator />
-		<menuitem name="About" action="About"/>
-	</menu>
-</menubar>
-<!--<popup name="background">
-	<placeholder name="Before Zoom Items">
-		<placeholder name="New Window Items"/>
-		<placeholder name="New Object Items"/>
-		<separator/>
-	       <placeholder name="Extension Actions"/>
-	</placeholder>
-        <separator/>
-	<placeholder name="Zoom Items">
-		<menuitem name="Zoom Normal" action="Zoom Normal"/>
-	</placeholder>
-        <separator/>
-	<placeholder name="After Zoom Items"/>
-</popup>-->
-
-<popup name="ToolbarMenu" accelerators="false">
-    <menuitem name="Show Hide Context Pane" action="Show Hide Context Pane"/>
-    <menuitem name="Show Hide Menubar" action="Show Hide Menubar"/>
-    <menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
-	<separator/>
-	<menuitem name="ToolbarEditor" action="ToolbarEditor"/>
-</popup>
-
-<popup name="CompactMenu" accelerators="false">
-	<menuitem name="New Tab" action="New Tab"/>
-	<menuitem name="New Window" action="New Window"/>
-	<separator/>
-	<menuitem name="Connect to Server" action="Connect to Server"/>
-	<separator/>
-    <!--
-        <menuitem name="Undo" action="Undo"/>
-        <menuitem name="Redo" action="Redo"/>
-	<separator/>
-        <menuitem name="Connect to Server" action="Connect to Server"/>
-	<separator/>
-	<menuitem name="Reset to Defaults" action="Reset to Defaults"/>-->
-    <menuitem name="Show Hidden Files" action="Show Hidden Files"/>
-	<separator/>
-    <menuitem name="About" action="About"/>
-    <menuitem name="MarlinSettings" action="MarlinSettings"/>
-</popup>
-</ui>

=== added file 'src/pantheon-files-ui.xml'
--- src/pantheon-files-ui.xml	1970-01-01 00:00:00 +0000
+++ src/pantheon-files-ui.xml	2012-05-12 02:06:17 +0000
@@ -0,0 +1,160 @@
+<ui>
+<accelerator action="ZoomInAccel"/>
+<accelerator action="ZoomInAccel2"/>
+<accelerator action="ZoomOutAccel"/>
+<accelerator action="Next Tab" />
+<accelerator action="Previous Tab" />
+<menubar name="MenuBar">
+	<menu action="File">
+        <placeholder name="New Items Placeholder">
+            <menuitem name="New Tab" action="New Tab"/>
+	    	<menuitem name="New Window" action="New Window"/>
+        </placeholder>
+		<separator/>
+        <placeholder name="Open Placeholder"/>
+		<separator/>
+		<separator/>
+		<menuitem name="Connect to Server" action="Connect to Server"/>
+		<separator/>
+		<!--<placeholder name="Close Items Placeholder"/>-->
+		<menuitem name="Close" action="Close"/>
+	</menu>
+	<menu name="Edit" action="Edit">
+        <!--<placeholder name="Undostack Actions"/>
+		<separator/>-->
+        <placeholder name="Undostack Actions">
+            <menuitem name="Undo" action="Undo"/>
+            <menuitem name="Redo" action="Redo"/>
+        </placeholder>
+		<separator/>
+		<placeholder name="Clipboard Actions"/>
+		<separator/>
+		<!--<placeholder name="Select Items"/>-->
+        <placeholder name="File Items Placeholder"/>
+		<separator/>
+        <placeholder name="Dangerous File Actions"/>
+		<separator/>
+		<menuitem name="ToolbarEditor" 	  action="ToolbarEditor"/>
+		<menuitem name="MarlinSettings"   action="MarlinSettings"/>
+                <!--<menu action="ColorMenu">-->
+                <!--    <menuitem action="set-color-clear" />
+                    <menuitem action="set-color-butter" />
+                    <menuitem action="set-color-orange" />
+                    <menuitem action="set-color-chocolate" />
+                    <menuitem action="set-color-chameleon" />
+                    <menuitem action="set-color-skyblue" />
+                    <menuitem action="set-color-plum" />
+                    <menuitem action="set-color-red" />
+                    <menuitem action="set-color-lightgray" />
+                    <menuitem action="set-color-darkgray" />-->
+                <!--</menu>-->
+
+		<!--<menuitem name="Preferences" action="Preferences"/>-->
+	</menu>
+	<menu action="View">
+		<!--<menuitem name="Stop" action="Stop"/>-->
+		<menuitem name="Reload" action="Reload"/>
+		<separator/>
+        <!--<menuitem name="Show Hide Toolbar" action="Show Hide Toolbar"/>-->
+	        <menuitem name="Show Hide Context Pane" action="Show Hide Context Pane"/>
+	        <menuitem name="Show Hide Menubar" action="Show Hide Menubar"/>
+            <menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
+            <separator/>
+            <menuitem name="Show Hidden Files" action="Show Hidden Files"/>
+            <menuitem name="Show Desktop Files" action="Show Desktop Files"/>
+		<placeholder name="View Preferences Placeholder"/>
+		<separator/>
+		<placeholder name="View Items Placeholder"/>
+		<separator/>
+		    <placeholder name="Zoom Items Placeholder">
+			    <menuitem name="Zoom In" action="Zoom In"/>
+			    <menuitem name="Zoom Out" action="Zoom Out"/>
+			    <menuitem name="Zoom Normal" action="Zoom Normal"/>
+		    </placeholder>
+        <!--<separator/>
+                <placeholder name="Show Hide Clutter">
+                        <menuitem name="Clutterflow" action="Show Hide Clutter"/>
+                </placeholder>
+                        <menuitem name="Embed Terminal" action="Show Hide Embed Terminal"/>
+		<placeholder name="View Choices">
+		        <separator/>
+			<placeholder name="Extra Viewer"/>
+			<separator name="Before Short List"/>
+			<placeholder name="Short List"/>
+		</placeholder>-->
+            <separator/>
+            <menuitem action="view-as-icons" />
+            <menuitem action="view-as-detailed-list" />
+            <menuitem action="view-as-compact" />
+            <menuitem action="view-as-columns" />
+	</menu>
+	<menu action="Go">
+        <menuitem name="Up" action="Up"/>
+        <menuitem name="Back" action="Back"/>
+	    <menuitem name="Forward"  action="Forward"/>
+	    <separator/>
+       	    <menuitem name="Home" action="Home"/>
+		<!--<menuitem name="Computer" action="Go to Computer"/>-->
+            <menuitem name="Go to Trash" action="Go to Trash"/>
+            <menuitem name="Go to Network" action="Go to Network"/>
+	<!--	<menuitem name="Go to Location" action="Go to Location"/>
+		<menuitem name="Search" action="Search"/>
+		<separator/>
+        <placeholder name="History Placeholder"/>-->
+	</menu>
+    <!--<menu action="Bookmarks">
+	    <menuitem name="Add Bookmark" action="Add Bookmark"/>
+		<menuitem name="Edit Bookmark" action="Edit Bookmarks"/>
+		<separator/>
+		<placeholder name="Bookmarks Placeholder"/>
+    </menu>-->
+	<menu action="Help">
+		<menuitem name="GetHelp" action="GetHelp"/>
+		<menuitem name="Translate" action="Translate"/>
+		<menuitem name="ReportProblem" action="ReportProblem"/>
+		<separator />
+		<menuitem name="About" action="About"/>
+	</menu>
+</menubar>
+<!--<popup name="background">
+	<placeholder name="Before Zoom Items">
+		<placeholder name="New Window Items"/>
+		<placeholder name="New Object Items"/>
+		<separator/>
+	       <placeholder name="Extension Actions"/>
+	</placeholder>
+        <separator/>
+	<placeholder name="Zoom Items">
+		<menuitem name="Zoom Normal" action="Zoom Normal"/>
+	</placeholder>
+        <separator/>
+	<placeholder name="After Zoom Items"/>
+</popup>-->
+
+<popup name="ToolbarMenu" accelerators="false">
+    <menuitem name="Show Hide Context Pane" action="Show Hide Context Pane"/>
+    <menuitem name="Show Hide Menubar" action="Show Hide Menubar"/>
+    <menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
+	<separator/>
+	<menuitem name="ToolbarEditor" action="ToolbarEditor"/>
+</popup>
+
+<popup name="CompactMenu" accelerators="false">
+	<menuitem name="New Tab" action="New Tab"/>
+	<menuitem name="New Window" action="New Window"/>
+	<separator/>
+	<menuitem name="Connect to Server" action="Connect to Server"/>
+	<separator/>
+    <!--
+        <menuitem name="Undo" action="Undo"/>
+        <menuitem name="Redo" action="Redo"/>
+	<separator/>
+        <menuitem name="Connect to Server" action="Connect to Server"/>
+	<separator/>
+	<menuitem name="Reset to Defaults" action="Reset to Defaults"/>-->
+    <menuitem name="Show Hidden Files" action="Show Hidden Files"/>
+	<separator/>
+    <menuitem name="About" action="About"/>
+    <menuitem name="MarlinSettings" action="MarlinSettings"/>
+</popup>
+</ui>