brasero r1634 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Mon Dec 15 20:27:05 2008
New Revision: 1634
URL: http://svn.gnome.org/viewvc/brasero?rev=1634&view=rev

Log:
	Use new gtk+ GtkMountOperation object wherever we can

	* src/brasero-app.c:
	* src/brasero-app.h:
	* src/brasero-io.c (brasero_io_mount_enclosing_volume):
	* src/brasero-utils.h:
	* src/main.c (brasero_app_get_default), (main):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-app.c
   trunk/src/brasero-app.h
   trunk/src/brasero-io.c
   trunk/src/brasero-utils.h
   trunk/src/main.c

Modified: trunk/src/brasero-app.c
==============================================================================
--- trunk/src/brasero-app.c	(original)
+++ trunk/src/brasero-app.c	Mon Dec 15 20:27:05 2008
@@ -930,7 +930,7 @@
 	object_class->finalize = brasero_app_finalize;
 }
 
-GtkWidget *
+BraseroApp *
 brasero_app_new (void)
 {
 	return g_object_new (BRASERO_TYPE_APP,

Modified: trunk/src/brasero-app.h
==============================================================================
--- trunk/src/brasero-app.h	(original)
+++ trunk/src/brasero-app.h	Mon Dec 15 20:27:05 2008
@@ -48,9 +48,12 @@
 
 GType brasero_app_get_type (void) G_GNUC_CONST;
 
-GtkWidget *
+BraseroApp *
 brasero_app_new (void);
 
+BraseroApp *
+brasero_app_get_default (void);
+
 void
 brasero_app_run (BraseroApp *app);
 

Modified: trunk/src/brasero-io.c
==============================================================================
--- trunk/src/brasero-io.c	(original)
+++ trunk/src/brasero-io.c	Mon Dec 15 20:27:05 2008
@@ -34,6 +34,8 @@
 
 #include <gio/gio.h>
 
+#include <gtk/gtk.h>
+
 #ifdef BUILD_PLAYLIST
 #include <totem-pl-parser.h>
 #endif
@@ -516,18 +518,6 @@
 	mount->finished = TRUE;
 }
 
-static void
-brasero_io_mount_ask_password (GMountOperation *operation,
-			       gchar *message,
-			       gchar *default_user,
-			       gchar *default_domain,
-			       GAskPasswordFlags flags,
-			       gpointer user_data)
-{
-	BRASERO_BURN_LOG ("Password asked");
-	g_mount_operation_reply (operation, G_MOUNT_OPERATION_HANDLED);
-}
-
 static gboolean
 brasero_io_mount_enclosing_volume (BraseroIO *self,
 				   GFile *file,
@@ -538,13 +528,7 @@
 	GMountOperation *operation;
 	BraseroIOMount mount = { NULL, };
 
-	operation = g_mount_operation_new ();
-	g_mount_operation_set_anonymous (operation, TRUE);
-	g_signal_connect (operation,
-			  "ask-password",
-			  G_CALLBACK (brasero_io_mount_ask_password),
-			  NULL);
-
+	operation = gtk_mount_operation_new (GTK_WINDOW (brasero_app_get_default ()));
 	g_file_mount_enclosing_volume (file,
 				       G_MOUNT_MOUNT_NONE,
 				       operation,

Modified: trunk/src/brasero-utils.h
==============================================================================
--- trunk/src/brasero-utils.h	(original)
+++ trunk/src/brasero-utils.h	Mon Dec 15 20:27:05 2008
@@ -78,13 +78,6 @@
 void
 brasero_utils_unregister_string (const gchar *string);
 
-GdkPixbuf *
-brasero_utils_get_icon_for_mime (const gchar *mime,
-				 gint size);
-GdkPixbuf *
-brasero_utils_get_icon (const gchar *name,
-			gint size);
-
 GtkWidget *
 brasero_utils_pack_properties (const gchar *title, ...);
 GtkWidget *

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Mon Dec 15 20:27:05 2008
@@ -413,6 +413,18 @@
 	gtk_main ();
 }
 
+static BraseroApp *current_app = NULL;
+
+/**
+ * This is actually declared in brasero-app.h
+ */
+
+BraseroApp *
+brasero_app_get_default (void)
+{
+	return current_app;
+}
+
 int
 main (int argc, char **argv)
 {
@@ -421,7 +433,6 @@
 	GnomeProgram *program;
 #endif
 
-	GtkWidget *app;
 	GOptionContext *context;
 
 	context = g_option_context_new (_("[URI] [URI] ..."));
@@ -470,11 +481,12 @@
 	brasero_enable_multi_DND ();
 	brasero_utils_init ();
 
-	app = brasero_app_new ();
-	if (app == NULL)
+	current_app = brasero_app_new ();
+	if (current_app == NULL)
 		return 1;
 
-	brasero_app_parse_options (BRASERO_APP (app));
+	brasero_app_parse_options (current_app);
+	current_app = NULL;
 
 	brasero_burn_library_shutdown ();