Commit 9b0d6977 authored by Philippe Rouquier's avatar Philippe Rouquier

Fix all warnings with gcc 4.6.0

This also fixes a few bugs (return values not used mainly)
parent f571b971
......@@ -147,13 +147,10 @@ static gboolean
brasero_burn_dialog_notify_daemon (BraseroBurnDialog *dialog,
const char *message)
{
BraseroBurnDialogPrivate *priv;
NotifyNotification *notification;
GError *error = NULL;
gboolean result;
priv = BRASERO_BURN_DIALOG_PRIVATE (dialog);
if (!notify_is_initted ()) {
notify_init (_("Brasero notification"));
}
......@@ -1020,13 +1017,12 @@ brasero_burn_dialog_eject_failure_cb (BraseroBurn *burn,
gchar *name;
gchar *string;
gint removal_id;
GtkWindow *window;
GtkWidget *message;
gboolean hide = FALSE;
BraseroBurnDialogPrivate *priv;
priv = BRASERO_BURN_DIALOG_PRIVATE (dialog);
if (!gtk_widget_get_visible (GTK_WIDGET (dialog))) {
gtk_widget_show (GTK_WIDGET (dialog));
hide = TRUE;
......@@ -1034,8 +1030,6 @@ brasero_burn_dialog_eject_failure_cb (BraseroBurn *burn,
g_timer_stop (priv->total_time);
window = GTK_WINDOW (dialog);
name = brasero_drive_get_display_name (drive);
/* Translators: %s is the name of a drive */
string = g_strdup_printf (_("Please eject the disc from \"%s\" manually."), name);
......@@ -1155,16 +1149,10 @@ brasero_burn_dialog_update_title_writing_progress (BraseroBurnDialog *dialog,
BraseroMedia media,
guint percent)
{
BraseroBurnDialogPrivate *priv;
BraseroBurnFlag flags;
gchar *title = NULL;
gchar *icon_name;
guint remains;
priv = BRASERO_BURN_DIALOG_PRIVATE (dialog);
flags = brasero_burn_session_get_flags (priv->session);
/* This is used only when actually writing to a disc */
if (media == BRASERO_MEDIUM_FILE)
title = brasero_burn_dialog_create_dialog_title_for_action (dialog,
......
......@@ -488,52 +488,44 @@ brasero_burn_options_update_valid (BraseroBurnOptions *self)
return;
}
else if (valid == BRASERO_SESSION_NO_INPUT_MEDIUM) {
GtkWidget *message;
if (priv->message_input) {
gtk_widget_show (priv->message_input);
message = brasero_notify_message_add (priv->message_input,
_("Please insert a disc holding data."),
_("There is no inserted disc to copy."),
-1,
BRASERO_NOTIFY_CONTEXT_SIZE);
brasero_notify_message_add (priv->message_input,
_("Please insert a disc holding data."),
_("There is no inserted disc to copy."),
-1,
BRASERO_NOTIFY_CONTEXT_SIZE);
}
}
else if (valid == BRASERO_SESSION_NO_INPUT_IMAGE) {
GtkWidget *message;
if (priv->message_input) {
gtk_widget_show (priv->message_input);
message = brasero_notify_message_add (priv->message_input,
_("Please select a disc image."),
_("There is no selected disc image."),
-1,
BRASERO_NOTIFY_CONTEXT_SIZE);
brasero_notify_message_add (priv->message_input,
_("Please select a disc image."),
_("There is no selected disc image."),
-1,
BRASERO_NOTIFY_CONTEXT_SIZE);
}
}
else if (valid == BRASERO_SESSION_UNKNOWN_IMAGE) {
GtkWidget *message;
if (priv->message_input) {
gtk_widget_show (priv->message_input);
message = brasero_notify_message_add (priv->message_input,
/* Translators: this is a disc image not a picture */
C_("disc", "Please select another image."),
_("It doesn't appear to be a valid disc image or a valid cue file."),
-1,
BRASERO_NOTIFY_CONTEXT_SIZE);
brasero_notify_message_add (priv->message_input,
/* Translators: this is a disc image not a picture */
C_("disc", "Please select another image."),
_("It doesn't appear to be a valid disc image or a valid cue file."),
-1,
BRASERO_NOTIFY_CONTEXT_SIZE);
}
}
else if (valid == BRASERO_SESSION_DISC_PROTECTED) {
GtkWidget *message;
if (priv->message_input) {
gtk_widget_show (priv->message_input);
message = brasero_notify_message_add (priv->message_input,
_("Please insert a disc that is not copy protected."),
_("All required applications and libraries are not installed."),
-1,
BRASERO_NOTIFY_CONTEXT_SIZE);
brasero_notify_message_add (priv->message_input,
_("Please insert a disc that is not copy protected."),
_("All required applications and libraries are not installed."),
-1,
BRASERO_NOTIFY_CONTEXT_SIZE);
}
}
else if (valid == BRASERO_SESSION_NOT_SUPPORTED) {
......@@ -545,7 +537,7 @@ brasero_burn_options_update_valid (BraseroBurnOptions *self)
}
else if (valid == BRASERO_SESSION_OVERBURN_NECESSARY) {
GtkWidget *message;
message = brasero_notify_message_add (priv->message_output,
_("Would you like to burn beyond the disc's reported capacity?"),
_("The data size is too large for the disc and you must remove files from the selection otherwise."
......
......@@ -617,10 +617,10 @@ again:
else
error_type = BRASERO_BURN_ERROR_NONE;
if (media & BRASERO_MEDIUM_BLANK) {
if (error_type != BRASERO_BURN_ERROR_NONE) {
result = brasero_burn_ask_for_src_media (burn,
BRASERO_BURN_ERROR_MEDIUM_NO_DATA,
BRASERO_MEDIUM_HAS_DATA,
error_type,
error);
if (result != BRASERO_BURN_OK)
return result;
......@@ -1474,7 +1474,6 @@ brasero_burn_run_recorder (BraseroBurn *burn, GError **error)
{
gint error_code;
BraseroDrive *src;
gboolean has_slept;
BraseroDrive *burner;
GError *ret_error = NULL;
BraseroBurnResult result;
......@@ -1482,8 +1481,6 @@ brasero_burn_run_recorder (BraseroBurn *burn, GError **error)
BraseroMedium *burnt_medium;
BraseroBurnPrivate *priv = BRASERO_BURN_PRIVATE (burn);
has_slept = FALSE;
src = brasero_burn_session_get_src_drive (priv->session);
src_medium = brasero_drive_get_medium (src);
......@@ -1588,8 +1585,6 @@ start:
if (result != BRASERO_BURN_OK)
return result;
has_slept = TRUE;
/* set speed at 8x max and even less if speed */
rate = brasero_burn_session_get_rate (priv->session);
if (rate <= BRASERO_SPEED_TO_RATE_CD (8)) {
......@@ -2280,21 +2275,13 @@ brasero_burn_check_real (BraseroBurn *self,
BraseroTrack *track,
GError **error)
{
BraseroMedium *medium;
BraseroBurnResult result;
BraseroBurnPrivate *priv;
BraseroChecksumType checksum_type;
priv = BRASERO_BURN_PRIVATE (self);
BRASERO_BURN_LOG ("Starting to check track integrity");
checksum_type = brasero_track_get_checksum_type (track);
/* if the input is a DISC and there isn't any checksum specified that
* means the checksum file is on the disc. */
medium = brasero_drive_get_medium (priv->dest);
/* get the task and run it skip it otherwise */
priv->task = brasero_burn_caps_new_checksuming_task (priv->caps,
priv->session,
......@@ -2386,7 +2373,6 @@ brasero_burn_record_session (BraseroBurn *burn,
BraseroBurnPrivate *priv;
BraseroBurnResult result;
GError *ret_error = NULL;
BraseroMedium *medium;
GSList *tracks;
priv = BRASERO_BURN_PRIVATE (burn);
......@@ -2503,8 +2489,6 @@ brasero_burn_record_session (BraseroBurn *burn,
return result;
}
medium = brasero_drive_get_medium (priv->dest);
/* Why do we do this?
* Because for a lot of medium types the size
* of the track return is not the real size of the
......
......@@ -373,7 +373,6 @@ brasero_caps_link_get_data_flags (BraseroCapsLink *link,
/* Go through all plugins the get the supported/... data flags for link */
for (iter = link->plugins; iter; iter = iter->next) {
gboolean result;
BraseroPlugin *plugin;
BraseroBurnFlag plugin_supported;
BraseroBurnFlag plugin_compulsory;
......@@ -382,11 +381,11 @@ brasero_caps_link_get_data_flags (BraseroCapsLink *link,
if (!brasero_plugin_get_active (plugin, ignore_plugin_errors))
continue;
result = brasero_plugin_get_image_flags (plugin,
media,
session_flags,
&plugin_supported,
&plugin_compulsory);
brasero_plugin_get_image_flags (plugin,
media,
session_flags,
&plugin_supported,
&plugin_compulsory);
*supported |= plugin_supported;
}
}
......
......@@ -752,9 +752,6 @@ brasero_data_project_reverse_children (BraseroDataProject *self,
{
gint *array;
BraseroDataProjectClass *klass;
BraseroDataProjectPrivate *priv;
priv = BRASERO_DATA_PROJECT_PRIVATE (self);
array = brasero_file_node_reverse_children (parent);
......@@ -1018,13 +1015,10 @@ static BraseroURINode *
brasero_data_project_uri_graft_nodes (BraseroDataProject *self,
const gchar *uri)
{
BraseroDataProjectPrivate *priv;
BraseroURINode *graft;
GSList *nodes;
GSList *iter;
priv = BRASERO_DATA_PROJECT_PRIVATE (self);
/* Find all the nodes that should be grafted.
* NOTE: this must be done before asking for a new graft */
nodes = brasero_data_project_uri_to_nodes (self, uri);
......@@ -2883,8 +2877,7 @@ brasero_data_project_get_max_space (BraseroDataProject *self)
else
child_sectors = brasero_data_project_get_folder_sectors (self, children);
max_sectors = MAX (max_sectors, BRASERO_FILE_NODE_SECTORS (children));
max_sectors = MAX (max_sectors, child_sectors);
children = children->next;
}
......@@ -3314,13 +3307,11 @@ brasero_data_project_add_path (BraseroDataProject *self,
GSList *folders)
{
BraseroDataProjectPrivate *priv;
BraseroDataProjectClass *klass;
BraseroFileNode *parent;
BraseroFileNode *node;
BraseroURINode *graft;
priv = BRASERO_DATA_PROJECT_PRIVATE (self);
klass = BRASERO_DATA_PROJECT_GET_CLASS (self);
/* we don't create the last part (after the last separator) of
* the node since we're only interested in the existence of the
......@@ -4126,7 +4117,6 @@ brasero_data_project_file_renamed (BraseroFileMonitor *monitor,
const gchar *old_name,
const gchar *new_name)
{
BraseroDataProjectPrivate *priv;
BraseroFileNode *sibling;
BraseroFileNode *node;
......@@ -4140,8 +4130,6 @@ brasero_data_project_file_renamed (BraseroFileMonitor *monitor,
if (!node)
return;
priv = BRASERO_DATA_PROJECT_PRIVATE (monitor);
/* make sure there isn't the same name in the directory: if so, that's
* simply not possible to rename. So if node is grafted it keeps its
* name if not, it's grafted with the old name. */
......@@ -4357,12 +4345,9 @@ brasero_data_project_file_modified (BraseroFileMonitor *monitor,
const gchar *name)
{
BraseroFileNode *node = callback_data;
BraseroDataProjectPrivate *priv;
BraseroDataProjectClass *klass;
gchar *uri;
priv = BRASERO_DATA_PROJECT_PRIVATE (monitor);
if (node->is_loading)
return;
......
......@@ -299,13 +299,10 @@ brasero_data_vfs_directory_check_symlink_loop (BraseroDataVFS *self,
const gchar *uri,
GFileInfo *info)
{
BraseroDataVFSPrivate *priv;
const gchar *target_uri;
guint target_len;
guint uri_len;
priv = BRASERO_DATA_VFS_PRIVATE (self);
/* Of course for a loop to exist, it must be a directory */
if (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY)
return FALSE;
......@@ -919,11 +916,9 @@ brasero_data_vfs_node_added (BraseroDataProject *project,
BraseroFileNode *node,
const gchar *uri)
{
BraseroDataVFSPrivate *priv;
BraseroDataVFS *self;
self = BRASERO_DATA_VFS (project);
priv = BRASERO_DATA_VFS_PRIVATE (self);
/* URI can be NULL if it's a created directory or if the node
* has just been moved to another location in the tree. */
......
......@@ -241,11 +241,8 @@ brasero_dest_selection_medium_added (GtkTreeModel *model,
static void
brasero_dest_selection_init (BraseroDestSelection *object)
{
BraseroDestSelectionPrivate *priv;
GtkTreeModel *model;
priv = BRASERO_DEST_SELECTION_PRIVATE (object);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (object));
g_signal_connect (model,
"row-inserted",
......@@ -493,11 +490,8 @@ brasero_dest_selection_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
BraseroDestSelectionPrivate *priv;
BraseroBurnSession *session;
priv = BRASERO_DEST_SELECTION_PRIVATE (object);
switch (property_id) {
case PROP_SESSION: /* Readable and only writable at creation time */
/* NOTE: no need to unref a potential previous session since
......
......@@ -204,9 +204,6 @@ brasero_drive_properties_check_tmpdir (BraseroDriveProperties *self,
GFileInfo *info;
GError *error = NULL;
const gchar *filesystem;
BraseroDrivePropertiesPrivate *priv;
priv = BRASERO_DRIVE_PROPERTIES_PRIVATE (self);
file = g_file_new_for_commandline_arg (path);
if (!file)
......@@ -399,10 +396,6 @@ static void
brasero_drive_properties_set_tmpdir (BraseroDriveProperties *self,
const gchar *path)
{
BraseroDrivePropertiesPrivate *priv;
priv = BRASERO_DRIVE_PROPERTIES_PRIVATE (self);
if (!path)
path = g_get_tmp_dir ();
......
......@@ -106,12 +106,9 @@ brasero_filtered_uri_filter (BraseroFilteredUri *filtered,
const gchar *uri,
BraseroFilterStatus status)
{
BraseroFilteredUriPrivate *priv;
GtkTreeIter iter;
gboolean fatal;
priv = BRASERO_FILTERED_URI_PRIVATE (filtered);
gtk_list_store_append (GTK_LIST_STORE (filtered), &iter);
fatal = (status != BRASERO_FILTER_HIDDEN && status != BRASERO_FILTER_BROKEN_SYM);
......
......@@ -89,9 +89,6 @@ brasero_image_properties_get_format (BraseroImageProperties *self)
static gchar *
brasero_image_properties_get_path (BraseroImageProperties *self)
{
BraseroImagePropertiesPrivate *priv;
priv = BRASERO_IMAGE_PROPERTIES_PRIVATE (self);
return gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (self));
}
......@@ -99,9 +96,6 @@ static void
brasero_image_properties_set_path (BraseroImageProperties *self,
const gchar *path)
{
BraseroImagePropertiesPrivate *priv;
priv = BRASERO_IMAGE_PROPERTIES_PRIVATE (self);
if (path) {
gchar *name;
......@@ -426,10 +420,6 @@ brasero_image_properties_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
BraseroImagePropertiesPrivate *priv;
priv = BRASERO_IMAGE_PROPERTIES_PRIVATE (object);
switch (property_id) {
case PROP_SESSION: /* Readable and only writable at creation time */
brasero_image_properties_set_session (BRASERO_IMAGE_PROPERTIES (object),
......@@ -464,11 +454,8 @@ brasero_image_properties_get_property (GObject *object,
static void
brasero_image_properties_init (BraseroImageProperties *object)
{
BraseroImagePropertiesPrivate *priv;
GtkWidget *box;
priv = BRASERO_IMAGE_PROPERTIES_PRIVATE (object);
gtk_window_set_title (GTK_WINDOW (object), _("Location for Image File"));
box = gtk_dialog_get_content_area (GTK_DIALOG (object));
gtk_container_set_border_width (GTK_CONTAINER (box), 10);
......
......@@ -342,10 +342,6 @@ brasero_image_type_chooser_init (BraseroImageTypeChooser *obj)
static void
brasero_image_type_chooser_finalize (GObject *object)
{
BraseroImageTypeChooserPrivate *priv;
priv = BRASERO_IMAGE_TYPE_CHOOSER_PRIVATE (object);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
......
......@@ -120,12 +120,9 @@ static gboolean
brasero_medium_properties_wrong_extension (BraseroSessionCfg *session,
BraseroMediumProperties *self)
{
guint answer;
GtkWidget *dialog;
GtkWidget *toplevel;
GtkResponseType answer;
BraseroMediumPropertiesPrivate *priv;
priv = BRASERO_MEDIUM_PROPERTIES_PRIVATE (self);
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (self));
dialog = gtk_message_dialog_new (GTK_WINDOW (toplevel),
......@@ -233,10 +230,6 @@ brasero_medium_properties_output_changed (BraseroBurnSession *session,
static void
brasero_medium_properties_init (BraseroMediumProperties *object)
{
BraseroMediumPropertiesPrivate *priv;
priv = BRASERO_MEDIUM_PROPERTIES_PRIVATE (object);
gtk_widget_set_tooltip_text (GTK_WIDGET (object), _("Configure recording options"));
}
......
......@@ -550,7 +550,6 @@ brasero_session_cfg_set_drive_properties_flags (BraseroSessionCfg *self,
BraseroBurnFlag flags)
{
BraseroDrive *drive;
BraseroMedia media;
BraseroBurnFlag flag;
BraseroMedium *medium;
BraseroBurnResult result;
......@@ -586,8 +585,6 @@ brasero_session_cfg_set_drive_properties_flags (BraseroSessionCfg *self,
return;
}
media = brasero_medium_get_status (medium);
/* This prevents signals to be emitted while (re-) adding them one by one */
g_object_freeze_notify (G_OBJECT (self));
......@@ -691,11 +688,8 @@ brasero_session_cfg_rm_drive_properties_flags (BraseroSessionCfg *self,
static void
brasero_session_cfg_check_drive_settings (BraseroSessionCfg *self)
{
BraseroSessionCfgPrivate *priv;
BraseroBurnFlag flags;
priv = BRASERO_SESSION_CFG_PRIVATE (self);
/* Try to properly update the flags for the current drive */
flags = brasero_burn_session_get_flags (BRASERO_BURN_SESSION (self));
if (brasero_burn_session_same_src_dest_drive (BRASERO_BURN_SESSION (self))) {
......@@ -1466,10 +1460,6 @@ void
brasero_session_cfg_remove_flags (BraseroSessionCfg *session,
BraseroBurnFlag flags)
{
BraseroSessionCfgPrivate *priv;
priv = BRASERO_SESSION_CFG_PRIVATE (session);
brasero_burn_session_remove_flag (BRASERO_BURN_SESSION (session), flags);
/* For this case reset all flags as some flags could
......
......@@ -196,9 +196,6 @@ static void
brasero_burn_session_start_track_monitoring (BraseroBurnSession *self,
BraseroTrack *track)
{
BraseroBurnSessionPrivate *priv;
priv = BRASERO_BURN_SESSION_PRIVATE (self);
g_signal_connect (track,
"changed",
G_CALLBACK (brasero_burn_session_track_changed),
......@@ -1382,9 +1379,6 @@ brasero_burn_session_get_image_complement (BraseroBurnSession *self,
const gchar *path)
{
gchar *retval = NULL;
BraseroBurnSessionPrivate *priv;
priv = BRASERO_BURN_SESSION_PRIVATE (self);
if (format == BRASERO_IMAGE_FORMAT_CLONE)
retval = g_strdup_printf ("%s.toc", path);
......@@ -2177,12 +2171,9 @@ brasero_burn_session_log (BraseroBurnSession *self,
...)
{
va_list args;
BraseroBurnSessionPrivate *priv;
g_return_if_fail (BRASERO_IS_BURN_SESSION (self));
priv = BRASERO_BURN_SESSION_PRIVATE (self);
va_start (args, format);
brasero_burn_session_logv (self, format, args);
va_end (args);
......@@ -2489,12 +2480,8 @@ brasero_burn_session_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
BraseroBurnSessionPrivate *priv;
g_return_if_fail (BRASERO_IS_BURN_SESSION (object));
priv = BRASERO_BURN_SESSION_PRIVATE (object);
switch (prop_id)
{
case PROP_TMPDIR:
......
......@@ -154,9 +154,6 @@ brasero_status_dialog_update (BraseroStatusDialog *self,
static void
brasero_status_dialog_session_ready (BraseroStatusDialog *dialog)
{
BraseroStatusDialogPrivate *priv;
priv = BRASERO_STATUS_DIALOG_PRIVATE (dialog);
gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
}
......
......@@ -170,11 +170,8 @@ static GtkTreePath *
brasero_track_data_cfg_node_to_path (BraseroTrackDataCfg *self,
BraseroFileNode *node)
{
BraseroTrackDataCfgPrivate *priv;
GtkTreePath *path;
priv = BRASERO_TRACK_DATA_CFG_PRIVATE (self);
path = gtk_tree_path_new ();
for (; node->parent && !node->is_root; node = node->parent) {
guint nth;
......@@ -597,15 +594,13 @@ brasero_track_data_cfg_node_hidden (GtkTreeModel *model,
static void
brasero_track_data_cfg_get_value (GtkTreeModel *model,
GtkTreeIter *iter,
gint column,
GValue *value)
GtkTreeIter *iter,
gint column,
GValue *value)
{
BraseroTrackDataCfgPrivate *priv;
BraseroTrackDataCfg *self;
BraseroFileNode *node;
self = BRASERO_TRACK_DATA_CFG (model);
priv = BRASERO_TRACK_DATA_CFG_PRIVATE (model);
/* make sure that iter comes from us */
......@@ -1120,10 +1115,10 @@ brasero_track_data_cfg_drag_data_received (GtkTreeDragDest *drag_dest,
GtkTreePath *dest_path,
GtkSelectionData *selection_data)
{
GdkAtom target;
BraseroFileNode *node;
BraseroFileNode *parent;
GtkTreePath *dest_parent;
GdkAtom target;
BraseroTrackDataCfgPrivate *priv;
priv = BRASERO_TRACK_DATA_CFG_PRIVATE (drag_dest);
......@@ -1175,11 +1170,9 @@ brasero_track_data_cfg_drag_data_received (GtkTreeDragDest *drag_dest,
else if (target == gdk_atom_intern ("text/uri-list", TRUE)) {
gint i;
gchar **uris;
gboolean success = FALSE;
/* NOTE: there can be many URIs at the same time. One
* success is enough to return TRUE. */
success = FALSE;
uris = gtk_selection_data_get_uris (selection_data);
if (!uris) {
const guchar *selection_data_raw;
......@@ -1192,14 +1185,10 @@ brasero_track_data_cfg_drag_data_received (GtkTreeDragDest *drag_dest,
return TRUE;
for (i = 0; uris [i]; i ++) {
BraseroFileNode *node;
/* Add the URIs to the project */
node = brasero_data_project_add_loading_node (BRASERO_DATA_PROJECT (priv->tree),
uris [i],
parent);
if (node)
success = TRUE;
brasero_data_project_add_loading_node (BRASERO_DATA_PROJECT (priv->tree),
uris [i],
parent);
}
g_strfreev (uris);
}
......@@ -2397,10 +2386,6 @@ static BraseroBurnResult
brasero_track_data_cfg_get_track_type (BraseroTrack *track,
BraseroTrackType *type)
{
BraseroTrackDataCfgPrivate *priv;
priv = BRASERO_TRACK_DATA_CFG_PRIVATE (track);
brasero_track_type_set_has_data (type);
brasero_track_type_set_data_fs (type, brasero_track_data_cfg_get_fs (BRASERO_TRACK_DATA (track)));
......
......@@ -100,15 +100,12 @@ brasero_track_image_set_source (BraseroTrackImage *track,
const gchar *toc,
BraseroImageFormat format)
{
BraseroTrackImagePrivate *priv;
BraseroTrackImageClass *klass;
BraseroBurnResult res;
g_return_val_if_fail (BRASERO_IS_TRACK_IMAGE (track), BRASERO_BURN_ERR);
/* See if it has changed */
priv = BRASERO_TRACK_IMAGE_PRIVATE (track);
klass = BRASERO_TRACK_IMAGE_GET_CLASS (track);
if (!klass->set_source)
return BRASERO_BURN_ERR;
......
......@@ -356,11 +356,8 @@ brasero_track_stream_get_size (BraseroTrack *track,
goffset *blocks,
goffset *block_size)
{
BraseroTrackStreamPrivate *priv;
BraseroStreamFormat format;
priv = BRASERO_TRACK_STREAM_PRIVATE (track);
format = brasero_track_stream_get_format (BRASERO_TRACK_STREAM (track));
if (!BRASERO_STREAM_FORMAT_HAS_VIDEO (format)) {
if (blocks) {
......
......@@ -385,12 +385,8 @@ brasero_video_options_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
BraseroVideoOptionsPrivate *priv;
g_return_if_fail (BRASERO_IS_VIDEO_OPTIONS (object));
priv = BRASERO_VIDEO_OPTIONS_PRIVATE (object);
switch (prop_id)
{
case PROP_SESSION:
......
......@@ -307,6 +307,8 @@ stat_end:
file = g_file_new_for_commandline_arg (img_uri);
g_free (img_uri);
}
else
return FALSE;
g_free (path);
......
......@@ -896,7 +896,7 @@ brasero_job_item_stop (BraseroTaskItem *item,
BraseroJobClass *klass;
BraseroJobPrivate *priv;
BraseroBurnResult result = BRASERO_BURN_OK;