Merge lp:~dobey/ubuntuone-client-gnome/kill-share-contacts into lp:ubuntuone-client-gnome

[dobey]

Remove folder sharing UI and related code.

[Roberto Alsina (ralsina)]

review: Approve

[lp:~dobey/ubuntuone-client-gnome/kill-share-contacts]

23. By dobey on 2012-11-27

Need to special case newer versions of gnome-settings-daemon
Remove a removed file from POTFILES.in

=== modified file 'configure.ac'
--- configure.ac	2012-10-31 21:25:54 +0000
+++ configure.ac	2012-11-27 21:44:20 +0000
@@ -109,6 +109,17 @@
 fi
 AM_CONDITIONAL([HAVE_GSD_30], [test "x$have_gsd_30" = "xyes"])
 
+# gnome-settings-daemon 3.5.91 changes REGISTER macro behavior again
+# To compensate, we need an additional define to avoid defining the
+# class_finalize method for the plug-in
+PKG_CHECK_EXISTS([gnome-settings-daemon >= 3.5.91],
+    [have_gsd_36=yes],
+    [have_gsd_36=no])
+if test "x$have_gsd_36" = "xyes"; then
+    AC_DEFINE_UNQUOTED([HAVE_GSD_36], [1],
+                       [If using gnome-settings-daemon 3.5.91 or newer])
+fi
+
 PKG_CHECK_MODULES(SETTINGS_PLUGIN,
         gnome-settings-daemon
         gio-2.0

=== modified file 'gsd/gsd-ubuntuone.c'
--- gsd/gsd-ubuntuone.c	2011-09-23 15:31:01 +0000
+++ gsd/gsd-ubuntuone.c	2012-11-27 21:44:20 +0000
@@ -201,11 +201,13 @@
 }
 
 #ifdef HAVE_GSD_30
+#ifndef HAVE_GSD_36
 static void
 gsd_ubuntuone_class_finalize (GsdUbuntuOneClass *klass)
 {
 }
 #endif
+#endif
 
 static void
 gsd_ubuntuone_class_init (GsdUbuntuOneClass *klass)

=== modified file 'nautilus/Makefile.am'
--- nautilus/Makefile.am	2012-08-29 21:24:36 +0000
+++ nautilus/Makefile.am	2012-11-27 21:44:20 +0000
@@ -38,8 +38,6 @@
 	error-dialog.c		\
 	file-watcher.c		\
 	file-watcher.h		\
-	share-dialog.c		\
-	share-dialog.h		\
 	ubuntuone-marshallers.c \
 	ubuntuone-marshallers.h	\
 	ubuntuone-nautilus.c	\

=== modified file 'nautilus/context-menu.c'
--- nautilus/context-menu.c	2012-02-20 16:45:35 +0000
+++ nautilus/context-menu.c	2012-11-27 21:44:20 +0000
@@ -26,7 +26,6 @@
 #include <glib/gi18n-lib.h>
 #include <libsyncdaemon/libsyncdaemon.h>
 #include "context-menu.h"
-#include "share-dialog.h"
 
 typedef struct {
 	UbuntuOneNautilus *uon;
@@ -141,55 +140,6 @@
 	file_watcher_update_path (data->uon->file_watcher, data->path);
 }
 
-static void
-share_folder_cb (NautilusMenuItem *item, gpointer user_data)
-{
-	MenuCallbackData * data = (MenuCallbackData *) user_data;
-	GtkWidget * dialog;
-
-	dialog = share_dialog_new (data->parent, data->uon, data->path);
-	gtk_widget_show (dialog);
-}
-
-static void
-unshare_folder_cb (NautilusMenuItem *item, gpointer user_data)
-{
-	MenuCallbackData * data = (MenuCallbackData *) user_data;
-	SyncdaemonSharesInterface *interface;
-
-	interface = (SyncdaemonSharesInterface *) syncdaemon_daemon_get_shares_interface (data->uon->syncdaemon);
-	if (interface != NULL)
-		syncdaemon_shares_interface_delete (interface, data->path);
-}
-
-gboolean
-check_share_offer_pending (UbuntuOneNautilus *uon, const gchar *path)
-{
-	GSList *shares, *l;
-	SyncdaemonInterface *interface;
-	gboolean is_share_offer_pending = FALSE;
-	const gchar *node_id;
-
-	interface = syncdaemon_daemon_get_shares_interface (uon->syncdaemon);
-	if (SYNCDAEMON_IS_SHARES_INTERFACE (interface)) {
-		shares = syncdaemon_shares_interface_get_shared (SYNCDAEMON_SHARES_INTERFACE (interface));
-		for (l = shares; l != NULL; l = l->next) {
-			SyncdaemonShareInfo *share_info = SYNCDAEMON_SHARE_INFO (l->data);
-
-			if (g_strcmp0 (syncdaemon_share_info_get_path (share_info), path) == 0) {
-				node_id = syncdaemon_share_info_get_node_id (share_info);
-				if (node_id == NULL)
-					is_share_offer_pending = TRUE;
-				break;
-			}
-		}
-
-		g_slist_free (shares);
-	}
-
-	return is_share_offer_pending;
-}
-
 NautilusMenuItem *
 context_menu_new (UbuntuOneNautilus *uon,
 		  GtkWidget *window,
@@ -201,12 +151,10 @@
 	gchar *path, *item, *homedir_path, *path_uri;
 	gboolean is_managed, is_root, is_udf, is_public, is_shared, is_pending;
 	gboolean is_shared_to_me, is_inhome, is_dir, is_regular, is_symlink;
-	gboolean is_share_offer_pending;
 	MenuCallbackData *cb_data;
 
 	is_managed = is_root = is_udf = is_public = is_shared = is_pending = FALSE;
 	is_shared_to_me = is_inhome = is_dir = is_regular = is_symlink = FALSE;
-	is_share_offer_pending = FALSE;
 
 	if (g_list_length (files) != 1)
 		return NULL;
@@ -239,8 +187,6 @@
 
 	if (ubuntuone_is_folder_shared (uon, path)) {
 		is_shared = TRUE;
-		if (check_share_offer_pending (uon, path))
-			is_share_offer_pending = TRUE;
 	}
 
 	if (ubuntuone_is_inside_shares (uon, path))
@@ -266,54 +212,6 @@
 
 	g_object_weak_ref (G_OBJECT (root_item), (GWeakNotify) free_menu_cb_data, cb_data);
 
-	/* Share/unshare */
-	if ((is_managed || is_udf) && !is_root && is_dir && !is_symlink) {
-
-		menu_item = nautilus_menu_item_new ("ubuntuone-share",
-						    _("_Share..."),
-						    _("Share this folder on Ubuntu One"),
-						    "ubuntuone");
-		if (is_pending)
-			g_object_set (menu_item, "sensitive", FALSE, NULL);
-
-		g_signal_connect (menu_item, "activate",
-				  G_CALLBACK (share_folder_cb), cb_data);
-	} else {
-		/* the different tooltips will probably do us no good */
-		if (is_root) {
-			menu_item = nautilus_menu_item_new ("ubuntuone-noshare-root",
-							    _("_Share..."),
-							    _("Sorry, you can't share the root of a Ubuntu One volume"),
-							    "ubuntuone");
-		} else if (!(is_managed || is_udf)) {
-			menu_item = nautilus_menu_item_new ("ubuntuone-noshare-unmanaged",
-							    _("_Share..."),
-							    _("Sorry, you can't share folders not managed by Ubuntu One"),
-							    "ubuntuone");
-		} else {
-			menu_item = nautilus_menu_item_new ("ubuntuone-noshare-unmanaged",
-							    _("_Share..."),
-							    _("Sorry, you can only share folders"),
-							    "ubuntuone");
-		}
-		g_object_set (menu_item, "sensitive", FALSE, NULL);
-	}
-
-	nautilus_menu_append_item (submenu, menu_item);
-
-	if ((is_managed && is_shared) && !is_root && is_dir && !is_symlink) {
-		menu_item = nautilus_menu_item_new ("ubuntuone-unshare",
-						    _("Stop _Sharing"),
-						    _("Stop sharing this folder on Ubuntu One"),
-						    "ubuntuone");
-		if (is_pending || is_share_offer_pending)
-			g_object_set (menu_item, "sensitive", FALSE, NULL);
-
-		g_signal_connect (menu_item, "activate",
-				  G_CALLBACK (unshare_folder_cb), cb_data);
-		nautilus_menu_append_item (submenu, menu_item);
-	}
-
 	/* UDF logic
 	 *
 	 * XXX: clean this up and separate the logic out and reuse elsewhere

=== removed file 'nautilus/share-dialog.c'
--- nautilus/share-dialog.c	2012-08-30 18:27:39 +0000
+++ nautilus/share-dialog.c	1970-01-01 00:00:00 +0000
@@ -1,161 +0,0 @@
-/*
- * UbuntuOne Nautilus plugin
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2009-2010 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib/gi18n-lib.h>
-#include <libsyncdaemon/libsyncdaemon.h>
-#include "share-dialog.h"
-
-G_DEFINE_TYPE(ShareDialog, share_dialog, GTK_TYPE_DIALOG)
-
-static void
-share_dialog_finalize (GObject *object)
-{
-	ShareDialog *dialog = SHARE_DIALOG (object);
-
-	if (dialog->path != NULL)
-		g_free (dialog->path);
-
-	G_OBJECT_CLASS (share_dialog_parent_class)->finalize (object);
-}
-
-static void
-share_dialog_class_init (ShareDialogClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = share_dialog_finalize;
-}
-
-static void
-dialog_response_cb (GtkDialog *gtk_dialog,
-                    gint response,
-                    gpointer user_data)
-{
-	ShareDialog *dialog = SHARE_DIALOG (gtk_dialog);
-
-	switch (response) {
-	case GTK_RESPONSE_ACCEPT: {
-        const gchar *entry_data;
-
-        entry_data = gtk_entry_get_text (GTK_ENTRY (dialog->user_picker));
-        if (entry_data != NULL && strlen (entry_data) > 0) {
-            SyncdaemonSharesInterface *interface;
-            gchar **email_entries;
-            GSList *emails = NULL;
-            gboolean allow_mods = FALSE;
-            gint i;
-
-            email_entries = g_strsplit (entry_data, ",", -1);
-            for (i = 0; email_entries[i] != NULL; i++) {
-                const gchar *email = g_strstrip (email_entries[i]);
-                emails = g_slist_prepend (emails, g_strdup (email));
-            }
-            g_strfreev (email_entries);
-
-            if (emails != NULL && g_slist_length (emails) > 0) {
-                allow_mods = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->allow_mods));
-
-                interface = SYNCDAEMON_SHARES_INTERFACE (syncdaemon_daemon_get_shares_interface (dialog->uon->syncdaemon));
-                if (interface != NULL) {
-                    syncdaemon_shares_interface_create (interface,
-                                                        dialog->path,
-                                                        emails,
-                                                        g_path_get_basename (dialog->path),
-                                                        allow_mods);
-                }
-            }
-        }
-    }
-	default:
-		gtk_widget_destroy (GTK_WIDGET (dialog));
-		break;
-	}
-}
-
-static void
-share_dialog_init (ShareDialog *dialog)
-{
-	GtkWidget *area, *table, *hbox, *label;
-
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Share on Ubuntu One"));
-	gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
-	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				(_("Share")), GTK_RESPONSE_ACCEPT,
-				NULL);
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "ubuntuone");
-	g_signal_connect (G_OBJECT (dialog), "response",
-			  G_CALLBACK (dialog_response_cb), NULL);
-
-	area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-
-    table = gtk_vbox_new (FALSE, 12);
-    gtk_container_set_border_width (GTK_CONTAINER (table), 7);
-    gtk_box_pack_start (GTK_BOX (area), table, TRUE, TRUE, 0);
-    gtk_widget_show (table);
-
-    /* entry here maybe */
-    hbox = gtk_hbox_new (FALSE, 12);
-    gtk_box_pack_start (GTK_BOX (table), hbox, FALSE, FALSE, 0);
-    gtk_widget_show (hbox);
-
-    label = gtk_label_new_with_mnemonic (_("_Email:"));
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    gtk_widget_show (label);
-
-    dialog->user_picker = gtk_entry_new ();
-    gtk_widget_set_tooltip_text (dialog->user_picker,
-                                 _("Type an email address to share this "
-                                   "folder with. Use a comma to separate "
-                                   "multiple addresses."));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), dialog->user_picker);
-    gtk_entry_set_activates_default (GTK_ENTRY (dialog->user_picker), TRUE);
-    gtk_box_pack_start (GTK_BOX (hbox), dialog->user_picker, TRUE, TRUE, 0);
-    gtk_widget_show (dialog->user_picker);
-
-	dialog->allow_mods = gtk_check_button_new_with_mnemonic (_("_Allow Modification"));
-    /* Default to RW */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->allow_mods),
-                                  TRUE);
-    gtk_box_pack_end (GTK_BOX (table), dialog->allow_mods, FALSE, FALSE, 0);
-	gtk_widget_show (dialog->allow_mods);
-
-	gtk_widget_set_size_request (GTK_WIDGET (dialog), 320, -1);
-}
-
-GtkWidget *
-share_dialog_new (GtkWidget *parent, UbuntuOneNautilus *uon, const gchar *path)
-{
-	ShareDialog *dialog;
-	
-	dialog = (ShareDialog *) g_object_new (TYPE_SHARE_DIALOG, NULL);
-	dialog->uon = uon;
-	dialog->path = g_strdup (path);
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
-
-	return (GtkWidget *) dialog;
-}

=== removed file 'nautilus/share-dialog.h'
--- nautilus/share-dialog.h	2011-07-20 20:44:39 +0000
+++ nautilus/share-dialog.h	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * UbuntuOne Nautilus plugin
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2009-2010 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
- *
- */
-
-#ifndef __SHARE_DIALOG_H__
-#define __SHARE_DIALOG_H__
-
-#include <gtk/gtk.h>
-#include "ubuntuone-nautilus.h"
-
-#define TYPE_SHARE_DIALOG                (share_dialog_get_type ())
-#define SHARE_DIALOG(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SHARE_DIALOG, ShareDialog))
-#define IS_SHARE_DIALOG(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SHARE_DIALOG))
-#define SHARE_DIALOG_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SHARE_DIALOG, ShareDialogClass))
-#define IS_SHARE_DIALOG_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SHARE_DIALOG))
-#define SHARE_DIALOG_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SHARE_DIALOG, ShareDialogClass))
-
-typedef struct {
-	GtkDialog parent;
-
-	UbuntuOneNautilus *uon;
-	gchar *path;
-	GtkWidget *user_picker;
-	GtkWidget *allow_mods;
-} ShareDialog;
-
-typedef struct {
-	GtkDialogClass parent_class;
-} ShareDialogClass;
-
-GType      share_dialog_get_type (void);
-GtkWidget *share_dialog_new (GtkWidget *parent, UbuntuOneNautilus *uon, const gchar *path);
-
-#endif

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-08-30 19:00:33 +0000
+++ po/POTFILES.in	2012-11-27 21:44:20 +0000
@@ -1,7 +1,6 @@
 nautilus/ubuntuone-nautilus.c
 nautilus/context-menu.c
 nautilus/file-watcher.c
-nautilus/share-dialog.c
 nautilus/utils.c
 gsd/gsd-ubuntuone.c
 [type: gettext/ini]gsd/ubuntuone.gnome-settings-plugin.in