Remove direct deps on bonobo, bonobo-activation, orbit2,

2008-10-01  Alexander Larsson  <alexl@redhat.com>

        * configure.in:
	Remove direct deps on bonobo, bonobo-activation, orbit2, startup-notification
	Add dependency on libunique
	
        * src/Makefile.am:
        * src/nautilus-shell-interface.idl:
        * src/nautilus-shell.[ch]:
	Remove NautilusShell
	
        * src/nautilus-application.[ch]:
	Make NautilusApplication a normal GObject
	Remove NautilusShell use.
	Implement unique application functionallity using libunique
	Remove manual startup notification handling (mostly handled by libunique)
	
        * src/nautilus-main.c:
	Remove bonobo initialization
	Remove manual startup notification handling
	Move command line arg to uri parsing here
	Remove weird idle handling now that we don't use bonobo anymore

        * libnautilus-private/nautilus-undo-manager.c:
        * libnautilus-private/nautilus-undo-manager.h:
        * libnautilus-private/nautilus-undo.c:
        * src/nautilus-window-private.h:
	Remove all leftover spurious use of bonobo
	
        * src/nautilus-window-slot.h:
        * src/nautilus-desktop-window.c:
        * src/nautilus-location-dialog.c:
        * src/nautilus-window-bookmarks.c:
	Add required includes of gi18n.h
	


svn path=/trunk/; revision=14677

1 files changed, 5 insertions, 7 deletions

diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index 29e7edd6d..72de3c965 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -29,7 +29,7 @@
 
 #include <gdk/gdk.h>
 #include <gio/gio.h>
-#include <bonobo/bonobo-generic-factory.h>
+#include <unique/unique.h>
 #include <libnautilus-private/nautilus-undo-manager.h>
 
 #define NAUTILUS_DESKTOP_ICON_VIEW_IID	"OAFIID:Nautilus_File_Manager_Desktop_Icon_View"
@@ -53,16 +53,15 @@ typedef struct _NautilusSpatialWindow NautilusSpatialWindow;
 typedef struct NautilusShell NautilusShell;
 
 typedef struct {
-	BonoboGenericFactory parent;
+	GObject parent;
+	UniqueApp *unique_app;
 	NautilusUndoManager *undo_manager;
-	NautilusShell *shell;
-	gboolean shell_registered;
 	GVolumeMonitor *volume_monitor;
 	unsigned int automount_idle_id;
 } NautilusApplication;
 
 typedef struct {
-	BonoboGenericFactoryClass parent_class;
+	GObjectClass parent_class;
 } NautilusApplicationClass;
 
 GType                nautilus_application_get_type          (void);
@@ -73,10 +72,9 @@ void                 nautilus_application_startup           (NautilusApplication
 							     gboolean             no_default_window,
 							     gboolean             no_desktop,
 							     gboolean             browser_window,
-							     const char          *startup_id,
 							     const char          *default_geometry,
 							     const char          *session_to_load,
-							     const char          *urls[]);
+							     char               **urls);
 GList *              nautilus_application_get_window_list           (void);
 GList *              nautilus_application_get_spatial_window_list    (void);
 unsigned int         nautilus_application_get_n_windows            (void);