brasero r2202 - in trunk: . libbrasero-burn libbrasero-utils src

[philippr svn gnome org]

Author: philippr
Date: Fri Apr  3 07:55:37 2009
New Revision: 2202
URL: http://svn.gnome.org/viewvc/brasero?rev=2202&view=rev

Log:
2009-04-03  Philippe Rouquier  <bonfire-app wanadoo fr>

	After giving it some thougths revert a change:
	X session handling should and will not be handled by library but by apps
	so move back the egg files back to brasero source directory
	Added a gboolean value to cancel unconditionally an ongoing burn process

	* libbrasero-burn/brasero-burn-dialog.c
	(brasero_burn_dialog_cancel),
	(brasero_burn_dialog_cancel_clicked_cb),
	(brasero_burn_dialog_tray_cancel_cb):
	* libbrasero-burn/brasero-burn-dialog.h:
	* libbrasero-burn/brasero-burn.c (brasero_burn_new):
	* libbrasero-utils/Makefile.am:
	* libbrasero-utils/eggdesktopfile.c:
	* libbrasero-utils/eggdesktopfile.h:
	* libbrasero-utils/eggsmclient-private.h:
	* libbrasero-utils/eggsmclient-xsmp.c:
	* libbrasero-utils/eggsmclient.c:
	* libbrasero-utils/eggsmclient.h:
	* src/Makefile.am:
	* src/brasero-app.c (brasero_app_save_contents):

Added:
   trunk/src/eggdesktopfile.c
      - copied unchanged from r2200, /trunk/libbrasero-utils/eggdesktopfile.c
   trunk/src/eggdesktopfile.h
      - copied unchanged from r2200, /trunk/libbrasero-utils/eggdesktopfile.h
   trunk/src/eggsmclient-private.h
      - copied unchanged from r2200, /trunk/libbrasero-utils/eggsmclient-private.h
   trunk/src/eggsmclient-xsmp.c
      - copied unchanged from r2200, /trunk/libbrasero-utils/eggsmclient-xsmp.c
   trunk/src/eggsmclient.c
      - copied unchanged from r2200, /trunk/libbrasero-utils/eggsmclient.c
   trunk/src/eggsmclient.h
      - copied unchanged from r2200, /trunk/libbrasero-utils/eggsmclient.h
Removed:
   trunk/libbrasero-utils/eggdesktopfile.c
   trunk/libbrasero-utils/eggdesktopfile.h
   trunk/libbrasero-utils/eggsmclient-private.h
   trunk/libbrasero-utils/eggsmclient-xsmp.c
   trunk/libbrasero-utils/eggsmclient.c
   trunk/libbrasero-utils/eggsmclient.h
Modified:
   trunk/ChangeLog
   trunk/libbrasero-burn/brasero-burn-dialog.c
   trunk/libbrasero-burn/brasero-burn-dialog.h
   trunk/libbrasero-burn/brasero-burn.c
   trunk/libbrasero-utils/Makefile.am
   trunk/src/Makefile.am
   trunk/src/brasero-app.c

Modified: trunk/libbrasero-burn/brasero-burn-dialog.c
==============================================================================
--- trunk/libbrasero-burn/brasero-burn-dialog.c	(original)
+++ trunk/libbrasero-burn/brasero-burn-dialog.c	Fri Apr  3 07:55:37 2009
@@ -2090,12 +2090,13 @@
 }
 
 gboolean
-brasero_burn_dialog_cancel (BraseroBurnDialog *dialog)
+brasero_burn_dialog_cancel (BraseroBurnDialog *dialog,
+			    gboolean force_cancellation)
 {
 	if (!dialog->priv->burn)
 		return TRUE;
 
-	if (brasero_burn_cancel (dialog->priv->burn, TRUE) == BRASERO_BURN_DANGEROUS) {
+	if (brasero_burn_cancel (dialog->priv->burn, (force_cancellation == TRUE)) == BRASERO_BURN_DANGEROUS) {
 		if (!brasero_burn_dialog_cancel_dialog (GTK_WIDGET (dialog)))
 			return FALSE;
 
@@ -2122,14 +2123,14 @@
 				       BraseroBurnDialog *dialog)
 {
 	/* a burning is ongoing cancel it */
-	brasero_burn_dialog_cancel (dialog);
+	brasero_burn_dialog_cancel (dialog, FALSE);
 }
 
 static void
 brasero_burn_dialog_tray_cancel_cb (BraseroTrayIcon *tray,
 				    BraseroBurnDialog *dialog)
 {
-	brasero_burn_dialog_cancel (dialog);
+	brasero_burn_dialog_cancel (dialog, FALSE);
 }
 
 static void

Modified: trunk/libbrasero-burn/brasero-burn-dialog.h
==============================================================================
--- trunk/libbrasero-burn/brasero-burn-dialog.h	(original)
+++ trunk/libbrasero-burn/brasero-burn-dialog.h	Fri Apr  3 07:55:37 2009
@@ -63,6 +63,7 @@
 brasero_burn_dialog_run (BraseroBurnDialog *dialog,
 			 BraseroBurnSession *session);
 gboolean
-brasero_burn_dialog_cancel (BraseroBurnDialog *dialog);
+brasero_burn_dialog_cancel (BraseroBurnDialog *dialog,
+			    gboolean force_cancellation);
 
 #endif				/* BURN_DIALOG_H */

Modified: trunk/libbrasero-burn/brasero-burn.c
==============================================================================
--- trunk/libbrasero-burn/brasero-burn.c	(original)
+++ trunk/libbrasero-burn/brasero-burn.c	Fri Apr  3 07:55:37 2009
@@ -163,11 +163,7 @@
 BraseroBurn *
 brasero_burn_new ()
 {
-	BraseroBurn *obj;
-	
-	obj = BRASERO_BURN (g_object_new (BRASERO_TYPE_BURN, NULL));
-
-	return obj;
+	return g_object_new (BRASERO_TYPE_BURN, NULL);
 }
 
 static void

Modified: trunk/libbrasero-utils/Makefile.am
==============================================================================
--- trunk/libbrasero-utils/Makefile.am	(original)
+++ trunk/libbrasero-utils/Makefile.am	Fri Apr  3 07:55:37 2009
@@ -9,16 +9,16 @@
 	-DBRASERO_LIBDIR=\"$(libdir)\"  	         		\
 	$(DISABLE_DEPRECATED)						\
 	$(BRASERO_GLIB_CFLAGS)						\
-	$(BRASERO_GTK_CFLAGS)						\
-	$(BRASERO_SM_CFLAGS)
+	$(BRASERO_GTK_CFLAGS)
+
 
 lib_LTLIBRARIES = \
 	libbrasero-utils.la
 
 libbrasero_utils_la_LIBADD =					\
 	$(BRASERO_GLIB_LIBS)					\
-	$(BRASERO_GTK_LIBS)					\
-	$(BRASERO_SM_LIBS)
+	$(BRASERO_GTK_LIBS)
+
 
 libbrasero_utils_la_LDFLAGS =					\
 	-version-info $(LIBBRASERO_LT_VERSION)			\
@@ -44,13 +44,7 @@
 	brasero-jacket-view.c        \
 	brasero-jacket-view.h        \
 	brasero-tool-color-picker.c        \
-	brasero-tool-color-picker.h        \
-	eggdesktopfile.c        \
-	eggdesktopfile.h        \
-	eggsmclient.c        \
-	eggsmclient.h        \
-	eggsmclient-private.h        \
-	eggsmclient-xsmp.c
+	brasero-tool-color-picker.h
 
 # EXTRA_DIST =			\
 #	libbrasero-utils.symbols

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Apr  3 07:55:37 2009
@@ -22,7 +22,8 @@
 	$(BRASERO_DBUS_CFLAGS)						\
 	$(BRASERO_LIBXML_CFLAGS)					\
 	$(BRASERO_BEAGLE_CFLAGS)					\
-	$(BRASERO_PL_PARSER_CFLAGS)
+	$(BRASERO_PL_PARSER_CFLAGS)					\
+	$(BRASERO_SM_CFLAGS)
 
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 RECMARSHALFILES = brasero-marshal.h brasero-marshal.c
@@ -139,7 +140,13 @@
 	brasero-project-parse.c           \
 	brasero-project-parse.h           \
 	brasero-xsession.c           \
-	brasero-xsession.h
+	brasero-xsession.h		\
+	eggdesktopfile.c        \
+	eggdesktopfile.h        \
+	eggsmclient.c        \
+	eggsmclient.h        \
+	eggsmclient-private.h        \
+	eggsmclient-xsmp.c
 
 if BUILD_INOTIFY
 brasero_SOURCES += brasero-file-monitor.c brasero-file-monitor.h
@@ -159,7 +166,8 @@
 	$(BRASERO_DBUS_LIBS)		\
 	$(BRASERO_LIBXML_LIBS)		\
 	$(BRASERO_BEAGLE_LIBS)		\
-	$(BRASERO_PL_PARSER_LIBS)
+	$(BRASERO_PL_PARSER_LIBS)	\
+	$(BRASERO_SM_LIBS)
 
 EXTRA_DIST =			\
 	brasero-marshal.list

Modified: trunk/src/brasero-app.c
==============================================================================
--- trunk/src/brasero-app.c	(original)
+++ trunk/src/brasero-app.c	Fri Apr  3 07:55:37 2009
@@ -416,7 +416,7 @@
 
 	if (priv->burn_dialog) {
 		if (cancellable)
-			return (brasero_burn_dialog_cancel (BRASERO_BURN_DIALOG (priv->burn_dialog)) == FALSE);
+			return (brasero_burn_dialog_cancel (BRASERO_BURN_DIALOG (priv->burn_dialog), FALSE) == FALSE);
 
 		gtk_widget_destroy (priv->burn_dialog);
 		return FALSE;