[brasero] Fix for building brasero after last merge

[Philippe Rouquier <philippr src gnome org>]

commit f7a93314b7ff2f2b46c14c3580684c7382652351
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sun Jun 21 22:55:55 2009 +0200

    Fix for building brasero after last merge

 src/brasero-data-disc.c |   67 +++++++++++++---------------------------------
 1 files changed, 19 insertions(+), 48 deletions(-)
---
diff --git a/src/brasero-data-disc.c b/src/brasero-data-disc.c
index 6f97320..9f06380 100644
--- a/src/brasero-data-disc.c
+++ b/src/brasero-data-disc.c
@@ -713,59 +713,39 @@ brasero_data_disc_unknown_uri_cb (BraseroTrackDataCfg *vfs,
 }
 
 static void
-brasero_data_disc_use_joliet_response_cb (BraseroDiscMessage *message,
-					  GtkResponseType response,
-					  BraseroDataDisc *self)
-{
-	BraseroDataDiscPrivate *priv;
-
-	priv = BRASERO_DATA_DISC_PRIVATE (self);
-	if (response == GTK_RESPONSE_YES)
-		brasero_track_data_add_fs (BRASERO_TRACK_DATA (priv->project),
-					   BRASERO_IMAGE_FS_JOLIET);
-	else
-		brasero_track_data_rm_fs (BRASERO_TRACK_DATA (priv->project),
-					  BRASERO_IMAGE_FS_JOLIET);
-}
-
-static void
 brasero_data_disc_joliet_rename_cb (BraseroTrackDataCfg *project,
 				    BraseroDataDisc *self)
 {
 	BraseroDataDiscPrivate *priv;
-	GtkWidget *message;
+	GtkWidget *dialog;
 	gchar *secondary;
+	gint answer;
 
 	priv = BRASERO_DATA_DISC_PRIVATE (self);
+
+	dialog = brasero_app_dialog (brasero_app_get_default (),
+				     _("Should files be renamed to be fully Windows-compatible?"),
+				     GTK_BUTTONS_NONE,
+				     GTK_MESSAGE_WARNING);
 	secondary = g_strdup_printf ("%s\n%s",
 				     _("Some files don't have a suitable name for a fully Windows-compatible CD."),
 				     _("Those names should be changed and truncated to 64 characters."));
-
-	message = brasero_notify_message_add (BRASERO_NOTIFY (priv->message),
-					      _("Should files be renamed to be fully Windows-compatible?"),
-					      secondary,
-					      -1,
-					      BRASERO_NOTIFY_CONTEXT_SIZE);
+	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", secondary);
 	g_free (secondary);
 
-	brasero_disc_message_set_image (BRASERO_DISC_MESSAGE (message),
-					GTK_STOCK_DIALOG_WARNING);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Rename for Full Windows Compatibility"), GTK_RESPONSE_YES);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Disable Full Windows Compatibility"), GTK_RESPONSE_CANCEL);
 
-	brasero_notify_button_add (BRASERO_NOTIFY (priv->message),
-				   BRASERO_DISC_MESSAGE (message),
-				   _("_Rename for Full Windows Compatibility"),
-				   NULL,
-				   GTK_RESPONSE_YES);
-	brasero_notify_button_add (BRASERO_NOTIFY (priv->message),
-				   BRASERO_DISC_MESSAGE (message),
-				   _("_Disable Full Windows Compatibility"),
-				   NULL,
-				   GTK_RESPONSE_CANCEL);
+	gtk_widget_show_all (dialog);
+	answer = gtk_dialog_run (GTK_DIALOG (dialog));
+	gtk_widget_destroy (dialog);
 
-	g_signal_connect (BRASERO_DISC_MESSAGE (message),
-			  "response",
-			  G_CALLBACK (brasero_data_disc_use_joliet_response_cb),
-			  self);
+	if (answer == GTK_RESPONSE_YES)
+		brasero_track_data_add_fs (BRASERO_TRACK_DATA (priv->project),
+					   BRASERO_IMAGE_FS_JOLIET);
+	else
+		brasero_track_data_rm_fs (BRASERO_TRACK_DATA (priv->project),
+					  BRASERO_IMAGE_FS_JOLIET);
 }
 
 static gboolean
@@ -2095,15 +2075,6 @@ brasero_data_disc_key_released_cb (GtkTreeView *tree,
  * Misc functions
  */
 
-gchar *
-brasero_data_disc_get_scaled_icon_path (BraseroDataDisc *disc)
-{
-	BraseroDataDiscPrivate *priv;
-
-	priv = BRASERO_DATA_DISC_PRIVATE (disc);
-	return brasero_track_data_cfg_get_scaled_icon_path (priv->project);
-}
-
 void
 brasero_data_disc_set_right_button_group (BraseroDataDisc *self,
 					  GtkSizeGroup *size_group)