brasero r1046 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Mon Aug  4 07:27:30 2008
New Revision: 1046
URL: http://svn.gnome.org/viewvc/brasero?rev=1046&view=rev

Log:
	Some more harmless warnings fix

	* src/brasero-project-manager.c (brasero_project_manager_open_uri):
	* src/burn-task-ctx.c (brasero_task_ctx_set_progress):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-project-manager.c
   trunk/src/burn-task-ctx.c

Modified: trunk/src/brasero-project-manager.c
==============================================================================
--- trunk/src/brasero-project-manager.c	(original)
+++ trunk/src/brasero-project-manager.c	Mon Aug  4 07:27:30 2008
@@ -811,16 +811,19 @@
 	  	type = brasero_project_manager_open_by_mime (manager, uri, mime);
         } 
 	else {
+		window = gtk_widget_get_toplevel (GTK_WIDGET (manager));
 	  	dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-					   	GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-					   	GTK_MESSAGE_ERROR,
-					   	GTK_BUTTONS_CLOSE,
-					   	"Error loading project");
+					   	 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+					   	 GTK_MESSAGE_ERROR,
+					   	 GTK_BUTTONS_CLOSE,
+					   	 "Error loading project");
 	  	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
 							  _("The project '%s' does not exist."),
 							  uri);
 	  	gtk_dialog_run (GTK_DIALOG (dialog));
 	  	gtk_widget_destroy (dialog);
+
+		type = BRASERO_PROJECT_TYPE_INVALID;
 	}
 
 	g_free (uri);

Modified: trunk/src/burn-task-ctx.c
==============================================================================
--- trunk/src/burn-task-ctx.c	(original)
+++ trunk/src/burn-task-ctx.c	Mon Aug  4 07:27:30 2008
@@ -626,8 +626,10 @@
 		return BRASERO_BURN_OK;
 	}
 
-	if (priv->timer)
-		elapsed = g_timer_elapsed (priv->timer, NULL);
+	if (!priv->timer)
+		return BRASERO_BURN_OK;
+
+	elapsed = g_timer_elapsed (priv->timer, NULL);
 
 	if ((elapsed - priv->last_elapsed) > 0.5) {
 		priv->last_progress = priv->progress;