marlin r1302 - in trunk: . src

[iain svn gnome org]

Author: iain
Date: Thu Oct  9 19:39:36 2008
New Revision: 1302
URL: http://svn.gnome.org/viewvc/marlin?rev=1302&view=rev

Log:
Remove session management


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/ChangeLog
   trunk/src/Makefile.am
   trunk/src/main.c
   trunk/src/marlin-session.c
   trunk/src/marlin-window.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Oct  9 19:39:36 2008
@@ -109,10 +109,11 @@
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 AM_GCONF_SOURCE_2
 
+# Not doing session restoration at the moment
 # Checking for libuuid
-have_uuid=no
-AC_CHECK_LIB(uuid,uuid_generate,have_uuid=yes,AC_MSG_ERROR(You must have the uuid library installed. See http://e2fsprogs.sourceforge.net/ .))
-AC_CHECK_HEADER(uuid/uuid.h,,AC_MSG_ERROR(Headers for uuid not found. Please install the development packages for the uuid library.))
+# have_uuid=no
+# AC_CHECK_LIB(uuid,uuid_generate,have_uuid=yes,AC_MSG_ERROR(You must have the uuid library installed. See http://e2fsprogs.sourceforge.net/ .))
+#AC_CHECK_HEADER(uuid/uuid.h,,AC_MSG_ERROR(Headers for uuid not found. Please install the development packages for the uuid library.))
 
 # Checking for Media Profiles
 PKG_CHECK_MODULES(MEDIA_PROFILES, gnome-media-profiles >= 2.7.0, HAVE_MP=yes,HAVE_MP=no)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Oct  9 19:39:36 2008
@@ -59,8 +59,7 @@
 	       $(top_builddir)/src/libegg/libegg.la	\
 	       $(top_builddir)/src/ephy/libephy.la	\
 	       $(top_builddir)/src/other/libother.la	\
-	       $(top_builddir)/src/dialogs/libdialogs.la	\
-	       -luuid
+	       $(top_builddir)/src/dialogs/libdialogs.la
 
 schemadir = $(sysconfdir)/gconf/schemas
 schema_DATA = marlin.schemas

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Thu Oct  9 19:39:36 2008
@@ -625,6 +625,7 @@
 	g_signal_connect (G_OBJECT (marlin_program), "new-view",
 			  G_CALLBACK (new_view_request_cb), NULL);
 
+#if 0
 	marlin_session_initialise (argv[0]);
 
 	if (marlin_session_is_restored ()) {
@@ -632,12 +633,15 @@
 	} else {
 		process_command_line (program);
 	}
+#else
+	process_command_line (program);
+#endif
 
-	/* After the command line has been processed, 
+	/* After the command line has been processed,
 	   we can free the option context */
 	g_option_context_free (option_ctxt);
 
-	g_signal_connect (unique_app, "message-received", 
+	g_signal_connect (unique_app, "message-received",
 			  G_CALLBACK (app_message_cb), NULL);
 
 	gtk_main ();

Modified: trunk/src/marlin-session.c
==============================================================================
--- trunk/src/marlin-session.c	(original)
+++ trunk/src/marlin-session.c	Thu Oct  9 19:39:36 2008
@@ -19,6 +19,7 @@
  *
  */
 
+#if 0
 #include <libgnome/gnome-config.h>
 #include <libgnomeui/gnome-client.h>
 
@@ -164,3 +165,4 @@
 	
 	return;
 }
+#endif

Modified: trunk/src/marlin-window.c
==============================================================================
--- trunk/src/marlin-window.c	(original)
+++ trunk/src/marlin-window.c	Thu Oct  9 19:39:36 2008
@@ -26,7 +26,9 @@
 #include <time.h>
 #include <unistd.h>
 
+#if 0
 #include <uuid/uuid.h>
+#endif
 
 #include <glib.h>
 
@@ -2437,14 +2439,14 @@
 	} else {
 		set_path_name (ag, "EditRedo", _("Redo"));
 		set_path_tooltip (ag, "EditRedo", _("Redo the last action"));
-	}					  
+	}
 }
 
 MarlinSample *
 marlin_window_get_sample (MarlinWindow *window)
 {
 	g_return_val_if_fail (IS_MARLIN_WINDOW (window), NULL);
-	
+
 	return window->priv->sample;
 }
 
@@ -2498,7 +2500,7 @@
  		marlin_jack_continue (MARLIN_JACK (priv->jack));
 		return;
 	}
-	
+
 	/* Check if we've got a selection */
 	marlin_sample_selection_get (priv->selection, &coverage,
 				     &start, &finish);
@@ -2527,7 +2529,7 @@
 	if (priv->state == MARLIN_STATE_STOPPED) {
 		return;
 	}
-	
+
 	priv->state = MARLIN_STATE_STOPPED;
 
 	marlin_jack_stop (MARLIN_JACK (priv->jack));
@@ -2559,7 +2561,7 @@
 	if (priv->state == MARLIN_STATE_PAUSED) {
 		return;
 	}
-	
+
 	priv->state = MARLIN_STATE_PAUSED;
 	marlin_jack_pause (MARLIN_JACK (priv->jack));
 }
@@ -2578,7 +2580,8 @@
 		marlin_window_stop_sample (window);
 	}
 }
-		
+
+#if 0
 /* Save yourself :) */
 static void
 set_int (GConfClient *client,
@@ -2613,11 +2616,11 @@
 		g_warning ("Cannot save session");
 		return;
 	}
-	
+
 	/* Make a unique ID for this window */
 	uuid_generate (uuid);
 	uuid_unparse (uuid, uid);
-	
+
 	gconf_root = "/apps/marlin/system-state/";
 
 	key = g_strdup_printf ("%s%s", gconf_root, "window-list");
@@ -2634,7 +2637,7 @@
 	}
 
 	/* Create a new string */
-	value = gconf_value_new (GCONF_VALUE_STRING); 
+	value = gconf_value_new (GCONF_VALUE_STRING);
 	gconf_value_set_string (value, uid);
 
 	/* Stick it at the start of the list */
@@ -2656,7 +2659,7 @@
 	key = g_strdup_printf ("%s/filename", window_root);
 	gconf_client_set_string (client, key, filename, NULL);
 	g_free (key);
-	
+
 	/* Geometry */
 	gtk_window_get_position (GTK_WINDOW (window), &x, &y);
 	gtk_window_get_size (GTK_WINDOW (window), &width, &height);
@@ -2707,6 +2710,8 @@
 	g_object_unref (G_OBJECT (client));
 }
 
+#endif
+
 struct _load_op_data {
 	MarlinOperation *op;
 	MarlinPipeline *pipeline;