diff -Nru caja-dropbox-1.14.0/configure.ac caja-dropbox-1.16.0/configure.ac --- caja-dropbox-1.14.0/configure.ac 2016-04-08 11:37:12.000000000 +0000 +++ caja-dropbox-1.16.0/configure.ac 2016-09-19 08:56:52.000000000 +0000 @@ -1,6 +1,6 @@ # Initialization -AC_INIT([caja-dropbox], [1.14.0], [http://www.mate-desktop.org/]) +AC_INIT([caja-dropbox], [1.16.0], [http://www.mate-desktop.org/]) AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz foreign no-dist-gzip]) diff -Nru caja-dropbox-1.14.0/debian/changelog caja-dropbox-1.16.0/debian/changelog --- caja-dropbox-1.14.0/debian/changelog 2016-05-27 22:19:53.000000000 +0000 +++ caja-dropbox-1.16.0/debian/changelog 2017-01-13 02:01:49.000000000 +0000 @@ -1,8 +1,33 @@ -caja-dropbox (1.14.0-1~xenial1.01) xenial; urgency=medium +caja-dropbox (1.16.0-1~xenial3.1) xenial; urgency=medium - * Automated sideport + * Automated PPA build. - -- Martin Wimpress Fri, 27 May 2016 23:19:53 +0100 + -- Martin Wimpress Fri, 13 Jan 2017 02:00:32 +0000 + +caja-dropbox (1.16.0-1) unstable; urgency=medium + + [ Martin Wimpress ] + * New upstream release. + + [ Mike Gabriel ] + * debian/changelog: + + Fix missing changelog items for 1.15.0-0ubuntu1 upload. + * debian/control: + + Dependencies updated for MATE 1.16. + * debian/watch: + + Update version matching again to _not_ support development releases. + + -- Mike Gabriel Sat, 01 Oct 2016 17:11:09 +0200 + +caja-dropbox (1.15.0-0ubuntu1) yakkety; urgency=medium + + * New upstream development release. + * debian/control: + + Dependencies updated for MATE 1.15. + * debian/watch: + + Update version matching to support development releases. + + -- Martin Wimpress Fri, 09 Sep 2016 13:04:48 +0100 caja-dropbox (1.14.0-1) unstable; urgency=medium diff -Nru caja-dropbox-1.14.0/debian/control caja-dropbox-1.16.0/debian/control --- caja-dropbox-1.14.0/debian/control 2016-05-27 21:40:52.000000000 +0000 +++ caja-dropbox-1.16.0/debian/control 2016-10-05 08:04:13.000000000 +0000 @@ -10,9 +10,9 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, dpkg-dev (>= 1.16.1.1), - libcaja-extension-dev (>= 1.14), + libcaja-extension-dev (>= 1.16), libglib2.0-dev (>= 2.14.0), - mate-common (>= 1.14), + mate-common (>= 1.16), python (>= 2.6.6-3~), python-docutils (>= 0.6), python-gtk2 (>= 2.12), diff -Nru caja-dropbox-1.14.0/NEWS caja-dropbox-1.16.0/NEWS --- caja-dropbox-1.14.0/NEWS 2016-04-08 11:37:12.000000000 +0000 +++ caja-dropbox-1.16.0/NEWS 2016-09-19 08:56:52.000000000 +0000 @@ -1,3 +1,8 @@ +caja-dropbox 1.16.0 +========================== + + * Some code cleanups + caja-dropbox 1.14.0 ========================== diff -Nru caja-dropbox-1.14.0/src/caja-dropbox.c caja-dropbox-1.16.0/src/caja-dropbox.c --- caja-dropbox-1.14.0/src/caja-dropbox.c 2016-04-08 11:37:12.000000000 +0000 +++ caja-dropbox-1.16.0/src/caja-dropbox.c 2016-09-19 08:56:52.000000000 +0000 @@ -49,26 +49,10 @@ static char *emblems[] = {"dropbox-uptodate", "dropbox-syncing", "dropbox-unsyncable"}; gchar *DEFAULT_EMBLEM_PATHS[2] = { EMBLEMDIR , NULL }; -gboolean dropbox_use_caja_submenu_workaround; gboolean dropbox_use_operation_in_progress_workaround; static GType dropbox_type = 0; -/* for old versions of glib */ -#if 0 // Silence Warnings. -static void my_g_hash_table_get_keys_helper(gpointer key, - gpointer value, - GList **ud) { - *ud = g_list_append(*ud, key); -} - -static GList *my_g_hash_table_get_keys(GHashTable *ght) { - GList *list = NULL; - g_hash_table_foreach(ght, (GHFunc) my_g_hash_table_get_keys_helper, &list); - return list; -} -#endif - /* probably my favorite function */ static gchar * canonicalize_path(gchar *path) { @@ -596,13 +580,6 @@ g_object_set_property (G_OBJECT(item), "sensitive", &sensitive); } - /* taken from caja-file-repairer (http://repairer.kldp.net/): - * this code is a workaround for a bug of caja - * See: http://bugzilla.gnome.org/show_bug.cgi?id=508878 */ - if (dropbox_use_caja_submenu_workaround) { - toret = g_list_append(toret, item); - } - g_object_unref(item); g_string_free(new_action_string, TRUE); ret++; diff -Nru caja-dropbox-1.14.0/src/caja-dropbox.h caja-dropbox-1.16.0/src/caja-dropbox.h --- caja-dropbox-1.14.0/src/caja-dropbox.h 2016-04-08 11:37:12.000000000 +0000 +++ caja-dropbox-1.16.0/src/caja-dropbox.h 2016-09-19 08:56:52.000000000 +0000 @@ -61,7 +61,6 @@ GType caja_dropbox_get_type(void); void caja_dropbox_register_type(GTypeModule *module); -extern gboolean dropbox_use_caja_submenu_workaround; extern gboolean dropbox_use_operation_in_progress_workaround; G_END_DECLS diff -Nru caja-dropbox-1.14.0/src/dropbox.c caja-dropbox-1.16.0/src/dropbox.c --- caja-dropbox-1.14.0/src/dropbox.c 2016-04-08 11:37:12.000000000 +0000 +++ caja-dropbox-1.16.0/src/dropbox.c 2016-09-19 08:56:52.000000000 +0000 @@ -41,7 +41,6 @@ caja_dropbox_register_type (module); type_list[0] = CAJA_TYPE_DROPBOX; - dropbox_use_caja_submenu_workaround = FALSE; dropbox_use_operation_in_progress_workaround = TRUE; } diff -Nru caja-dropbox-1.14.0/src/dropbox-command-client.c caja-dropbox-1.16.0/src/dropbox-command-client.c --- caja-dropbox-1.14.0/src/dropbox-command-client.c 2016-04-08 11:37:12.000000000 +0000 +++ caja-dropbox-1.16.0/src/dropbox-command-client.c 2016-09-19 08:56:52.000000000 +0000 @@ -154,19 +154,6 @@ return TRUE; } -static void my_g_hash_table_get_keys_helper(gpointer key, - gpointer value, - GList **ud) { - *ud = g_list_append(*ud, key); -} - -static GList *my_g_hash_table_get_keys(GHashTable *ght) { - GList *list = NULL; - g_hash_table_foreach(ght, (GHFunc) - my_g_hash_table_get_keys_helper, &list); - return list; -} - /* sends a command to the dropbox server returns an hash of the return values @@ -221,10 +208,7 @@ if (args != NULL) { GList *keys, *li; - /* oh god */ - keys = glib_check_version(2, 14, 0) - ? my_g_hash_table_get_keys(args) - : g_hash_table_get_keys(args); + keys = g_hash_table_get_keys(args); for (li = keys; li != NULL; li = g_list_next(li)) { int i;