GNOME.org
 

gnome-utils r7921 - in trunk/baobab: . src

Author: marzocca
Date: Mon May  5 17:31:55 2008
New Revision: 7921
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=7921&view=rev

Log:
added baobab-mount-operation module

Added:
   trunk/baobab/src/baobab-mount-operation.c
   trunk/baobab/src/baobab-mount-operation.h
Modified:
   trunk/baobab/ChangeLog
   trunk/baobab/src/Makefile.am
   trunk/baobab/src/baobab-remote-connect-dialog.c
   trunk/baobab/src/baobab-scan.c

Modified: trunk/baobab/src/Makefile.am
==============================================================================
--- trunk/baobab/src/Makefile.am	(original)
+++ trunk/baobab/src/Makefile.am	Mon May  5 17:31:55 2008
@@ -39,6 +39,8 @@
 	baobab-tree-map.h \
 	baobab-remote-connect-dialog.c \
 	baobab-remote-connect-dialog.h \
+	baobab-mount-operation.c \
+	baobab-mount-operation.h \
 	gedit-spinner.c \
 	gedit-spinner.h
 

Added: trunk/baobab/src/baobab-mount-operation.c
==============================================================================
--- (empty file)
+++ trunk/baobab/src/baobab-mount-operation.c	Mon May  5 17:31:55 2008
@@ -0,0 +1,297 @@
+/* Baobab - (C) 2005-2008 Fabio Marzocca
+
+	baobab-mount-operation.c
+
+   Modified module from from eel-mount-operation.c
+   Released under same licence
+   
+ */
+ 
+/* eel-mount-operation.c - Gtk+ implementation for GMountOperation
+
+   Copyright (C) 2007 Red Hat, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Author: Alexander Larsson <alexl redhat com>
+*/
+
+#include <config.h>
+#include <glib/gi18n.h>
+#include "baobab-mount-operation.h"
+#include <libgnomeui/gnome-password-dialog.h>
+#include <gtk/gtkmessagedialog.h>
+#include <string.h>
+
+#define I_(string) g_intern_static_string (string)
+
+G_DEFINE_TYPE (BaobabMountOperation, baobab_mount_operation, G_TYPE_MOUNT_OPERATION);
+
+enum {
+	ACTIVE_CHANGED,
+	LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+struct BaobabMountOperationPrivate {
+	GtkWindow *parent_window;
+	gboolean is_active;
+};
+	
+static void
+baobab_mount_operation_finalize (GObject *object)
+{
+	BaobabMountOperation *operation;
+	BaobabMountOperationPrivate *priv;
+
+	operation = BAOBAB_MOUNT_OPERATION (object);
+
+	priv = operation->priv;
+
+	if (priv->parent_window) {
+		g_object_unref (priv->parent_window);
+	}
+  
+	(*G_OBJECT_CLASS (baobab_mount_operation_parent_class)->finalize) (object);
+}
+
+static void
+set_active (BaobabMountOperation *operation,
+	    gboolean is_active)
+{
+	if (operation->priv->is_active != is_active) {
+		operation->priv->is_active = is_active;
+		g_signal_emit (operation, signals[ACTIVE_CHANGED], 0, is_active);
+	}
+}
+
+static void
+password_dialog_button_clicked (GtkDialog *dialog, 
+				gint button_number, 
+				GMountOperation *op)
+{
+	char *username, *domain, *password;
+	gboolean anon;
+	GnomePasswordDialog *gpd;
+
+	gpd = GNOME_PASSWORD_DIALOG (dialog);
+
+	if (button_number == GTK_RESPONSE_OK) {
+		username = gnome_password_dialog_get_username (gpd);
+		if (username) {
+			g_mount_operation_set_username (op, username);
+			g_free (username);
+		}
+
+		domain = gnome_password_dialog_get_domain (gpd);
+		if (domain) {
+			g_mount_operation_set_domain (op, domain);
+			g_free (domain);
+		}
+		
+		password = gnome_password_dialog_get_password (gpd);
+		if (password) {
+			g_mount_operation_set_password (op, password);
+			g_free (password);
+		}
+
+		anon = gnome_password_dialog_anon_selected (gpd);
+		g_mount_operation_set_anonymous (op, anon);
+
+		switch (gnome_password_dialog_get_remember (gpd)) {
+		case GNOME_PASSWORD_DIALOG_REMEMBER_NOTHING:
+			g_mount_operation_set_password_save (op, G_PASSWORD_SAVE_NEVER);
+			break;
+		case GNOME_PASSWORD_DIALOG_REMEMBER_SESSION:
+			g_mount_operation_set_password_save (op, G_PASSWORD_SAVE_FOR_SESSION);
+			break;
+		case GNOME_PASSWORD_DIALOG_REMEMBER_FOREVER:
+			g_mount_operation_set_password_save (op, G_PASSWORD_SAVE_PERMANENTLY);
+			break;
+		}
+
+		g_mount_operation_reply (op, G_MOUNT_OPERATION_HANDLED);
+	} else {
+		g_mount_operation_reply (op, G_MOUNT_OPERATION_ABORTED);
+	}
+
+	gtk_widget_destroy (GTK_WIDGET (dialog));
+	set_active (BAOBAB_MOUNT_OPERATION (op), FALSE);
+	g_object_unref (op);
+}
+
+static void
+ask_password (GMountOperation *op,
+	      const char      *message,
+	      const char      *default_user,
+	      const char      *default_domain,
+	      GAskPasswordFlags flags)
+{
+	GtkWidget *dialog;
+
+	dialog = gnome_password_dialog_new (_("Enter Password"),
+					    message,
+					    default_user,
+					    "",
+					    FALSE);
+
+	gnome_password_dialog_set_show_password (GNOME_PASSWORD_DIALOG (dialog),
+						 flags & G_ASK_PASSWORD_NEED_PASSWORD);
+	
+	gnome_password_dialog_set_show_username (GNOME_PASSWORD_DIALOG (dialog),
+						 flags & G_ASK_PASSWORD_NEED_USERNAME);
+	gnome_password_dialog_set_show_domain (GNOME_PASSWORD_DIALOG (dialog),
+					       flags & G_ASK_PASSWORD_NEED_DOMAIN);
+	gnome_password_dialog_set_show_userpass_buttons	(GNOME_PASSWORD_DIALOG (dialog),
+							 flags & G_ASK_PASSWORD_ANONYMOUS_SUPPORTED);
+	gnome_password_dialog_set_show_remember (GNOME_PASSWORD_DIALOG (dialog),
+						 flags & G_ASK_PASSWORD_SAVING_SUPPORTED);
+	
+	if (default_domain) {
+		gnome_password_dialog_set_domain (GNOME_PASSWORD_DIALOG (dialog),
+						  default_domain);
+	}
+		
+	if (BAOBAB_MOUNT_OPERATION (op)->priv->parent_window != NULL) {
+		gtk_window_set_transient_for (GTK_WINDOW (dialog),
+					      BAOBAB_MOUNT_OPERATION (op)->priv->parent_window);
+	}
+
+	g_signal_connect (dialog, "response", 
+			  G_CALLBACK (password_dialog_button_clicked), op);
+
+	set_active (BAOBAB_MOUNT_OPERATION (op), TRUE);
+	gtk_widget_show (GTK_WIDGET (dialog));
+	g_object_ref (op);
+}
+
+
+static void
+question_dialog_button_clicked (GtkDialog *dialog, 
+				gint button_number, 
+				GMountOperation *op)
+{
+	if (button_number >= 0) {
+		g_mount_operation_set_choice (op, button_number);
+		g_mount_operation_reply (op, G_MOUNT_OPERATION_HANDLED);
+	} else {
+		g_mount_operation_reply (op, G_MOUNT_OPERATION_ABORTED);
+	}
+	
+	gtk_widget_destroy (GTK_WIDGET (dialog));
+	set_active (BAOBAB_MOUNT_OPERATION (op), FALSE);
+	g_object_unref (op);
+}
+
+  
+static void
+ask_question (GMountOperation *op,
+	      const char      *message,
+	      const char      *choices[])
+{
+	GtkWidget *dialog;
+	int cnt, len;
+	char *primary;
+	const char *secondary = NULL;
+
+	primary = strstr (message, "\n");
+	if (primary) {
+		secondary = primary + 1;
+		primary = g_strndup (message, strlen (message) - strlen (primary));
+	}
+	
+	dialog = gtk_message_dialog_new (BAOBAB_MOUNT_OPERATION (op)->priv->parent_window,
+					 0, GTK_MESSAGE_QUESTION,
+					 GTK_BUTTONS_NONE, "%s", primary != NULL ? primary : message);
+	g_free (primary);
+
+	if (secondary) {
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+							  "%s", secondary);
+	}
+	
+	if (choices) {
+		/* First count the items in the list then 
+		 * add the buttons in reverse order */
+		for (len = 0; choices[len] != NULL; len++) {
+			;
+		}
+		
+		for (cnt = len - 1; cnt >= 0; cnt--) {
+			gtk_dialog_add_button (GTK_DIALOG (dialog), choices[cnt], cnt);
+		}
+	}
+
+
+	g_signal_connect (GTK_OBJECT(dialog), "response", 
+			  G_CALLBACK (question_dialog_button_clicked), op);
+
+	set_active (BAOBAB_MOUNT_OPERATION (op), TRUE);
+	
+	gtk_widget_show (GTK_WIDGET (dialog));
+
+	g_object_ref (op);
+}
+
+static void
+baobab_mount_operation_class_init (BaobabMountOperationClass *klass)
+{
+	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+	GMountOperationClass *gmountoperation_class = G_MOUNT_OPERATION_CLASS (klass);
+
+	g_type_class_add_private (klass, sizeof (BaobabMountOperationPrivate));
+	
+	gobject_class->finalize = baobab_mount_operation_finalize;
+	
+	gmountoperation_class->ask_password = ask_password;
+	gmountoperation_class->ask_question = ask_question;
+
+
+	signals[ACTIVE_CHANGED] =
+		g_signal_new (I_("active_changed"),
+			      G_TYPE_FROM_CLASS (gobject_class),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (BaobabMountOperationClass, active_changed),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__BOOLEAN,
+			      G_TYPE_NONE, 1,
+			      G_TYPE_BOOLEAN);
+}
+
+static void
+baobab_mount_operation_init (BaobabMountOperation *operation)
+{
+	operation->priv = G_TYPE_INSTANCE_GET_PRIVATE (operation,
+						       BAOBAB_TYPE_MOUNT_OPERATION,
+						       BaobabMountOperationPrivate);
+}
+
+GMountOperation *
+baobab_mount_operation_new (GtkWindow *parent)
+{
+	BaobabMountOperation *mount_operation;
+
+	mount_operation = g_object_new (baobab_mount_operation_get_type (), NULL);
+
+	if (parent) {
+		mount_operation->priv->parent_window = g_object_ref (parent);
+	}
+
+	return G_MOUNT_OPERATION (mount_operation);
+}
+
+

Added: trunk/baobab/src/baobab-mount-operation.h
==============================================================================
--- (empty file)
+++ trunk/baobab/src/baobab-mount-operation.h	Mon May  5 17:31:55 2008
@@ -0,0 +1,78 @@
+/* Baobab - (C) 2005-2008 Fabio Marzocca
+
+	baobab-mount-operation.h
+
+   Modified module from from eel-mount-operation.h
+   Released under same licence
+   
+ */
+
+/* eel-mount-operation.h - Gtk+ implementation for GMountOperation
+
+   Copyright (C) 2007 Red Hat, Inc.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Author: Alexander Larsson <alexl redhat com>
+*/
+
+#ifndef BAOBAB_MOUNT_OPERATION_H
+#define BAOBAB_MOUNT_OPERATION_H
+
+#include <glib.h>
+#include <gio/gio.h>
+#include <gtk/gtkwindow.h>
+
+G_BEGIN_DECLS
+
+#define BAOBAB_TYPE_MOUNT_OPERATION         (baobab_mount_operation_get_type ())
+#define BAOBAB_MOUNT_OPERATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BAOBAB_TYPE_MOUNT_OPERATION, BaobabMountOperation))
+#define BAOBAB_MOUNT_OPERATION_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BAOBAB_TYPE_MOUNT_OPERATION, BaobabMountOperationClass))
+#define BAOBAB_IS_MOUNT_OPERATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BAOBAB_TYPE_MOUNT_OPERATION))
+#define BAOBAB_IS_MOUNT_OPERATION_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BAOBAB_TYPE_MOUNT_OPERATION))
+#define BAOBAB_MOUNT_OPERATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BAOBAB_TYPE_MOUNT_OPERATION, BaobabMountOperationClass))
+
+typedef struct BaobabMountOperation	    BaobabMountOperation;
+typedef struct BaobabMountOperationClass       BaobabMountOperationClass;
+typedef struct BaobabMountOperationPrivate     BaobabMountOperationPrivate;
+
+struct BaobabMountOperation
+{
+	GMountOperation parent_instance;
+	
+	BaobabMountOperationPrivate *priv;
+};
+
+struct BaobabMountOperationClass 
+{
+	GMountOperationClass parent_class;
+
+
+	/* signals: */
+
+	void (* active_changed) (BaobabMountOperation *operation,
+				 gboolean is_active);
+};
+
+GType            baobab_mount_operation_get_type (void);
+GMountOperation *baobab_mount_operation_new      (GtkWindow *parent);
+
+G_END_DECLS
+
+#endif /* BAOBAB_MOUNT_OPERATION_H */
+
+
+

Modified: trunk/baobab/src/baobab-remote-connect-dialog.c
==============================================================================
--- trunk/baobab/src/baobab-remote-connect-dialog.c	(original)
+++ trunk/baobab/src/baobab-remote-connect-dialog.c	Mon May  5 17:31:55 2008
@@ -28,6 +28,7 @@
 
 #include <config.h>
 #include "baobab-remote-connect-dialog.h"
+#include "baobab-mount-operation.h"
 
 #include <string.h>
 #include <glib/gi18n.h>
@@ -121,8 +122,8 @@
 {
 	GMountOperation *op;
 
-/*	op = eel_mount_operation_new (GTK_WINDOW (widget));*/
-	op = g_mount_operation_new ();
+	op = baobab_mount_operation_new (GTK_WINDOW (widget));
+
 	g_file_mount_enclosing_volume (location,
 				       0, op,
 				       NULL,

Modified: trunk/baobab/src/baobab-scan.c
==============================================================================
--- trunk/baobab/src/baobab-scan.c	(original)
+++ trunk/baobab/src/baobab-scan.c	Mon May  5 17:31:55 2008
@@ -185,10 +185,6 @@
  
 	parse_name = g_file_get_parse_name (file);	
 
-	/* Folders we can't access (e.g perms 644). Skip'em. */
-	if (!g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_READ))
-		goto exit;
-
 	if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_SIZE))
 		retloop.size = g_file_info_get_size (info);
 
@@ -211,8 +207,10 @@
 					       &err);
 
 	if (file_enum == NULL) {
-		g_warning ("couldn't get dir enum for dir %s: %s\n",
-			   parse_name, err->message);
+		if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) {
+			g_warning ("couldn't get dir enum for dir %s: %s\n",
+			   	parse_name, err->message);
+		}
 		goto exit;
 	}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]