[brasero: 2/18] 2009-04-23 Philippe Rouquier <bonfire-app wanadoo fr>

[Philippe Rouquier <philippr src gnome org>]

commit 9a1ae1eb7133da878e7ac8d3acef90fc592fe491
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Thu Apr 23 21:51:18 2009 +0200

    2009-04-23  Philippe Rouquier  <bonfire-app wanadoo fr>
    
    	A few fixes for libunique recent patch (problems with building)
    
    	* src/Makefile.am:
    	* src/brasero-app.c (brasero_app_run_mainwin):
    	* src/brasero-app.h:
    	* src/brasero-audio-disc.c:
---
 ChangeLog                |    9 +++++++++
 src/Makefile.am          |    2 ++
 src/brasero-app.c        |   10 +++++++---
 src/brasero-app.h        |    2 +-
 src/brasero-audio-disc.c |    2 ++
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68faa00..5c59679 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-04-23  Philippe Rouquier  <bonfire-app wanadoo fr>
 
+	A few fixes for libunique recent patch (problems with building)
+
+	* src/Makefile.am:
+	* src/brasero-app.c (brasero_app_run_mainwin):
+	* src/brasero-app.h:
+	* src/brasero-audio-disc.c:
+
+2009-04-23  Philippe Rouquier  <bonfire-app wanadoo fr>
+
 	Added a new header to be installed
 
 	* libbrasero-burn/Makefile.am:
diff --git a/src/Makefile.am b/src/Makefile.am
index 404d7d2..190fae4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,6 +23,7 @@ INCLUDES = \
 	$(BRASERO_LIBXML_CFLAGS)					\
 	$(BRASERO_BEAGLE_CFLAGS)					\
 	$(BRASERO_PL_PARSER_CFLAGS)					\
+	$(BRASERO_LIBUNIQUE_CFLAGS)					\
 	$(BRASERO_SM_CFLAGS)
 
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
@@ -139,6 +140,7 @@ brasero_LDADD =						\
 	$(BRASERO_LIBXML_LIBS)		\
 	$(BRASERO_BEAGLE_LIBS)		\
 	$(BRASERO_PL_PARSER_LIBS)	\
+	$(BRASERO_LIBUNIQUE_LIBS)	\
 	$(BRASERO_SM_LIBS)
 
 EXTRA_DIST =			\
diff --git a/src/brasero-app.c b/src/brasero-app.c
index 74b7c87..3b6449f 100644
--- a/src/brasero-app.c
+++ b/src/brasero-app.c
@@ -1441,7 +1441,7 @@ brasero_app_create_mainwin (BraseroApp *app)
 	brasero_app_load_window_state (app);
 }
 
-void
+gboolean
 brasero_app_run_mainwin (BraseroApp *app)
 {
 	BraseroAppPrivate *priv;
@@ -1461,11 +1461,15 @@ brasero_app_run_mainwin (BraseroApp *app)
 		response = unique_app_send_message (uapp, UNIQUE_ACTIVATE, NULL);
     		g_object_unref (uapp);
 		uapp = NULL;
-       
-		return response == UNIQUE_RESPONSE_OK;
+
+		/* FIXME: we should tell the user why it did not work. Or is it
+		 * handled by libunique? */
+		return (response == UNIQUE_RESPONSE_OK);
 	}
 
 	gtk_main ();
+
+	return TRUE;
 }
 
 static void
diff --git a/src/brasero-app.h b/src/brasero-app.h
index fea3152..d30c61d 100644
--- a/src/brasero-app.h
+++ b/src/brasero-app.h
@@ -65,7 +65,7 @@ brasero_app_set_toplevel (BraseroApp *app, GtkWindow *window);
 void
 brasero_app_create_mainwin (BraseroApp *app);
 
-void
+gboolean
 brasero_app_run_mainwin (BraseroApp *app);
 
 gboolean
diff --git a/src/brasero-audio-disc.c b/src/brasero-audio-disc.c
index fe8ea7b..c0006db 100644
--- a/src/brasero-audio-disc.c
+++ b/src/brasero-audio-disc.c
@@ -55,6 +55,8 @@
 
 #include "brasero-tags.h"
 
+#include "eggtreemultidnd.h"
+
 #ifdef BUILD_INOTIFY
 
 #include "sys/inotify.h"