Merge lp:~jeremywootten/pantheon-files/dropbox-updated-for-loki into lp:~elementary-apps/pantheon-files/pantheon-files-plugin-dropbox

[Jeremy Wootten]

Namespace changes for dropbox plugin

This branch is built on lp:~jeremywootten/pantheon-files/dropbox-plugin-reformat-for-loki.

The code is updated to be compatible with Loki. Some namespaces are changed from marlin to pantheon-files or PF. Emblem names are updated.

[lp:~jeremywootten/pantheon-files/dropbox-updated-for-loki]

25. By Jeremy Wootten on 2016-06-24

Do not link unnecessarily to pantheon-files-widgets

26. By Jeremy Wootten on 2016-06-24

Merge changes from parent

[Zisu Andrei (matzipan)]

There's nothing which strikes me as out-of-place

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-06-24 12:59:58 +0000
+++ CMakeLists.txt	2016-06-24 12:59:58 +0000
@@ -2,9 +2,9 @@
 
 cmake_minimum_required (VERSION 2.6)
 cmake_policy(VERSION 2.6)
-project(Marlin-Dropbox)
+project(Pantheon-Files-Dropbox)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
-set(GETTEXT_PACKAGE "marlin-dropbox")
+set(GETTEXT_PACKAGE "pantheon-files-dropbox")
 set(PACKAGE_VERSION 0.1)
 set(VERSION 0.1)
 configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
@@ -13,9 +13,9 @@
 find_package(PkgConfig)
 pkg_check_modules(DROPBOX REQUIRED
     gtk+-3.0
-    gee-1.0
+    gee-0.8
     glib-2.0
-    marlincore
+    pantheon-files-core
     )
 set(CFLAGS
     ${DROPBOX_CFLAGS} ${DROPBOX_CFLAGS_OTHER}
@@ -25,8 +25,7 @@
 include_directories(${CMAKE_BINARY_DIR}/libcore/)
 add_definitions(${CFLAGS})
 link_directories(${LIB_PATHS})
-add_library(marlin-dropbox SHARED
+add_library(pantheon-files-dropbox SHARED
     plugin.c dropbox-client-util.c dropbox-command-client.c dropbox-client.c dropbox-hooks.c)
-target_link_libraries(marlin-dropbox marlincore marlinwidgets ${DROPBOX_LIBRARIES})
-install(TARGETS marlin-dropbox DESTINATION lib/pantheon-files/plugins/)
-
+target_link_libraries(pantheon-files-dropbox pantheon-files-core ${DROPBOX_LIBRARIES})
+install(TARGETS pantheon-files-dropbox DESTINATION lib/pantheon-files/plugins/)
 
=== modified file 'dropbox-client.c'
--- dropbox-client.c	2016-06-24 12:59:58 +0000
+++ dropbox-client.c	2016-06-24 12:59:58 +0000
@@ -62,7 +62,7 @@
     dc->hook_disconnect_called = dc->command_disconnect_called = FALSE;
   }
   else {
-    marlin_dropbox_hooks_force_reconnect(&(dc->hookserv));
+    pf_dropbox_hooks_force_reconnect(&(dc->hookserv));
   }
 }
 
@@ -84,7 +84,7 @@
 gboolean
 dropbox_client_is_connected(DropboxClient *dc) {
   return (dropbox_command_client_is_connected(&(dc->dcc)) &&
-      marlin_dropbox_hooks_is_connected(&(dc->hookserv)));
+      pf_dropbox_hooks_is_connected(&(dc->hookserv)));
 }
 
 void
@@ -92,14 +92,14 @@
   if (dropbox_client_is_connected(dc) == TRUE) {
     debug("forcing client to reconnect");
     dropbox_command_client_force_reconnect(&(dc->dcc));
-    marlin_dropbox_hooks_force_reconnect(&(dc->hookserv));
+    pf_dropbox_hooks_force_reconnect(&(dc->hookserv));
   }
 }
 
 /* should only be called once on initialization */
 void
 dropbox_client_setup(DropboxClient *dc) {
-  marlin_dropbox_hooks_setup(&(dc->hookserv));
+  pf_dropbox_hooks_setup(&(dc->hookserv));
   dropbox_command_client_setup(&(dc->dcc));
 
   g_hook_list_init(&(dc->ondisconnect_hooklist), sizeof(GHook));
@@ -108,7 +108,7 @@
   dc->hook_disconnect_called = dc->command_disconnect_called = FALSE;
   dc->hook_connect_called = dc->command_connect_called = FALSE;
 
-  marlin_dropbox_hooks_add_on_connect_hook(&(dc->hookserv),
+  pf_dropbox_hooks_add_on_connect_hook(&(dc->hookserv),
                          (DropboxHookClientConnectHook)
                          hook_on_connect, dc);
 
@@ -116,7 +116,7 @@
                          (DropboxCommandClientConnectHook)
                          command_on_connect, dc);
 
-  marlin_dropbox_hooks_add_on_disconnect_hook(&(dc->hookserv),
+  pf_dropbox_hooks_add_on_disconnect_hook(&(dc->hookserv),
                         (DropboxHookClientConnectHook)
                         hook_on_disconnect, dc);
 
@@ -168,6 +168,6 @@
 void
 dropbox_client_start(DropboxClient *dc) {
   debug("starting connections");
-  marlin_dropbox_hooks_start(&(dc->hookserv));
+  pf_dropbox_hooks_start(&(dc->hookserv));
   dropbox_command_client_start(&(dc->dcc));
 }
 
=== modified file 'dropbox-client.h'
--- dropbox-client.h	2016-06-24 12:59:58 +0000
+++ dropbox-client.h	2016-06-24 12:59:58 +0000
@@ -32,7 +32,7 @@
 
 typedef struct {
   DropboxCommandClient dcc;
-  MarlinDropboxHookserv hookserv;
+  PFDropboxHookserv hookserv;
   GHookList onconnect_hooklist;
   GHookList ondisconnect_hooklist;
   gboolean hook_connect_called;
 
=== modified file 'dropbox-command-client.c'
--- dropbox-command-client.c	2016-06-24 12:59:58 +0000
+++ dropbox-command-client.c	2016-06-24 12:59:58 +0000
@@ -47,7 +47,7 @@
    this can be cleaned up once the file_info_command isn't a special
    case anylonger
    */
-gboolean marlin_dropbox_finish_file_info_command(DropboxFileInfoCommandResponse *);
+gboolean pf_dropbox_finish_file_info_command(DropboxFileInfoCommandResponse *);
 
 typedef struct {
     DropboxCommandClient *dcc;
@@ -430,7 +430,7 @@
     dficr->folder_tag_response = folder_tag_response;
     dficr->file_status_response = file_status_response;
     dficr->emblems_response = emblems_response;
-    g_idle_add((GSourceFunc) marlin_dropbox_finish_file_info_command, dficr);
+    g_idle_add((GSourceFunc) pf_dropbox_finish_file_info_command, dficr);
 
     g_free(filename);
 
@@ -528,7 +528,7 @@
             dficr->dfic = dfic;
             dficr->file_status_response = NULL;
             dficr->emblems_response = NULL;
-            g_idle_add((GSourceFunc) marlin_dropbox_finish_file_info_command, dficr);
+            g_idle_add((GSourceFunc) pf_dropbox_finish_file_info_command, dficr);
         }
             break;
         case GENERAL_COMMAND: {
@@ -657,9 +657,9 @@
         g_io_channel_set_line_term(chan, "\n", -1);
 
 #define SET_CONNECTED_STATE(s)     {                    \
-    g_mutex_lock(dcc->command_connected_mutex);         \
+    g_mutex_lock(&(dcc->command_connected_mutex));      \
     dcc->command_connected = s;                         \
-    g_mutex_unlock(dcc->command_connected_mutex);       \
+    g_mutex_unlock(&(dcc->command_connected_mutex));    \
 }
 
         SET_CONNECTED_STATE(TRUE);
@@ -670,12 +670,12 @@
             DropboxCommand *dc;
 
             while (1) {
-                GTimeVal gtv;
+                guint64 gtv;
 
-                g_get_current_time(&gtv);
-                g_time_val_add(&gtv, G_USEC_PER_SEC / 10);
+                gtv = g_get_real_time();
+                gtv = gtv + G_USEC_PER_SEC / 10;
                 /* get a request from nautilus */
-                dc = g_async_queue_timed_pop(dcc->command_queue, &gtv);
+                dc = g_async_queue_timeout_pop(dcc->command_queue, gtv);
                 if (dc != NULL) {
                     break;
                 }
@@ -747,9 +747,9 @@
 dropbox_command_client_is_connected(DropboxCommandClient *dcc) {
     gboolean command_connected;
 
-    g_mutex_lock(dcc->command_connected_mutex);
+    g_mutex_lock(&(dcc->command_connected_mutex));
     command_connected = dcc->command_connected;
-    g_mutex_unlock(dcc->command_connected_mutex);
+    g_mutex_unlock(&(dcc->command_connected_mutex));
 
     return command_connected;
 }
@@ -772,7 +772,7 @@
 void
 dropbox_command_client_setup(DropboxCommandClient *dcc) {
     dcc->command_queue = g_async_queue_new();
-    dcc->command_connected_mutex = g_mutex_new();
+    g_mutex_init(&(dcc->command_connected_mutex));
     dcc->command_connected = FALSE;
     dcc->ca_hooklist = NULL;
 
@@ -826,8 +826,8 @@
 dropbox_command_client_start(DropboxCommandClient *dcc) {
     /* setup the connect to the command server */
     debug("starting command thread");
-    g_thread_create((gpointer (*)(gpointer data)) dropbox_command_client_thread,
-                    dcc, FALSE, NULL);
+    g_thread_new("pantheon-files-plugin-dropbox", (gpointer (*)(gpointer data)) dropbox_command_client_thread,
+                    dcc);
 }
 
 /* thread safe */
@@ -850,7 +850,7 @@
 /* this is the C API, there is another send_command_to_db
    that is more the actual over the wire command */
 void dropbox_command_client_send_command(DropboxCommandClient *dcc,
-                                         MarlinDropboxCommandResponseHandler h,
+                                         PFDropboxCommandResponseHandler h,
                                          gpointer ud,
                                          const char *command, ...) {
     va_list ap;
 
=== modified file 'dropbox-command-client.h'
--- dropbox-command-client.h	2016-06-24 12:59:58 +0000
+++ dropbox-command-client.h	2016-06-24 12:59:58 +0000
@@ -24,16 +24,16 @@
 #ifndef DROPBOX_COMMAND_CLIENT_H
 #define DROPBOX_COMMAND_CLIENT_H
 
-#include <marlincore.h>
+#include <pantheon-files-core.h>
 #include <gof-file.h>
 
 G_BEGIN_DECLS
 
 /* command structs */
-typedef enum {GET_FILE_INFO, GENERAL_COMMAND} MarlinDropboxRequestType;
+typedef enum {GET_FILE_INFO, GENERAL_COMMAND} PFDropboxRequestType;
 
 typedef struct {
-  MarlinDropboxRequestType request_type;
+  PFDropboxRequestType request_type;
 } DropboxCommand;
 
 typedef struct {
@@ -51,13 +51,13 @@
   GHashTable *emblems_response;
 } DropboxFileInfoCommandResponse;
 
-typedef void (*MarlinDropboxCommandResponseHandler)(GHashTable *, gpointer);
+typedef void (*PFDropboxCommandResponseHandler)(GHashTable *, gpointer);
 
 typedef struct {
   DropboxCommand dc;
   gchar *command_name;
   GHashTable *command_args;
-  MarlinDropboxCommandResponseHandler handler;
+  PFDropboxCommandResponseHandler handler;
   gpointer handler_ud;
 } DropboxGeneralCommand;
 
@@ -65,7 +65,7 @@
 typedef GHookFunc DropboxCommandClientConnectHook;
 
 typedef struct {
-  GMutex *command_connected_mutex;
+  GMutex command_connected_mutex;
   gboolean command_connected;
   GAsyncQueue *command_queue;
   GList *ca_hooklist;
@@ -90,7 +90,7 @@
                         const char *command);
 
 void dropbox_command_client_send_command(DropboxCommandClient *dcc,
-                     MarlinDropboxCommandResponseHandler h,
+                     PFDropboxCommandResponseHandler h,
                      gpointer ud,
                      const char *command, ...);
 void
 
=== modified file 'dropbox-hooks.c'
--- dropbox-hooks.c	2016-06-24 12:59:58 +0000
+++ dropbox-hooks.c	2016-06-24 12:59:58 +0000
@@ -43,12 +43,12 @@
 } HookData;
 
 static gboolean
-try_to_connect(MarlinDropboxHookserv *hookserv);
+try_to_connect(PFDropboxHookserv *hookserv);
 
 static gboolean
 handle_hook_server_input(GIOChannel *chan,
                          GIOCondition cond,
-                         MarlinDropboxHookserv *hookserv) {
+                         PFDropboxHookserv *hookserv) {
     /*debug_enter(); */
 
     /* we have some sweet macros defined that allow us to write this
@@ -123,7 +123,7 @@
 }
 
 static void
-watch_killer(MarlinDropboxHookserv *hookserv) {
+watch_killer(PFDropboxHookserv *hookserv) {
     debug("hook client disconnected");
 
     hookserv->connected = FALSE;
@@ -152,7 +152,7 @@
 }
 
 static gboolean
-try_to_connect(MarlinDropboxHookserv *hookserv) {
+try_to_connect(PFDropboxHookserv *hookserv) {
     /* create socket */
     hookserv->socket = socket(PF_UNIX, SOCK_STREAM, 0);
 
@@ -258,7 +258,7 @@
 
 /* should only be called in glib main loop */
 /* returns a gboolean because it is a GSourceFunc */
-gboolean marlin_dropbox_hooks_force_reconnect(MarlinDropboxHookserv *hookserv) {
+gboolean pf_dropbox_hooks_force_reconnect(PFDropboxHookserv *hookserv) {
     debug_enter();
 
     if (hookserv->connected == FALSE) {
@@ -280,12 +280,12 @@
 }
 
 gboolean
-marlin_dropbox_hooks_is_connected(MarlinDropboxHookserv *hookserv) {
+pf_dropbox_hooks_is_connected(PFDropboxHookserv *hookserv) {
     return hookserv->connected;
 }
 
 void
-marlin_dropbox_hooks_setup(MarlinDropboxHookserv *hookserv) {
+pf_dropbox_hooks_setup(PFDropboxHookserv *hookserv) {
     hookserv->dispatch_table = g_hash_table_new_full((GHashFunc) g_str_hash,
                                                      (GEqualFunc) g_str_equal,
                                                      g_free, g_free);
@@ -296,7 +296,7 @@
 }
 
 void
-marlin_dropbox_hooks_add_on_disconnect_hook(MarlinDropboxHookserv *hookserv,
+pf_dropbox_hooks_add_on_disconnect_hook(PFDropboxHookserv *hookserv,
                                             DropboxHookClientConnectHook dhcch,
                                             gpointer ud) {
     GHook *newhook;
@@ -309,7 +309,7 @@
 }
 
 void
-marlin_dropbox_hooks_add_on_connect_hook(MarlinDropboxHookserv *hookserv,
+pf_dropbox_hooks_add_on_connect_hook(PFDropboxHookserv *hookserv,
                                          DropboxHookClientConnectHook dhcch,
                                          gpointer ud) {
     GHook *newhook;
@@ -321,7 +321,7 @@
     g_hook_append(&(hookserv->onconnect_hooklist), newhook);
 }
 
-void marlin_dropbox_hooks_add(MarlinDropboxHookserv *ndhs,
+void pf_dropbox_hooks_add(PFDropboxHookserv *ndhs,
                               const gchar *hook_name,
                               DropboxUpdateHook hook, gpointer ud) {
     HookData *hd;
@@ -332,6 +332,6 @@
 }
 
 void
-marlin_dropbox_hooks_start(MarlinDropboxHookserv *hookserv) {
+pf_dropbox_hooks_start(PFDropboxHookserv *hookserv) {
     try_to_connect(hookserv);
 }
 
=== modified file 'dropbox-hooks.h'
--- dropbox-hooks.h	2011-10-05 04:35:08 +0000
+++ dropbox-hooks.h	2016-06-24 12:59:58 +0000
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef MARLIN_DROPBOX_HOOKS_H
-#define MARLIN_DROPBOX_HOOKS_H
+#ifndef PF_DROPBOX_HOOKS_H
+#define PF_DROPBOX_HOOKS_H
 
 #include <glib.h>
 
@@ -45,31 +45,31 @@
     GHashTable *dispatch_table;
     GHookList ondisconnect_hooklist;
     GHookList onconnect_hooklist;
-} MarlinDropboxHookserv;
-
-void
-marlin_dropbox_hooks_setup(MarlinDropboxHookserv *);
-
-void
-marlin_dropbox_hooks_start(MarlinDropboxHookserv *);
-
-gboolean
-marlin_dropbox_hooks_is_connected(MarlinDropboxHookserv *);
-
-gboolean
-marlin_dropbox_hooks_force_reconnect(MarlinDropboxHookserv *);
-
-void
-marlin_dropbox_hooks_add(MarlinDropboxHookserv *ndhs,
+} PFDropboxHookserv;
+
+void
+pf_dropbox_hooks_setup(PFDropboxHookserv *);
+
+void
+pf_dropbox_hooks_start(PFDropboxHookserv *);
+
+gboolean
+pf_dropbox_hooks_is_connected(PFDropboxHookserv *);
+
+gboolean
+pf_dropbox_hooks_force_reconnect(PFDropboxHookserv *);
+
+void
+pf_dropbox_hooks_add(PFDropboxHookserv *ndhs,
                          const gchar *hook_name,
                          DropboxUpdateHook hook, gpointer ud);
 void
-marlin_dropbox_hooks_add_on_disconnect_hook(MarlinDropboxHookserv *hookserv,
+pf_dropbox_hooks_add_on_disconnect_hook(PFDropboxHookserv *hookserv,
                                             DropboxHookClientConnectHook dhcch,
                                             gpointer ud);
 
 void
-marlin_dropbox_hooks_add_on_connect_hook(MarlinDropboxHookserv *hookserv,
+pf_dropbox_hooks_add_on_connect_hook(PFDropboxHookserv *hookserv,
                                          DropboxHookClientConnectHook dhcch,
                                          gpointer ud);
 
 
=== modified file 'dropbox.plug'
--- dropbox.plug	2011-10-04 09:11:24 +0000
+++ dropbox.plug	2016-06-24 12:59:58 +0000
@@ -1,3 +1,3 @@
 [Plugin]
 Name=Dropbox
-File=libmarlin-dropbox.so
+File=libpantheon-files-dropbox.so
 
=== modified file 'plugin.c'
--- plugin.c	2016-06-24 12:59:58 +0000
+++ plugin.c	2016-06-24 12:59:58 +0000
@@ -1,12 +1,12 @@
 /*
  * Copyright (C) 2011 ammonkey <[e-mail]>
  *
- * Marlin is free software: you can redistribute it and/or modify it
+ * PantheonFiles 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.
  *
- * Marlin is distributed in the hope that it will be useful, but
+ * PantheonFiles 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.
@@ -21,14 +21,10 @@
 #include "g-util.h"
 #include "plugin.h"
 
-//static gpointer marlin_dropbox_parent_class = NULL;
-
-//#define MARLIN_DROPBOX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MARLIN_TYPE_DROPBOX, MarlinDropboxPrivate))
-
-G_DEFINE_TYPE (MarlinDropbox, marlin_dropbox, MARLIN_PLUGINS_TYPE_BASE);
+G_DEFINE_TYPE (PFDropbox, pf_dropbox, MARLIN_PLUGINS_TYPE_BASE);
 
 typedef struct {
-    MarlinDropbox   *cvs;
+    PFDropbox   *cvs;
     gchar           *verb;
     GOFFile         *file;
 } MenuCallbackData;
@@ -42,22 +38,32 @@
     g_free (cb_data);
 }
 
-static char *db_emblems[] = {"dropbox-uptodate", "dropbox-syncing", "dropbox-unsyncable", "web", "people", "photos", "star"};
-static char *emblems[] = {"emblem-ubuntuone-synchronized", "emblem-ubuntuone-updating", "dropbox-unsyncable", "emblem-web", "emblem-people", "emblem-photos", "emblem-star"};
-//gchar *DEFAULT_EMBLEM_PATHS[2] = { EMBLEMDIR , NULL };
-
-static void marlin_dropbox_finalize (MarlinPluginsBase* obj);
+static char *db_emblems[] = {"dropbox-uptodate",    \
+                             "dropbox-syncing",     \
+                             "dropbox-unsyncable",  \
+                             "dropbox-selsync",     \
+                             "dropbox-app",         \
+                             "web",                 \
+                             "people",              \
+                             "photos",              \
+                             "star"};
+
+static char *emblems[] = {"process-completed-symbolic",      \
+                          "aptdaemon-upgrade",               \
+                          "process-error-symbolic",          \
+                          "aptdaemon-upgrade",               \
+                          "dropbox-app",                     \
+                          "applications-internet",           \
+                          "avatar-default",                  \
+                          "emblem-photos-symbolic",          \
+                          "emblem-favorite-symbolic"};
+
+static void pf_dropbox_finalize (MarlinPluginsBase* obj);
 
 static gpointer _g_object_ref0 (gpointer self) {
     return self ? g_object_ref (self) : NULL;
 }
 
-/*static gchar* current_path = NULL;
-  static gboolean menu_added = FALSE;
-  static GSettings* settings = NULL;
-  static GList *menus = NULL;
-  static GtkWidget *menu;*/
-
 /* probably my favorite function */
 static gchar *
 canonicalize_path(gchar *path) {
@@ -94,7 +100,7 @@
 }
 
 gboolean
-reset_all_files(MarlinDropbox *cvs) {
+reset_all_files(PFDropbox *cvs) {
     /* Only run this on the main loop or you'll cause problems. */
 
     /* this works because you can call a function pointer with
@@ -104,7 +110,7 @@
 }
 
 static void
-when_file_dies(MarlinDropbox *cvs, GOFFile *file) {
+when_file_dies(PFDropbox *cvs, GOFFile *file) {
     gchar *filename;
 
     filename = g_hash_table_lookup(cvs->obj2filename, file);
@@ -121,141 +127,21 @@
     g_hash_table_remove(cvs->obj2filename, file);
 }
 
-/*****/
-#if 0
-gboolean
-add_emblem_paths(GHashTable* emblem_paths_response)
-{
-    /* Only run this on the main loop or you'll cause problems. */
-    if (!emblem_paths_response)
-        return FALSE;
-
-    gchar **emblem_paths_list;
-    int i;
-
-    GtkIconTheme *theme = gtk_icon_theme_get_default();
-
-    if (emblem_paths_response &&
-        (emblem_paths_list = g_hash_table_lookup(emblem_paths_response, "path"))) {
-        for (i = 0; emblem_paths_list[i] != NULL; i++) {
-            if (emblem_paths_list[i][0])
-                gtk_icon_theme_append_search_path(theme, emblem_paths_list[i]);
-        }
-    }
-    g_hash_table_unref(emblem_paths_response);
-    return FALSE;
-}
-
-gboolean
-remove_emblem_paths(GHashTable* emblem_paths_response)
-{
-    /* Only run this on the main loop or you'll cause problems. */
-    if (!emblem_paths_response)
-        return FALSE;
-
-    gchar **emblem_paths_list = g_hash_table_lookup(emblem_paths_response, "path");
-    if (!emblem_paths_list)
-        goto exit;
-
-    // We need to remove the old paths.
-    GtkIconTheme * icon_theme = gtk_icon_theme_get_default();
-    gchar ** paths;
-    gint path_count;
-
-    gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count);
-
-    gint i, j, out = 0;
-    gboolean found = FALSE;
-    for (i = 0; i < path_count; i++) {
-        gboolean keep = TRUE;
-        for (j = 0; emblem_paths_list[j] != NULL; j++) {
-            if (emblem_paths_list[j][0]) {
-                if (!g_strcmp0(paths[i], emblem_paths_list[j])) {
-                    found = TRUE;
-                    keep = FALSE;
-                    g_free(paths[i]);
-                    break;
-                }
-            }
-        }
-        if (keep) {
-            paths[out] = paths[i];
-            out++;
-        }
-    }
-
-    /* If we found one we need to reset the path to
-       accomodate the changes */
-    if (found) {
-        paths[out] = NULL; /* Clear the last one */
-        gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, out);
-    }
-
-    g_strfreev(paths);
-exit:
-    g_hash_table_unref(emblem_paths_response);
-    return FALSE;
-}
-
-void get_emblem_paths_cb(GHashTable *emblem_paths_response, MarlinDropbox *cvs)
-{
-    if (!emblem_paths_response) {
-        emblem_paths_response = g_hash_table_new((GHashFunc) g_str_hash,
-                                                 (GEqualFunc) g_str_equal);
-        //FIXME
-        //g_hash_table_insert(emblem_paths_response, "path", DEFAULT_EMBLEM_PATHS);
-    } else {
-        /* Increase the ref so that finish_general_command doesn't delete it. */
-        g_hash_table_ref(emblem_paths_response);
-    }
-
-    g_mutex_lock(cvs->emblem_paths_mutex);
-    if (cvs->emblem_paths) {
-        g_idle_add((GSourceFunc) remove_emblem_paths, cvs->emblem_paths);
-        cvs->emblem_paths = NULL;
-    }
-    cvs->emblem_paths = emblem_paths_response;
-    g_mutex_unlock(cvs->emblem_paths_mutex);
-
-    g_idle_add((GSourceFunc) add_emblem_paths, g_hash_table_ref(emblem_paths_response));
-    g_idle_add((GSourceFunc) reset_all_files, cvs);
-}
-#endif
-
-static void
-on_connect(MarlinDropbox *cvs) {
-    reset_all_files(cvs);
-
-    g_message ("%s", G_STRFUNC);
-    //amtest
-    /* We don't necessarly need the original dropbox icons */
-    /*dropbox_command_client_send_command(&(cvs->dc.dcc),
-      (MarlinDropboxCommandResponseHandler) get_emblem_paths_cb,
-      cvs, "get_emblem_paths", NULL);*/
-}
-
-static void
-on_disconnect(MarlinDropbox *cvs) {
-    reset_all_files(cvs);
-
-    //FIXME
-    g_message ("%s", G_STRFUNC);
-    //amtest
-#if 0
-    g_mutex_lock(cvs->emblem_paths_mutex);
-    /* This call will free the data too. */
-    g_idle_add((GSourceFunc) remove_emblem_paths, cvs->emblem_paths);
-    cvs->emblem_paths = NULL;
-    g_mutex_unlock(cvs->emblem_paths_mutex);
-#endif
-}
-
-static void
-handle_shell_touch(GHashTable *args, MarlinDropbox *cvs) {
+
+static void
+on_connect(PFDropbox *cvs) {
+    reset_all_files(cvs);
+}
+
+static void
+on_disconnect(PFDropbox *cvs) {
+    reset_all_files(cvs);
+}
+
+static void
+handle_shell_touch(GHashTable *args, PFDropbox *cvs) {
     gchar **path;
 
-    //  debug_enter();
-
     if ((path = g_hash_table_lookup(args, "path")) != NULL &&
         path[0][0] == '/') {
         GOFFile *file;
@@ -292,13 +178,9 @@
 }
 
 gboolean
-marlin_dropbox_finish_file_info_command(DropboxFileInfoCommandResponse *dficr) {
-
+pf_dropbox_finish_file_info_command(DropboxFileInfoCommandResponse *dficr) {
     char *str_emblem;
 
-    //debug_enter();
-    //NautilusOperationResult result = NAUTILUS_OPERATION_FAILED;
-
     if (!dficr->dfic->cancelled) {
         gchar **status = NULL;
         gboolean isdir;
@@ -311,10 +193,9 @@
             int i;
             for ( i = 0; status[i] != NULL; i++) {
                 if (status[i][0]) {
-                    //g_message ("emblem %s", status[i]);
-                    if ((str_emblem = translate_emblem (status[i])) != NULL)
+                    if ((str_emblem = translate_emblem (status[i])) != NULL) {
                         gof_file_add_emblem(dficr->dfic->file, str_emblem);
-                    else
+                    } else
                         g_warning ("emblem %s not found - %s", status[i], dficr->dfic->file->uri);
                 }
             }
@@ -333,16 +214,16 @@
             if (isdir &&
                 (tag = g_hash_table_lookup(dficr->folder_tag_response, "tag")) != NULL) {
                 if (strcmp("public", tag[0]) == 0) {
-                    gof_file_add_emblem(dficr->dfic->file, "emblem-web");
+                    gof_file_add_emblem(dficr->dfic->file, emblems[5]);
                 }
                 else if (strcmp("shared", tag[0]) == 0) {
-                    gof_file_add_emblem(dficr->dfic->file, "emblem-people");
+                    gof_file_add_emblem(dficr->dfic->file, emblems[6]);
                 }
                 else if (strcmp("photos", tag[0]) == 0) {
-                    gof_file_add_emblem(dficr->dfic->file, "emblem-photos");
+                    gof_file_add_emblem(dficr->dfic->file, emblems[7]);
                 }
                 else if (strcmp("sandbox", tag[0]) == 0) {
-                    gof_file_add_emblem(dficr->dfic->file, "emblem-star");
+                    gof_file_add_emblem(dficr->dfic->file, emblems[8]);
                 }
             }
 
@@ -358,29 +239,19 @@
             else if (strcmp("unsyncable", status[0]) == 0) {
                 emblem_code = 3;
             }
+            else if (strcmp("selsync", status[0]) == 0) {
+                emblem_code = 4;
+            }
+            else if (strcmp("app", status[0]) == 0) {
+                emblem_code = 5;
+            }
 
             if (emblem_code > 0) {
-                /*
-                   debug("%s to %s", emblems[emblem_code-1],
-                   g_filename_from_uri(dficr->dfic->file->uri,
-                   NULL, NULL));
-                   */
-                //FIXME
-                g_message ("emblem code %d", emblem_code);
                 gof_file_add_emblem(dficr->dfic->file, emblems[emblem_code-1]);
             }
         }
     }
 
-    /* complete the info request */
-    //FIXME
-    /*if (!dropbox_use_operation_in_progress_workaround) {
-      nautilus_info_provider_update_complete_invoke(dficr->dfic->update_complete,
-      dficr->dfic->provider,
-      (NautilusOperationHandle*) dficr->dfic,
-      result);
-      }*/
-
     /* destroy the objects we created */
     if (dficr->file_status_response != NULL)
         g_hash_table_unref(dficr->file_status_response);
@@ -390,8 +261,6 @@
         g_hash_table_unref(dficr->emblems_response);
 
     /* unref the objects we didn't create */
-    //FIXME
-    //g_closure_unref(dficr->dfic->update_complete);
     g_object_unref(dficr->dfic->file);
 
     /* now free the structs */
@@ -402,22 +271,15 @@
 }
 
 static void
-marlin_dropbox_real_directory_loaded (MarlinPluginsBase *base, void *user_data)
+pf_dropbox_real_directory_loaded (MarlinPluginsBase *base, void *user_data)
 {
-    /*GOFFile *file;
-
-    GObject *obj = ((GObject**) user_data)[2];
-    file = g_object_ref ((GOFFile *) obj);
-    g_message ("%s : %s", G_STRFUNC, file->uri);*/
-
-    //unref file
 
 }
 
 static void
-marlin_dropbox_update_file_info (MarlinPluginsBase *base, GOFFile *file)
+pf_dropbox_update_file_info (MarlinPluginsBase *base, GOFFile *file)
 {
-    MarlinDropbox *cvs = MARLIN_DROPBOX (base);
+    PFDropbox *cvs = PF_DROPBOX (base);
 
     gchar *path = NULL;
 
@@ -443,13 +305,7 @@
             g_object_weak_unref(G_OBJECT(file), (GWeakNotify) when_file_dies, cvs);
             g_hash_table_remove(cvs->obj2filename, file);
             g_hash_table_remove(cvs->filename2obj, stored_filename);
-            //g_signal_handlers_disconnect_by_func(file, G_CALLBACK(changed_cb), cvs);
         }
-        //FIXME check
-        /*else if (stored_filename == NULL) {
-          g_critical ("grrrrrrrrr");
-          }*/
-        //#if 0
         else if (stored_filename == NULL) {
             GOFFile *f2;
 
@@ -463,15 +319,12 @@
                    just remove the association to the older file object, it's obsolete
                    */
                 g_object_weak_unref(G_OBJECT(f2), (GWeakNotify) when_file_dies, cvs);
-                //g_signal_handlers_disconnect_by_func(f2, G_CALLBACK(changed_cb), cvs);
+
                 g_hash_table_remove(cvs->filename2obj, filename);
                 g_hash_table_remove(cvs->obj2filename, f2);
             }
         }
-        //#endif
 
-        /* too chatty */
-        /* debug("adding %s <-> 0x%p", filename, file);*/
         g_object_weak_ref(G_OBJECT(file), (GWeakNotify) when_file_dies, cvs);
         g_hash_table_insert(cvs->filename2obj, g_strdup(filename), file);
         g_hash_table_insert(cvs->obj2filename, file, g_strdup(filename));
@@ -488,25 +341,16 @@
     dfic->cancelled = FALSE;
     dfic->provider = base;
     dfic->dc.request_type = GET_FILE_INFO;
-    //FIXME
-    //dfic->update_complete = g_closure_ref(update_complete);
     dfic->update_complete = NULL;
     dfic->file = g_object_ref(file);
 
     dropbox_command_client_request(&(cvs->dc.dcc), (DropboxCommand *) dfic);
 
-    //FIXME
-    //*handle = (NautilusOperationHandle *) dfic;
-
-    /*return dropbox_use_operation_in_progress_workaround
-      ? NAUTILUS_OPERATION_COMPLETE
-      : NAUTILUS_OPERATION_IN_PROGRESS;*/
-
     g_free (path);
 }
 
 static char from_hex(gchar ch) {
-    return isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10;
+    return g_ascii_isdigit(ch) ? ch - '0' : g_ascii_tolower(ch) - 'a' + 10;
 }
 
 // decode in --> out, but dont fill more than n chars into out
@@ -536,7 +380,7 @@
 static void
 menu_item_cb(GtkWidget *item, MenuCallbackData *cb_data)
 {
-    MarlinDropbox *cvs = cb_data->cvs;
+    PFDropbox *cvs = cb_data->cvs;
     DropboxGeneralCommand *dcac;
 
     dcac = g_new(DropboxGeneralCommand, 1);
@@ -567,12 +411,12 @@
 }
 
 static void
-marlin_dropbox_parse_menu(gchar             **options,
+pf_dropbox_parse_menu(gchar             **options,
                           GtkWidget         *menu,
                           MarlinPluginsBase *base,
                           GOFFile           *file)
 {
-    MarlinDropbox *cvs = MARLIN_DROPBOX (base);
+    PFDropbox *cvs = PF_DROPBOX (base);
     MenuCallbackData *cb_data;
     int i;
 
@@ -593,9 +437,9 @@
         GhettoURLDecode(verb, verb, strlen(verb));
         GhettoURLDecode(item_inner, item_inner, strlen(item_inner));
 
-        g_message ("menu %s", item_name);
-        g_message ("verb %s", verb);
-        g_message ("item_inner %s", item_inner);
+        g_debug ("menu %s", item_name);
+        g_debug ("verb %s", verb);
+        g_debug ("item_inner %s", item_inner);
 
         cb_data = g_new0 (MenuCallbackData, 1);
         cb_data->cvs = cvs;
@@ -664,16 +508,13 @@
 }
 
 static void
-marlin_dropbox_context_menu (MarlinPluginsBase *base, GtkWidget *menu, GList *files)
+pf_dropbox_context_menu (MarlinPluginsBase *base, GtkWidget *menu, GList *files)
 {
-    MarlinDropbox *cvs = MARLIN_DROPBOX (base);
+    PFDropbox *cvs = PF_DROPBOX (base);
     GOFFile *file;
     gchar *filename_un, *filename;
     int file_count;
 
-    g_message ("%s", G_STRFUNC);
-    //context_menu_new (u1, menu);
-
     cvs->selection = files;
     if ((file_count = g_list_length (cvs->selection)) != 1)
         return;
@@ -715,17 +556,17 @@
      */
     dropbox_command_client_request(&(cvs->dc.dcc), (DropboxCommand *) dgc);
 
-    GTimeVal gtv;
+    guint64 gtv;
 
     /*
      * 4. We have to block until it's done because nautilus expects a reply.  But we will
      * only block for 50 ms for a reply.
      */
 
-    g_get_current_time(&gtv);
-    g_time_val_add(&gtv, 50000);
+    gtv = g_get_real_time();
+    gtv  = gtv + 5000;
 
-    GHashTable *context_options_response = g_async_queue_timed_pop(reply_queue, &gtv);
+    GHashTable *context_options_response = g_async_queue_timeout_pop(reply_queue, gtv);
     g_async_queue_unref(reply_queue);
 
     if (!context_options_response)
@@ -739,16 +580,21 @@
     GList *toret = NULL;
 
     if (options && *options && **options)  {
-        GtkWidget *submenu, *root_item;
+        GtkWidget *submenu, *root_item, *separator;
 
-        root_item = gtk_menu_item_new_with_mnemonic (_("Dropbo_x"));
+        root_item = gtk_menu_item_new_with_label (_("Dropbox"));
         submenu = gtk_menu_new ();
         gtk_widget_show (root_item);
         gtk_menu_item_set_submenu ((GtkMenuItem *) root_item,submenu);
+
+        separator = gtk_separator_menu_item_new ();
+        gtk_widget_show (separator);
+        gtk_menu_shell_append ((GtkMenuShell*) menu, separator);
+
         gtk_menu_shell_append ((GtkMenuShell*) menu, root_item);
         plugins->menus = g_list_prepend (plugins->menus, _g_object_ref0 (root_item));
 
-        marlin_dropbox_parse_menu(options, submenu, base, file);
+        pf_dropbox_parse_menu(options, submenu, base, file);
     }
 
     g_hash_table_unref(context_options_response);
@@ -758,22 +604,18 @@
 }
 
 static void
-marlin_dropbox_class_init (MarlinDropboxClass *klass) {
+pf_dropbox_class_init (PFDropboxClass *klass) {
     MarlinPluginsBaseClass *object_class = MARLIN_PLUGINS_BASE_CLASS (klass);
-    //g_type_class_add_private (klass, sizeof (MarlinDropboxPrivate));
 
-    object_class->finalize = marlin_dropbox_finalize;
-    object_class->directory_loaded = marlin_dropbox_real_directory_loaded;
-    object_class->update_file_info = marlin_dropbox_update_file_info;
-    object_class->context_menu = marlin_dropbox_context_menu;
+    object_class->finalize = pf_dropbox_finalize;
+    object_class->directory_loaded = pf_dropbox_real_directory_loaded;
+    object_class->update_file_info = pf_dropbox_update_file_info;
+    object_class->context_menu = pf_dropbox_context_menu;
 }
 
 
 static void
-marlin_dropbox_init (MarlinDropbox *cvs) {
-    //self->priv = MARLIN_DROPBOX_GET_PRIVATE (self);
-    //self->priv = g_new0 (MarlinDropboxPrivate, 1);
-
+pf_dropbox_init (PFDropbox *cvs) {
     cvs->filename2obj = g_hash_table_new_full((GHashFunc) g_str_hash,
                                               (GEqualFunc) g_str_equal,
                                               (GDestroyNotify) g_free,
@@ -782,16 +624,13 @@
                                               (GEqualFunc) g_direct_equal,
                                               (GDestroyNotify) NULL,
                                               (GDestroyNotify) g_free);
-    //amtest
-    /*cvs->emblem_paths_mutex = g_mutex_new();
-      cvs->emblem_paths = NULL;*/
 
     /* setup the connection obj*/
     dropbox_client_setup(&(cvs->dc));
 
     /* our hooks */
     /* tricky name: shell_touch signal is used for real time events too (like transfert done event) */
-    marlin_dropbox_hooks_add(&(cvs->dc.hookserv), "shell_touch",
+    pf_dropbox_hooks_add(&(cvs->dc.hookserv), "shell_touch",
                              (DropboxUpdateHook) handle_shell_touch, cvs);
 
     /* add connection handlers */
@@ -809,25 +648,25 @@
 
 
 static void
-marlin_dropbox_finalize (MarlinPluginsBase* obj) {
-    MarlinDropbox * self = MARLIN_DROPBOX (obj);
+pf_dropbox_finalize (MarlinPluginsBase* obj) {
+    PFDropbox * self = PF_DROPBOX (obj);
 
-    //_g_object_unref0 (self->priv->trash_monitor);
-    MARLIN_PLUGINS_BASE_CLASS (marlin_dropbox_parent_class)->finalize (obj);
+    MARLIN_PLUGINS_BASE_CLASS (pf_dropbox_parent_class)->finalize (obj);
 }
 
-MarlinDropbox* marlin_dropbox_new () {
-    MarlinDropbox *u1;
+PFDropbox* pf_dropbox_new () {
+    PFDropbox *u1;
 
-    u1 = (MarlinDropbox*) marlin_plugins_base_construct (MARLIN_TYPE_DROPBOX);
+    u1 = (PFDropbox*) marlin_plugins_base_construct (PF_TYPE_DROPBOX);
 
     return u1;
 }
 
 MarlinPluginsBase* module_init()
 {
-    MarlinDropbox* u1 = marlin_dropbox_new ();
+    PFDropbox* u1 = pf_dropbox_new ();
 
     return MARLIN_PLUGINS_BASE (u1);
 }
 
+
 
=== modified file 'plugin.h'
--- plugin.h	2016-06-24 12:59:58 +0000
+++ plugin.h	2016-06-24 12:59:58 +0000
@@ -1,12 +1,12 @@
 /*
  * Copyright (C) 2011 ammonkey <[e-mail]>
  *
- * Marlin is free software: you can redistribute it and/or modify it
+ * PantheonFiles 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.
  *
- * Marlin is distributed in the hope that it will be useful, but
+ * PantheonFiles 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.
@@ -15,51 +15,46 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MARLIN_DROPBOX_H
-#define MARLIN_DROPBOX_H
+#ifndef PF_DROPBOX_H
+#define PF_DROPBOX_H
 
 #include <glib.h>
 #include <glib-object.h>
-#include <marlincore.h>
-//#include <dbus/dbus-glib.h>
+#include <pantheon-files-core.h>
 
 #include "dropbox-command-client.h"
 #include "dropbox-hooks.h"
 #include "dropbox-client.h"
 
-#define MARLIN_TYPE_DROPBOX (marlin_dropbox_get_type ())
-#define MARLIN_DROPBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MARLIN_TYPE_DROPBOX, MarlinDropbox))
-#define MARLIN_DROPBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MARLIN_TYPE_DROPBOX, MarlinDropboxClass))
-#define MARLIN_IS_DROPBOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MARLIN_TYPE_DROPBOX))
-#define MARLIN_IS_DROPBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MARLIN_TYPE_DROPBOX))
-#define MARLIN_DROPBOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MARLIN_TYPE_DROPBOX, MarlinDropboxClass))
+#define PF_TYPE_DROPBOX (pf_dropbox_get_type ())
+#define PF_DROPBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PF_TYPE_DROPBOX, PFDropbox))
+#define PF_DROPBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PF_TYPE_DROPBOX, PFDropboxClass))
+#define PF_IS_DROPBOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PF_TYPE_DROPBOX))
+#define PF_IS_DROPBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PF_TYPE_DROPBOX))
+#define PF_DROPBOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PF_TYPE_DROPBOX, PFDropboxClass))
 
-typedef struct _MarlinDropbox MarlinDropbox;
-typedef struct _MarlinDropboxClass MarlinDropboxClass;
-typedef struct _MarlinDropboxPrivate MarlinDropboxPrivate;
+typedef struct _PFDropbox PFDropbox;
+typedef struct _PFDropboxClass PFDropboxClass;
+typedef struct _PFDropboxPrivate PFDropboxPrivate;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
-struct _MarlinDropbox {
+struct _PFDropbox {
     MarlinPluginsBase parent_instance;
-    //MarlinDropboxPrivate * priv;
 
     GHashTable *filename2obj;
     GHashTable *obj2filename;
-    /*GMutex *emblem_paths_mutex;
-    GHashTable *emblem_paths;*/
     DropboxClient dc;
 
     GList *selection;
 };
 
-struct _MarlinDropboxClass {
+struct _PFDropboxClass {
     MarlinPluginsBaseClass parent_class;
 };
 
-struct _MarlinDropboxPrivate {
-    /*MarlinTrashMonitor* trash_monitor;*/
+struct _PFDropboxPrivate {
 };
 
-GType marlin_dropbox_get_type (void) G_GNUC_CONST;
+GType pf_dropbox_get_type (void) G_GNUC_CONST;
 
 #endif