gnome-system-tools r4104 - trunk/src/shares

[carlosg svn gnome org]

Author: carlosg
Date: Sun Jan 13 19:28:45 2008
New Revision: 4104
URL: http://svn.gnome.org/viewvc/gnome-system-tools?rev=4104&view=rev

Log:
2008-01-13  Carlos Garnacho  <carlosg gnome org>

        * main.c (init_standalone_dialog): Removed, do not run the standalone
        dialog here.
        (main): set path in the standalone case, run always the main loop, as
        we now have to wait until the config is loaded before running the
        dialog.
        * shares-tool.[ch] (gst_shares_tool_update_gui): Instead run it here
        now that the config has been retrieved.
        * share-settings.c (share_settings_dialog_run_for_iter): quit the main
        loop after running the standalone dialog.


Modified:
   trunk/src/shares/ChangeLog
   trunk/src/shares/main.c
   trunk/src/shares/share-settings.c
   trunk/src/shares/shares-tool.c
   trunk/src/shares/shares-tool.h

Modified: trunk/src/shares/main.c
==============================================================================
--- trunk/src/shares/main.c	(original)
+++ trunk/src/shares/main.c	Sun Jan 13 19:28:45 2008
@@ -87,14 +87,6 @@
 }
 
 void
-init_standalone_dialog (GstTool     *tool,
-			const gchar *path)
-{
-	gst_tool_update_gui (tool);
-	share_settings_dialog_run (path, TRUE);
-}
-
-void
 initialize_filters (void)
 {
 	gst_filter_init (GTK_ENTRY (gst_dialog_get_widget (tool->main_dialog, "share_nfs_address")), GST_FILTER_IPV4);
@@ -122,11 +114,11 @@
 	initialize_filters ();
 
 	if (path)
-		init_standalone_dialog (tool, path);
-	else {
+		GST_SHARES_TOOL (tool)->path = path;
+	else
 		gtk_widget_show (GTK_WIDGET (tool->main_dialog));
-		gtk_main ();
-	}
+
+	gtk_main ();
 
 	return 0;
 }

Modified: trunk/src/shares/share-settings.c
==============================================================================
--- trunk/src/shares/share-settings.c	(original)
+++ trunk/src/shares/share-settings.c	Sun Jan 13 19:28:45 2008
@@ -469,7 +469,7 @@
 		gtk_window_set_title (GTK_WINDOW (dialog), "Share Folder");
 
 		if (!path) {
-			/* make sure the path gets filled */
+			/* make sure the path entry gets filled in */
 			file_chooser = gst_dialog_get_widget (tool->main_dialog, "share_path");
 			path = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (file_chooser));
 		}
@@ -508,4 +508,7 @@
 
 	if (list_iter)
 		oobs_list_iter_free (list_iter);
+
+	if (standalone)
+		gtk_main_quit ();
 }

Modified: trunk/src/shares/shares-tool.c
==============================================================================
--- trunk/src/shares/shares-tool.c	(original)
+++ trunk/src/shares/shares-tool.c	Sun Jan 13 19:28:45 2008
@@ -189,6 +189,11 @@
 	}
 
 	users_table_set_config (shares_tool);
+
+	if (shares_tool->path) {
+		gst_dialog_authenticate (tool->main_dialog);
+		share_settings_dialog_run (shares_tool->path, TRUE);
+	}
 }
 
 static void

Modified: trunk/src/shares/shares-tool.h
==============================================================================
--- trunk/src/shares/shares-tool.h	(original)
+++ trunk/src/shares/shares-tool.h	Sun Jan 13 19:28:45 2008
@@ -49,8 +49,10 @@
 	OobsObject *ifaces_config;
 	OobsObject *users_config;
 
-	gboolean smb_available : 1;
-	gboolean nfs_available : 1;
+	gchar *path;
+
+	guint smb_available : 1;
+	guint nfs_available : 1;
 };
 
 struct _GstSharesToolClass {