[brasero] Fix all warnings with gcc 4.6.0 This also fixes a few bugs (return values not used mainly)
- From: Philippe Rouquier <philippr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [brasero] Fix all warnings with gcc 4.6.0 This also fixes a few bugs (return values not used mainly)
- Date: Tue, 25 Jan 2011 10:53:15 +0000 (UTC)
commit 9b0d6977810a276a136a37047242f8088693b110
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date: Tue Jan 25 11:17:19 2011 +0100
Fix all warnings with gcc 4.6.0
This also fixes a few bugs (return values not used mainly)
libbrasero-burn/brasero-burn-dialog.c | 14 +------
libbrasero-burn/brasero-burn-options.c | 52 +++++++++++---------------
libbrasero-burn/brasero-burn.c | 22 +---------
libbrasero-burn/brasero-caps-session.c | 11 ++---
libbrasero-burn/brasero-data-project.c | 17 +--------
libbrasero-burn/brasero-data-vfs.c | 5 --
libbrasero-burn/brasero-dest-selection.c | 6 ---
libbrasero-burn/brasero-drive-properties.c | 7 ---
libbrasero-burn/brasero-filtered-uri.c | 3 -
libbrasero-burn/brasero-image-properties.c | 13 ------
libbrasero-burn/brasero-image-type-chooser.c | 4 --
libbrasero-burn/brasero-medium-properties.c | 9 +----
libbrasero-burn/brasero-session-cfg.c | 10 -----
libbrasero-burn/brasero-session.c | 13 ------
libbrasero-burn/brasero-status-dialog.c | 3 -
libbrasero-burn/brasero-track-data-cfg.c | 29 +++-----------
libbrasero-burn/brasero-track-image.c | 3 -
libbrasero-burn/brasero-track-stream.c | 3 -
libbrasero-burn/brasero-video-options.c | 4 --
libbrasero-burn/burn-image-format.c | 2 +
libbrasero-burn/burn-job.c | 7 +--
libbrasero-burn/burn-mkisofs-base.c | 2 -
libbrasero-burn/burn-plugin.c | 3 -
libbrasero-burn/burn-process.c | 2 -
libbrasero-burn/burn-task-ctx.c | 5 --
libbrasero-burn/burn-task.c | 3 -
libbrasero-media/brasero-drive-selection.c | 11 +-----
libbrasero-media/brasero-medium-monitor.c | 3 -
libbrasero-media/brasero-medium-selection.c | 23 +-----------
libbrasero-media/brasero-medium.c | 17 +-------
libbrasero-media/brasero-volume.c | 9 ----
libbrasero-utils/brasero-disc-message.c | 3 -
libbrasero-utils/brasero-io.c | 12 +++--
libbrasero-utils/brasero-jacket-edit.c | 2 -
libbrasero-utils/brasero-jacket-font.c | 6 ---
libbrasero-utils/brasero-jacket-view.c | 14 +-----
libbrasero-utils/brasero-metadata.c | 3 -
nautilus/nautilus-burn-bar.c | 8 ----
nautilus/nautilus-burn-extension.c | 5 +-
plugins/cdrkit/burn-genisoimage.c | 2 -
plugins/cdrkit/burn-wodim.c | 7 +---
plugins/cdrtools/burn-cdda2wav.c | 2 -
plugins/cdrtools/burn-cdrecord.c | 5 --
plugins/cdrtools/burn-mkisofs.c | 3 -
plugins/checksum/burn-checksum-files.c | 14 -------
plugins/dvdauthor/burn-dvdauthor.c | 3 -
plugins/dvdcss/burn-dvdcss.c | 2 -
plugins/local-track/burn-local-image.c | 2 -
plugins/transcode/burn-normalize.c | 2 -
plugins/transcode/burn-vob.c | 9 ----
plugins/vcdimager/burn-vcdimager.c | 8 +---
src/brasero-app.c | 10 +----
src/brasero-audio-disc.c | 21 +---------
src/brasero-data-disc.c | 15 -------
src/brasero-file-filtered.c | 3 -
src/brasero-player-bacon.c | 21 +---------
src/brasero-plugin-manager-ui.c | 14 +-----
src/brasero-pref.c | 3 -
src/brasero-project-name.c | 14 -------
src/brasero-project-parse.c | 2 +-
src/brasero-rename.c | 4 +-
src/brasero-setting.c | 9 ++--
src/brasero-song-control.c | 9 +---
src/brasero-split-dialog.c | 4 --
src/brasero-video-disc.c | 20 ++--------
src/brasero-video-tree-model.c | 6 ---
66 files changed, 87 insertions(+), 495 deletions(-)
---
diff --git a/libbrasero-burn/brasero-burn-dialog.c b/libbrasero-burn/brasero-burn-dialog.c
index 5a09273..63054df 100644
--- a/libbrasero-burn/brasero-burn-dialog.c
+++ b/libbrasero-burn/brasero-burn-dialog.c
@@ -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,
diff --git a/libbrasero-burn/brasero-burn-options.c b/libbrasero-burn/brasero-burn-options.c
index 872dd9a..a25a7bc 100644
--- a/libbrasero-burn/brasero-burn-options.c
+++ b/libbrasero-burn/brasero-burn-options.c
@@ -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."
diff --git a/libbrasero-burn/brasero-burn.c b/libbrasero-burn/brasero-burn.c
index f8b64c5..5e1577b 100644
--- a/libbrasero-burn/brasero-burn.c
+++ b/libbrasero-burn/brasero-burn.c
@@ -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
diff --git a/libbrasero-burn/brasero-caps-session.c b/libbrasero-burn/brasero-caps-session.c
index 5e9740c..28eeddf 100644
--- a/libbrasero-burn/brasero-caps-session.c
+++ b/libbrasero-burn/brasero-caps-session.c
@@ -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;
}
}
diff --git a/libbrasero-burn/brasero-data-project.c b/libbrasero-burn/brasero-data-project.c
index 2e589c4..0cebd2b 100644
--- a/libbrasero-burn/brasero-data-project.c
+++ b/libbrasero-burn/brasero-data-project.c
@@ -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;
diff --git a/libbrasero-burn/brasero-data-vfs.c b/libbrasero-burn/brasero-data-vfs.c
index 1962236..c008e70 100644
--- a/libbrasero-burn/brasero-data-vfs.c
+++ b/libbrasero-burn/brasero-data-vfs.c
@@ -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. */
diff --git a/libbrasero-burn/brasero-dest-selection.c b/libbrasero-burn/brasero-dest-selection.c
index 68739db..13060a1 100644
--- a/libbrasero-burn/brasero-dest-selection.c
+++ b/libbrasero-burn/brasero-dest-selection.c
@@ -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
diff --git a/libbrasero-burn/brasero-drive-properties.c b/libbrasero-burn/brasero-drive-properties.c
index 79f50d4..edca3ce 100644
--- a/libbrasero-burn/brasero-drive-properties.c
+++ b/libbrasero-burn/brasero-drive-properties.c
@@ -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 ();
diff --git a/libbrasero-burn/brasero-filtered-uri.c b/libbrasero-burn/brasero-filtered-uri.c
index 0d9b9fa..99bd8f2 100644
--- a/libbrasero-burn/brasero-filtered-uri.c
+++ b/libbrasero-burn/brasero-filtered-uri.c
@@ -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);
diff --git a/libbrasero-burn/brasero-image-properties.c b/libbrasero-burn/brasero-image-properties.c
index abb6d83..2330d13 100644
--- a/libbrasero-burn/brasero-image-properties.c
+++ b/libbrasero-burn/brasero-image-properties.c
@@ -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);
diff --git a/libbrasero-burn/brasero-image-type-chooser.c b/libbrasero-burn/brasero-image-type-chooser.c
index b8c8467..fd80787 100644
--- a/libbrasero-burn/brasero-image-type-chooser.c
+++ b/libbrasero-burn/brasero-image-type-chooser.c
@@ -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);
}
diff --git a/libbrasero-burn/brasero-medium-properties.c b/libbrasero-burn/brasero-medium-properties.c
index 6dfae3e..81026dd 100644
--- a/libbrasero-burn/brasero-medium-properties.c
+++ b/libbrasero-burn/brasero-medium-properties.c
@@ -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"));
}
diff --git a/libbrasero-burn/brasero-session-cfg.c b/libbrasero-burn/brasero-session-cfg.c
index 3f7fe3f..5ab8835 100644
--- a/libbrasero-burn/brasero-session-cfg.c
+++ b/libbrasero-burn/brasero-session-cfg.c
@@ -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
diff --git a/libbrasero-burn/brasero-session.c b/libbrasero-burn/brasero-session.c
index 73d8642..ffa00ff 100644
--- a/libbrasero-burn/brasero-session.c
+++ b/libbrasero-burn/brasero-session.c
@@ -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:
diff --git a/libbrasero-burn/brasero-status-dialog.c b/libbrasero-burn/brasero-status-dialog.c
index 3196220..b2c4e8a 100644
--- a/libbrasero-burn/brasero-status-dialog.c
+++ b/libbrasero-burn/brasero-status-dialog.c
@@ -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);
}
diff --git a/libbrasero-burn/brasero-track-data-cfg.c b/libbrasero-burn/brasero-track-data-cfg.c
index cad5dbb..be6b632 100644
--- a/libbrasero-burn/brasero-track-data-cfg.c
+++ b/libbrasero-burn/brasero-track-data-cfg.c
@@ -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)));
diff --git a/libbrasero-burn/brasero-track-image.c b/libbrasero-burn/brasero-track-image.c
index f2d50a7..2893c91 100644
--- a/libbrasero-burn/brasero-track-image.c
+++ b/libbrasero-burn/brasero-track-image.c
@@ -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;
diff --git a/libbrasero-burn/brasero-track-stream.c b/libbrasero-burn/brasero-track-stream.c
index e3ee6df..d569c0c 100644
--- a/libbrasero-burn/brasero-track-stream.c
+++ b/libbrasero-burn/brasero-track-stream.c
@@ -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) {
diff --git a/libbrasero-burn/brasero-video-options.c b/libbrasero-burn/brasero-video-options.c
index ffdcda7..5666d28 100644
--- a/libbrasero-burn/brasero-video-options.c
+++ b/libbrasero-burn/brasero-video-options.c
@@ -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:
diff --git a/libbrasero-burn/burn-image-format.c b/libbrasero-burn/burn-image-format.c
index 530cb87..8f7e572 100644
--- a/libbrasero-burn/burn-image-format.c
+++ b/libbrasero-burn/burn-image-format.c
@@ -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);
diff --git a/libbrasero-burn/burn-job.c b/libbrasero-burn/burn-job.c
index d29f5f9..89efc14 100644
--- a/libbrasero-burn/burn-job.c
+++ b/libbrasero-burn/burn-job.c
@@ -896,7 +896,7 @@ brasero_job_item_stop (BraseroTaskItem *item,
BraseroJobClass *klass;
BraseroJobPrivate *priv;
BraseroBurnResult result = BRASERO_BURN_OK;
-
+
self = BRASERO_JOB (item);
priv = BRASERO_JOB_PRIVATE (self);
@@ -917,7 +917,7 @@ brasero_job_item_stop (BraseroTaskItem *item,
priv->ctx = NULL;
}
- return BRASERO_BURN_OK;
+ return result;
}
static void
@@ -1237,13 +1237,10 @@ brasero_job_set_nonblocking (BraseroJob *self,
GError **error)
{
BraseroBurnResult result;
- BraseroJobPrivate *priv;
int fd;
BRASERO_JOB_DEBUG (self);
- priv = BRASERO_JOB_PRIVATE (self);
-
fd = -1;
if (brasero_job_get_fd_in (self, &fd) == BRASERO_BURN_OK) {
result = brasero_job_set_nonblocking_fd (fd, error);
diff --git a/libbrasero-burn/burn-mkisofs-base.c b/libbrasero-burn/burn-mkisofs-base.c
index 51cfeb8..582a20f 100644
--- a/libbrasero-burn/burn-mkisofs-base.c
+++ b/libbrasero-burn/burn-mkisofs-base.c
@@ -564,7 +564,6 @@ brasero_mkisofs_base_write_to_files (GSList *grafts,
GError **error)
{
gchar *uri;
- GSList *grafts_excluded;
BraseroMkisofsBase base;
BraseroBurnResult result;
@@ -613,7 +612,6 @@ brasero_mkisofs_base_write_to_files (GSList *grafts,
* Once finished, for each excluded use the hash to see if there are not
* other paths at which the excluded uri must appear. If so, create an
* explicit graft point. */
- grafts_excluded = NULL;
for (; grafts; grafts = grafts->next) {
BraseroGraftPt *graft;
diff --git a/libbrasero-burn/burn-plugin.c b/libbrasero-burn/burn-plugin.c
index 1efadfc..09c5e9d 100644
--- a/libbrasero-burn/burn-plugin.c
+++ b/libbrasero-burn/burn-plugin.c
@@ -1081,9 +1081,6 @@ brasero_plugin_get_description (BraseroPlugin *plugin)
const gchar *
brasero_plugin_get_icon_name (BraseroPlugin *plugin)
{
- BraseroPluginPrivate *priv;
-
- priv = BRASERO_PLUGIN_PRIVATE (plugin);
return default_icon;
}
diff --git a/libbrasero-burn/burn-process.c b/libbrasero-burn/burn-process.c
index e867fc5..bd0b8d5 100644
--- a/libbrasero-burn/burn-process.c
+++ b/libbrasero-burn/burn-process.c
@@ -576,12 +576,10 @@ brasero_process_setup_channel (BraseroProcess *process,
static void
brasero_process_setup (gpointer data)
{
- BraseroProcessPrivate *priv;
BraseroProcess *process;
int fd;
process = BRASERO_PROCESS (data);
- priv = BRASERO_PROCESS_PRIVATE (process);
fd = -1;
if (brasero_job_get_fd_in (BRASERO_JOB (process), &fd) == BRASERO_BURN_OK) {
diff --git a/libbrasero-burn/burn-task-ctx.c b/libbrasero-burn/burn-task-ctx.c
index e905397..a79de61 100644
--- a/libbrasero-burn/burn-task-ctx.c
+++ b/libbrasero-burn/burn-task-ctx.c
@@ -331,13 +331,10 @@ BraseroBurnResult
brasero_task_ctx_next_track (BraseroTaskCtx *self)
{
- BraseroTaskCtxPrivate *priv;
BraseroBurnResult retval;
g_return_val_if_fail (BRASERO_IS_TASK_CTX (self), BRASERO_BURN_ERR);
- priv = BRASERO_TASK_CTX_PRIVATE (self);
-
retval = brasero_task_ctx_set_next_track (self);
if (retval == BRASERO_BURN_RETRY) {
BraseroTaskCtxClass *klass;
@@ -403,9 +400,7 @@ brasero_task_ctx_error (BraseroTaskCtx *self,
GError *error)
{
BraseroTaskCtxClass *klass;
- BraseroTaskCtxPrivate *priv;
- priv = BRASERO_TASK_CTX_PRIVATE (self);
klass = BRASERO_TASK_CTX_GET_CLASS (self);
if (!klass->finished)
return BRASERO_BURN_NOT_SUPPORTED;
diff --git a/libbrasero-burn/burn-task.c b/libbrasero-burn/burn-task.c
index c8d8c83..1497449 100644
--- a/libbrasero-burn/burn-task.c
+++ b/libbrasero-burn/burn-task.c
@@ -368,9 +368,6 @@ BraseroBurnResult
brasero_task_cancel (BraseroTask *task,
gboolean protect)
{
- BraseroTaskPrivate *priv;
-
- priv = BRASERO_TASK_PRIVATE (task);
if (protect && brasero_task_ctx_get_dangerous (BRASERO_TASK_CTX (task)))
return BRASERO_BURN_DANGEROUS;
diff --git a/libbrasero-media/brasero-drive-selection.c b/libbrasero-media/brasero-drive-selection.c
index c3f5b89..0e4bad6 100644
--- a/libbrasero-media/brasero-drive-selection.c
+++ b/libbrasero-media/brasero-drive-selection.c
@@ -127,10 +127,8 @@ brasero_drive_selection_set_current_drive (BraseroDriveSelection *self,
static void
brasero_drive_selection_changed (GtkComboBox *combo)
{
- GtkTreeModel *model;
GtkTreeIter iter;
- model = gtk_combo_box_get_model (combo);
if (!gtk_combo_box_get_active_iter (combo, &iter))
return;
@@ -239,10 +237,7 @@ brasero_drive_selection_add_no_disc_entry (BraseroDriveSelection *self)
{
GtkTreeIter iter;
GtkTreeModel *model;
- BraseroDriveSelectionPrivate *priv;
-
- priv = BRASERO_DRIVE_SELECTION_PRIVATE (self);
-
+
/* Nothing's available. Say it. Two cases here, either we're
* still probing drives or there isn't actually any available
* drive. */
@@ -569,12 +564,8 @@ brasero_drive_selection_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- BraseroDriveSelectionPrivate *priv;
-
g_return_if_fail (BRASERO_IS_DRIVE_SELECTION (object));
- priv = BRASERO_DRIVE_SELECTION_PRIVATE (object);
-
switch (prop_id)
{
case PROP_DRIVE_TYPE:
diff --git a/libbrasero-media/brasero-medium-monitor.c b/libbrasero-media/brasero-medium-monitor.c
index 11e0204..a3e1531 100644
--- a/libbrasero-media/brasero-medium-monitor.c
+++ b/libbrasero-media/brasero-medium-monitor.c
@@ -368,13 +368,10 @@ static gboolean
brasero_medium_monitor_is_drive (BraseroMediumMonitor *monitor,
const gchar *device)
{
- BraseroMediumMonitorPrivate *priv;
BraseroDeviceHandle *handle;
BraseroScsiErrCode code;
gboolean result;
- priv = BRASERO_MEDIUM_MONITOR_PRIVATE (monitor);
-
BRASERO_MEDIA_LOG ("Testing drive %s", device);
handle = brasero_device_handle_open (device, FALSE, &code);
diff --git a/libbrasero-media/brasero-medium-selection.c b/libbrasero-media/brasero-medium-selection.c
index 4ced00c..af901e1 100644
--- a/libbrasero-media/brasero-medium-selection.c
+++ b/libbrasero-media/brasero-medium-selection.c
@@ -196,12 +196,9 @@ brasero_medium_selection_update_used_space (BraseroMediumSelection *selector,
BraseroMedium *medium_arg,
guint used_space)
{
- BraseroMediumSelectionPrivate *priv;
GtkTreeModel *model;
GtkTreeIter iter;
- priv = BRASERO_MEDIUM_SELECTION_PRIVATE (selector);
-
model = gtk_combo_box_get_model (GTK_COMBO_BOX (selector));
if (!gtk_tree_model_get_iter_first (model, &iter))
return;
@@ -233,9 +230,6 @@ static void
brasero_medium_selection_set_show_used_space (BraseroMediumSelection *selector)
{
GtkCellRenderer *renderer;
- BraseroMediumSelectionPrivate *priv;
-
- priv = BRASERO_MEDIUM_SELECTION_PRIVATE (selector);
gtk_cell_layout_clear (GTK_CELL_LAYOUT (selector));
@@ -269,9 +263,7 @@ brasero_medium_selection_update_media_string (BraseroMediumSelection *self)
{
GtkTreeModel *model;
GtkTreeIter iter;
- gboolean valid;
- valid = FALSE;
model = gtk_combo_box_get_model (GTK_COMBO_BOX (self));
if (!gtk_tree_model_get_iter_first (model, &iter))
return;
@@ -338,12 +330,9 @@ brasero_medium_selection_set_current_medium (BraseroMediumSelection *self,
static void
brasero_drive_selection_set_tooltip (BraseroMediumSelection *self)
{
- BraseroMediumSelectionPrivate *priv;
BraseroMedium *medium;
gchar *tooltip;
- priv = BRASERO_MEDIUM_SELECTION_PRIVATE (self);
-
medium = brasero_medium_selection_get_active (self);
if (medium) {
tooltip = brasero_medium_get_tooltip (medium);
@@ -359,10 +348,8 @@ brasero_drive_selection_set_tooltip (BraseroMediumSelection *self)
static void
brasero_medium_selection_changed (GtkComboBox *combo)
{
- GtkTreeModel *model;
GtkTreeIter iter;
- model = gtk_combo_box_get_model (combo);
if (!gtk_combo_box_get_active_iter (combo, &iter))
return;
@@ -392,7 +379,6 @@ brasero_medium_selection_set_active (BraseroMediumSelection *selector,
g_return_val_if_fail (BRASERO_IS_MEDIUM_SELECTION (selector), FALSE);
priv = BRASERO_MEDIUM_SELECTION_PRIVATE (selector);
-
if (priv->active == medium)
return TRUE;
@@ -436,7 +422,7 @@ BraseroMedium *
brasero_medium_selection_get_active (BraseroMediumSelection *selector)
{
BraseroMediumSelectionPrivate *priv;
-
+
g_return_val_if_fail (selector != NULL, NULL);
g_return_val_if_fail (BRASERO_IS_MEDIUM_SELECTION (selector), NULL);
@@ -487,9 +473,6 @@ brasero_medium_selection_add_no_disc_entry (BraseroMediumSelection *self)
{
GtkTreeIter iter;
GtkTreeModel *model;
- BraseroMediumSelectionPrivate *priv;
-
- priv = BRASERO_MEDIUM_SELECTION_PRIVATE (self);
/* Nothing's available. Say it. Two cases here, either we're
* still probing drives or there isn't actually any available
@@ -893,12 +876,8 @@ brasero_medium_selection_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- BraseroMediumSelectionPrivate *priv;
-
g_return_if_fail (BRASERO_IS_MEDIUM_SELECTION (object));
- priv = BRASERO_MEDIUM_SELECTION_PRIVATE (object);
-
switch (prop_id)
{
case PROP_MEDIA_TYPE:
diff --git a/libbrasero-media/brasero-medium.c b/libbrasero-media/brasero-medium.c
index 94e53eb..6d33437 100644
--- a/libbrasero-media/brasero-medium.c
+++ b/libbrasero-media/brasero-medium.c
@@ -189,7 +189,6 @@ static GObjectClass* parent_class = NULL;
gchar *
brasero_medium_get_tooltip (BraseroMedium *medium)
{
- BraseroMediumPrivate *priv;
BraseroDrive *drive;
BraseroMedia media;
const gchar *type;
@@ -199,8 +198,6 @@ brasero_medium_get_tooltip (BraseroMedium *medium)
g_return_val_if_fail (medium != NULL, NULL);
g_return_val_if_fail (BRASERO_IS_MEDIUM (medium), NULL);
- priv = BRASERO_MEDIUM_PRIVATE (medium);
-
media = brasero_medium_get_status (BRASERO_MEDIUM (medium));
if (media & BRASERO_MEDIUM_FILE) {
/* Translators: This is a fake drive, a file, and means that
@@ -1525,17 +1522,14 @@ brasero_medium_track_volume_size (BraseroMedium *self,
BraseroMediumTrack *track,
BraseroDeviceHandle *handle)
{
- BraseroMediumPrivate *priv;
- gboolean res;
GError *error = NULL;
BraseroVolSrc *vol;
gint64 nb_blocks;
+ gboolean res;
if (!track)
return FALSE;
- priv = BRASERO_MEDIUM_PRIVATE (self);
-
/* This is a special case. For DVD+RW and DVD-RW in restricted
* mode, there is only one session that takes the whole disc size
* once formatted. That doesn't necessarily means they have data
@@ -2253,7 +2247,7 @@ brasero_medium_get_contents (BraseroMedium *self,
BraseroScsiErrCode *code)
{
int size;
- gboolean res;
+ gboolean res = TRUE;
BraseroScsiResult result;
BraseroMediumPrivate *priv;
BraseroScsiDiscInfoStd *info = NULL;
@@ -2782,7 +2776,6 @@ brasero_medium_read_CD_TEXT (BraseroMedium *self,
int num, size, i;
char buffer [256]; /* mmc specs advise no more than 160 */
gboolean find_block_info;
- BraseroMediumPrivate *priv;
BraseroScsiCDTextData *cd_text;
BRASERO_MEDIA_LOG ("Getting CD-TEXT");
@@ -2805,8 +2798,6 @@ brasero_medium_read_CD_TEXT (BraseroMedium *self,
return;
}
- priv = BRASERO_MEDIUM_PRIVATE (self);
-
off = 0;
track_num = 0;
charset = BRASERO_CD_TEXT_ASCII;
@@ -2930,9 +2921,7 @@ brasero_medium_init_real (BraseroMedium *object,
if (priv->probe_cancelled)
return;
- result = brasero_medium_get_contents (object, handle, &code);
- if (result != TRUE)
- if (result != TRUE)
+ if (!brasero_medium_get_contents (object, handle, &code))
return;
if (priv->probe_cancelled)
diff --git a/libbrasero-media/brasero-volume.c b/libbrasero-media/brasero-volume.c
index 3cd84c4..92b7be0 100644
--- a/libbrasero-media/brasero-volume.c
+++ b/libbrasero-media/brasero-volume.c
@@ -66,7 +66,6 @@ GVolume *
brasero_volume_get_gvolume (BraseroVolume *volume)
{
const gchar *volume_path = NULL;
- BraseroVolumePrivate *priv;
GVolumeMonitor *monitor;
GVolume *gvolume = NULL;
BraseroDrive *drive;
@@ -76,8 +75,6 @@ brasero_volume_get_gvolume (BraseroVolume *volume)
g_return_val_if_fail (volume != NULL, NULL);
g_return_val_if_fail (BRASERO_IS_VOLUME (volume), NULL);
- priv = BRASERO_VOLUME_PRIVATE (volume);
-
drive = brasero_medium_get_drive (BRASERO_MEDIUM (volume));
/* This returns the block device which is the
@@ -161,7 +158,6 @@ gchar *
brasero_volume_get_mount_point (BraseroVolume *volume,
GError **error)
{
- BraseroVolumePrivate *priv;
gchar *local_path = NULL;
GVolume *gvolume;
GMount *mount;
@@ -170,8 +166,6 @@ brasero_volume_get_mount_point (BraseroVolume *volume,
g_return_val_if_fail (volume != NULL, NULL);
g_return_val_if_fail (BRASERO_IS_VOLUME (volume), NULL);
- priv = BRASERO_VOLUME_PRIVATE (volume);
-
gvolume = brasero_volume_get_gvolume (volume);
if (!gvolume)
return NULL;
@@ -372,7 +366,6 @@ brasero_volume_get_icon (BraseroVolume *volume)
gchar *
brasero_volume_get_name (BraseroVolume *volume)
{
- BraseroVolumePrivate *priv;
BraseroMedia media;
const gchar *type;
GVolume *gvolume;
@@ -381,8 +374,6 @@ brasero_volume_get_name (BraseroVolume *volume)
g_return_val_if_fail (volume != NULL, NULL);
g_return_val_if_fail (BRASERO_IS_VOLUME (volume), NULL);
- priv = BRASERO_VOLUME_PRIVATE (volume);
-
media = brasero_medium_get_status (BRASERO_MEDIUM (volume));
if (media & BRASERO_MEDIUM_FILE) {
/* Translators: This is a fake drive, a file, and means that
diff --git a/libbrasero-utils/brasero-disc-message.c b/libbrasero-utils/brasero-disc-message.c
index 58ea640..87b8cc5 100644
--- a/libbrasero-utils/brasero-disc-message.c
+++ b/libbrasero-utils/brasero-disc-message.c
@@ -226,9 +226,6 @@ brasero_disc_message_destroy (BraseroDiscMessage *self)
void
brasero_disc_message_remove_buttons (BraseroDiscMessage *self)
{
- BraseroDiscMessagePrivate *priv;
-
- priv = BRASERO_DISC_MESSAGE_PRIVATE (self);
gtk_container_foreach (GTK_CONTAINER (gtk_info_bar_get_action_area (GTK_INFO_BAR (self))),
(GtkCallback) gtk_widget_destroy,
NULL);
diff --git a/libbrasero-utils/brasero-io.c b/libbrasero-utils/brasero-io.c
index 135ab36..6124848 100644
--- a/libbrasero-utils/brasero-io.c
+++ b/libbrasero-utils/brasero-io.c
@@ -602,16 +602,17 @@ brasero_io_mount_enclosing_volume (BraseroIO *self,
GMount *mounted;
GtkWindow *parent;
BraseroIOPrivate *priv;
- GMountOperation *operation;
BraseroIOMount mount = { NULL, };
+ GMountOperation *operation = NULL;
priv = BRASERO_IO_PRIVATE (self);
- if (priv->win_callback)
+ if (priv->win_callback) {
parent = priv->win_callback (priv->win_user_data);
- if (parent)
- operation = gtk_mount_operation_new (parent);
+ if (parent)
+ operation = gtk_mount_operation_new (parent);
+ }
g_file_mount_enclosing_volume (file,
G_MOUNT_MOUNT_NONE,
@@ -619,7 +620,8 @@ brasero_io_mount_enclosing_volume (BraseroIO *self,
cancel,
brasero_io_mount_enclosing_volume_cb,
&mount);
- g_object_unref (operation);
+ if (operation)
+ g_object_unref (operation);
/* sleep and wait operation end */
while (!mount.finished && !g_cancellable_is_cancelled (cancel))
diff --git a/libbrasero-utils/brasero-jacket-edit.c b/libbrasero-utils/brasero-jacket-edit.c
index 5ba36db..e68d8f4 100644
--- a/libbrasero-utils/brasero-jacket-edit.c
+++ b/libbrasero-utils/brasero-jacket-edit.c
@@ -105,7 +105,6 @@ static void
brasero_jacket_edit_print_pressed_cb (GtkButton *button,
BraseroJacketEdit *self)
{
- BraseroJacketEditPrivate *priv;
GtkPrintOperationResult res;
GtkPrintOperation *print;
GtkPrintSettings *settings;
@@ -113,7 +112,6 @@ brasero_jacket_edit_print_pressed_cb (GtkButton *button,
GtkWidget *toplevel;
gchar *path;
- priv = BRASERO_JACKET_EDIT_PRIVATE (self);
print = gtk_print_operation_new ();
g_signal_connect (print,
"draw-page",
diff --git a/libbrasero-utils/brasero-jacket-font.c b/libbrasero-utils/brasero-jacket-font.c
index 1740754..196ae28 100644
--- a/libbrasero-utils/brasero-jacket-font.c
+++ b/libbrasero-utils/brasero-jacket-font.c
@@ -232,11 +232,8 @@ static void
brasero_jacket_fill_sizes (BraseroJacketFont *self,
GtkListStore *store)
{
- BraseroJacketFontPrivate *priv;
gint i;
- priv = BRASERO_JACKET_FONT_PRIVATE (self);
-
for (i = 0; i < G_N_ELEMENTS (font_sizes); i ++) {
GtkTreeIter iter;
gchar *string;
@@ -255,13 +252,10 @@ static void
brasero_jacket_fill_families (BraseroJacketFont *self,
GtkListStore *store)
{
- BraseroJacketFontPrivate *priv;
PangoFontFamily **families;
gint num = 0;
gint i;
- priv = BRASERO_JACKET_FONT_PRIVATE (self);
-
pango_context_list_families (gtk_widget_get_pango_context (GTK_WIDGET (self)),
&families, &num);
diff --git a/libbrasero-utils/brasero-jacket-view.c b/libbrasero-utils/brasero-jacket-view.c
index 7642110..a5f50a2 100644
--- a/libbrasero-utils/brasero-jacket-view.c
+++ b/libbrasero-utils/brasero-jacket-view.c
@@ -132,12 +132,10 @@ brasero_jacket_view_set_line_attributes (GtkTextView *view,
GtkTextAttributes *text_attr;
GSList *open_attr = NULL;
PangoAlignment alignment;
- GtkTextBuffer *buffer;
GtkTextIter iter;
attributes = pango_attr_list_new ();
- buffer = gtk_text_view_get_buffer (view);
iter = *start;
text_attr = gtk_text_view_get_default_attributes (view);
@@ -616,9 +614,6 @@ brasero_jacket_view_cursor_position_changed_cb (GObject *buffer,
GParamSpec *spec,
BraseroJacketView *self)
{
- BraseroJacketViewPrivate *priv;
-
- priv = BRASERO_JACKET_VIEW_PRIVATE (self);
g_signal_emit (self,
jacket_view_signals [TAGS_CHANGED],
0);
@@ -1246,13 +1241,10 @@ brasero_jacket_view_draw (GtkWidget *widget,
static void
brasero_jacket_view_realize (GtkWidget *widget)
{
- BraseroJacketViewPrivate *priv;
GtkAllocation allocation;
- GdkWindow *window;
GdkWindowAttr attributes;
gint attributes_mask;
-
- priv = BRASERO_JACKET_VIEW_PRIVATE (widget);
+ GdkWindow *window;
attributes.window_type = GDK_WINDOW_CHILD;
gtk_widget_get_allocation (widget, &allocation);
@@ -1303,7 +1295,7 @@ brasero_jacket_view_get_preferred_width (GtkWidget *widget,
if (priv->side == BRASERO_JACKET_FRONT) {
width = COVER_WIDTH_FRONT_INCH * resolution + BRASERO_JACKET_VIEW_MARGIN * 2.0;
}
- else if (priv->side == BRASERO_JACKET_BACK) {
+ else {
width = COVER_WIDTH_BACK_INCH * resolution +
BRASERO_JACKET_VIEW_MARGIN * 2.0;
}
@@ -1335,7 +1327,7 @@ brasero_jacket_view_get_preferred_height (GtkWidget *widget,
if (priv->side == BRASERO_JACKET_FRONT) {
height = COVER_HEIGHT_FRONT_INCH * resolution + BRASERO_JACKET_VIEW_MARGIN * 2.0;
}
- else if (priv->side == BRASERO_JACKET_BACK) {
+ else {
height = COVER_HEIGHT_BACK_INCH * resolution +
COVER_WIDTH_SIDE_INCH * resolution +
BRASERO_JACKET_VIEW_MARGIN * 3.0;
diff --git a/libbrasero-utils/brasero-metadata.c b/libbrasero-utils/brasero-metadata.c
index 9e1db1e..f1c69fb 100644
--- a/libbrasero-utils/brasero-metadata.c
+++ b/libbrasero-utils/brasero-metadata.c
@@ -789,7 +789,6 @@ brasero_metadata_get_mime_type (BraseroMetadata *self)
BraseroMetadataPrivate *priv;
GstElement *typefind;
GstCaps *caps = NULL;
- GstElement *decode;
const gchar *mime;
priv = BRASERO_METADATA_PRIVATE (self);
@@ -800,8 +799,6 @@ brasero_metadata_get_mime_type (BraseroMetadata *self)
}
/* find the type of the file */
- decode = gst_bin_get_by_name (GST_BIN (priv->pipeline),
- "decode");
typefind = gst_bin_get_by_name (GST_BIN (priv->decode),
"typefind");
diff --git a/nautilus/nautilus-burn-bar.c b/nautilus/nautilus-burn-bar.c
index f7c2de4..148e761 100644
--- a/nautilus/nautilus-burn-bar.c
+++ b/nautilus/nautilus-burn-bar.c
@@ -144,10 +144,6 @@ nautilus_disc_burn_bar_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- NautilusDiscBurnBar *self;
-
- self = NAUTILUS_DISC_BURN_BAR (object);
-
switch (prop_id) {
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -161,10 +157,6 @@ nautilus_disc_burn_bar_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- NautilusDiscBurnBar *self;
-
- self = NAUTILUS_DISC_BURN_BAR (object);
-
switch (prop_id) {
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
diff --git a/nautilus/nautilus-burn-extension.c b/nautilus/nautilus-burn-extension.c
index 83a9703..c2921d3 100644
--- a/nautilus/nautilus-burn-extension.c
+++ b/nautilus/nautilus-burn-extension.c
@@ -138,7 +138,6 @@ launch_brasero_on_window_session (BraseroSessionCfg *session,
GtkWidget *options,
GtkWindow *window)
{
- gboolean success;
GtkResponseType result;
const gchar *icon_name;
GtkWidget *dialog;
@@ -181,10 +180,10 @@ launch_brasero_on_window_session (BraseroSessionCfg *session,
gtk_window_present (GTK_WINDOW (dialog));
if (result == GTK_RESPONSE_OK)
- success = brasero_burn_dialog_run (BRASERO_BURN_DIALOG (dialog),
+ brasero_burn_dialog_run (BRASERO_BURN_DIALOG (dialog),
BRASERO_BURN_SESSION (session));
else
- success = brasero_burn_dialog_run_multi (BRASERO_BURN_DIALOG (dialog),
+ brasero_burn_dialog_run_multi (BRASERO_BURN_DIALOG (dialog),
BRASERO_BURN_SESSION (session));
gtk_widget_destroy (dialog);
diff --git a/plugins/cdrkit/burn-genisoimage.c b/plugins/cdrkit/burn-genisoimage.c
index 5bc1fcf..77f6a29 100644
--- a/plugins/cdrkit/burn-genisoimage.c
+++ b/plugins/cdrkit/burn-genisoimage.c
@@ -101,10 +101,8 @@ brasero_genisoimage_read_stderr (BraseroProcess *process, const gchar *line)
{
gchar fraction_str [7] = { 0, };
BraseroGenisoimage *genisoimage;
- BraseroGenisoimagePrivate *priv;
genisoimage = BRASERO_GENISOIMAGE (process);
- priv = BRASERO_GENISOIMAGE_PRIVATE (process);
if (strstr (line, "estimate finish")
&& sscanf (line, "%6c%% done, estimate finish", fraction_str) == 1) {
diff --git a/plugins/cdrkit/burn-wodim.c b/plugins/cdrkit/burn-wodim.c
index baae616..c0477c8 100644
--- a/plugins/cdrkit/burn-wodim.c
+++ b/plugins/cdrkit/burn-wodim.c
@@ -733,7 +733,6 @@ brasero_wodim_write_infs (BraseroWodim *wodim,
GPtrArray *argv,
GError **error)
{
- BraseroWodimPrivate *priv;
BraseroBurnResult result;
gchar *tmpdir = NULL;
GSList *tracks;
@@ -742,8 +741,6 @@ brasero_wodim_write_infs (BraseroWodim *wodim,
gint index;
gint start;
- priv = BRASERO_WODIM_PRIVATE (wodim);
-
brasero_job_get_audio_title (BRASERO_JOB (wodim), &album);
brasero_job_get_tracks (BRASERO_JOB (wodim), &tracks);
index = 1;
@@ -1114,16 +1111,14 @@ brasero_wodim_set_argv (BraseroProcess *process,
GPtrArray *argv,
GError **error)
{
- BraseroWodimPrivate *priv;
BraseroBurnResult result;
BraseroJobAction action;
- BraseroWodim *wodim;
BraseroBurnFlag flags;
+ BraseroWodim *wodim;
gchar *dev_str;
gchar *device;
wodim = BRASERO_WODIM (process);
- priv = BRASERO_WODIM_PRIVATE (wodim);
brasero_job_get_action (BRASERO_JOB (wodim), &action);
if (action == BRASERO_JOB_ACTION_SIZE)
diff --git a/plugins/cdrtools/burn-cdda2wav.c b/plugins/cdrtools/burn-cdda2wav.c
index 797b3f9..3903c8c 100644
--- a/plugins/cdrtools/burn-cdda2wav.c
+++ b/plugins/cdrtools/burn-cdda2wav.c
@@ -336,10 +336,8 @@ brasero_cdda2wav_set_argv (BraseroProcess *process,
BraseroJobAction action;
BraseroBurnResult result;
BraseroCdda2wav *cdda2wav;
- BraseroCdda2wavPrivate *priv;
cdda2wav = BRASERO_CDDA2WAV (process);
- priv = BRASERO_CDDA2WAV_PRIVATE (process);
g_ptr_array_add (argv, g_strdup ("cdda2wav"));
diff --git a/plugins/cdrtools/burn-cdrecord.c b/plugins/cdrtools/burn-cdrecord.c
index 18638f6..92c23b3 100644
--- a/plugins/cdrtools/burn-cdrecord.c
+++ b/plugins/cdrtools/burn-cdrecord.c
@@ -718,7 +718,6 @@ brasero_cdrecord_write_infs (BraseroCDRecord *cdrecord,
GPtrArray *argv,
GError **error)
{
- BraseroCDRecordPrivate *priv;
BraseroBurnResult result;
gchar *tmpdir = NULL;
GSList *tracks;
@@ -727,8 +726,6 @@ brasero_cdrecord_write_infs (BraseroCDRecord *cdrecord,
gchar *album;
gint index;
- priv = BRASERO_CD_RECORD_PRIVATE (cdrecord);
-
brasero_job_get_audio_title (BRASERO_JOB (cdrecord), &album);
brasero_job_get_tracks (BRASERO_JOB (cdrecord), &tracks);
index = 1;
@@ -1049,7 +1046,6 @@ brasero_cdrecord_set_argv (BraseroProcess *process,
GPtrArray *argv,
GError **error)
{
- BraseroCDRecordPrivate *priv;
BraseroCDRecord *cdrecord;
BraseroBurnResult result;
BraseroJobAction action;
@@ -1058,7 +1054,6 @@ brasero_cdrecord_set_argv (BraseroProcess *process,
gchar *dev_str;
cdrecord = BRASERO_CD_RECORD (process);
- priv = BRASERO_CD_RECORD_PRIVATE (cdrecord);
brasero_job_get_action (BRASERO_JOB (cdrecord), &action);
if (action == BRASERO_JOB_ACTION_SIZE)
diff --git a/plugins/cdrtools/burn-mkisofs.c b/plugins/cdrtools/burn-mkisofs.c
index 2b0c635..b47e93c 100644
--- a/plugins/cdrtools/burn-mkisofs.c
+++ b/plugins/cdrtools/burn-mkisofs.c
@@ -102,11 +102,8 @@ brasero_mkisofs_read_stderr (BraseroProcess *process, const gchar *line)
{
gchar fraction_str [7] = { 0, };
BraseroMkisofs *mkisofs;
- BraseroMkisofsPrivate *priv;
mkisofs = BRASERO_MKISOFS (process);
- priv = BRASERO_MKISOFS_PRIVATE (process);
-
if (strstr (line, "estimate finish")
&& sscanf (line, "%6c%% done, estimate finish", fraction_str) == 1) {
gdouble fraction;
diff --git a/plugins/checksum/burn-checksum-files.c b/plugins/checksum/burn-checksum-files.c
index bc878da..aeabfb6 100644
--- a/plugins/checksum/burn-checksum-files.c
+++ b/plugins/checksum/burn-checksum-files.c
@@ -1351,19 +1351,6 @@ brasero_checksum_files_activate (BraseroJob *job,
}
static BraseroBurnResult
-brasero_checksum_files_clock_tick (BraseroJob *job)
-{
- BraseroChecksumFilesPrivate *priv;
-
- priv = BRASERO_CHECKSUM_FILES_PRIVATE (job);
-
- /* we'll need that function later. For the moment, when generating a
- * file we can't know how many files there are. Just when checking it */
-
- return BRASERO_BURN_OK;
-}
-
-static BraseroBurnResult
brasero_checksum_files_stop (BraseroJob *job,
GError **error)
{
@@ -1462,7 +1449,6 @@ brasero_checksum_files_class_init (BraseroChecksumFilesClass *klass)
job_class->activate = brasero_checksum_files_activate;
job_class->start = brasero_checksum_files_start;
job_class->stop = brasero_checksum_files_stop;
- job_class->clock_tick = brasero_checksum_files_clock_tick;
}
static void
diff --git a/plugins/dvdauthor/burn-dvdauthor.c b/plugins/dvdauthor/burn-dvdauthor.c
index 319aca6..485fb8c 100644
--- a/plugins/dvdauthor/burn-dvdauthor.c
+++ b/plugins/dvdauthor/burn-dvdauthor.c
@@ -283,13 +283,10 @@ brasero_dvd_author_set_argv (BraseroProcess *process,
GPtrArray *argv,
GError **error)
{
- BraseroDvdAuthorPrivate *priv;
BraseroBurnResult result;
BraseroJobAction action;
gchar *output;
- priv = BRASERO_DVD_AUTHOR_PRIVATE (process);
-
brasero_job_get_action (BRASERO_JOB (process), &action);
if (action != BRASERO_JOB_ACTION_IMAGE)
BRASERO_JOB_NOT_SUPPORTED (process);
diff --git a/plugins/dvdcss/burn-dvdcss.c b/plugins/dvdcss/burn-dvdcss.c
index 032e443..133b8d5 100644
--- a/plugins/dvdcss/burn-dvdcss.c
+++ b/plugins/dvdcss/burn-dvdcss.c
@@ -86,7 +86,6 @@ brasero_dvdcss_library_init (BraseroPlugin *plugin)
{
gpointer address;
GModule *module;
- gchar *dvdcss_interface_2 = NULL;
if (css_ready)
return TRUE;
@@ -98,7 +97,6 @@ brasero_dvdcss_library_init (BraseroPlugin *plugin)
if (!g_module_symbol (module, "dvdcss_interface_2", &address))
goto error_version;
- dvdcss_interface_2 = address;
if (!g_module_symbol (module, "dvdcss_open", &address))
goto error_version;
diff --git a/plugins/local-track/burn-local-image.c b/plugins/local-track/burn-local-image.c
index 6b1c0eb..6cd1b9c 100644
--- a/plugins/local-track/burn-local-image.c
+++ b/plugins/local-track/burn-local-image.c
@@ -531,7 +531,6 @@ brasero_local_track_thread (gpointer data)
src && dest;
src = src->next, dest = dest->next) {
gchar *name;
- gchar *string;
GFile *src_file;
GFile *dest_file;
BraseroBurnResult result;
@@ -541,7 +540,6 @@ brasero_local_track_thread (gpointer data)
name = g_file_get_basename (src_file);
BRASERO_JOB_LOG (self, "Downloading %s", name);
- string = g_strdup_printf (_("Copying `%s` locally"), name);
g_free (name);
result = brasero_xfer_start (priv->xfer_ctx,
diff --git a/plugins/transcode/burn-normalize.c b/plugins/transcode/burn-normalize.c
index 96df891..60098fa 100644
--- a/plugins/transcode/burn-normalize.c
+++ b/plugins/transcode/burn-normalize.c
@@ -487,12 +487,10 @@ brasero_normalize_bus_messages (GstBus *bus,
GstMessage *msg,
BraseroNormalize *normalize)
{
- BraseroNormalizePrivate *priv;
GstTagList *tags = NULL;
GError *error = NULL;
gchar *debug;
- priv = BRASERO_NORMALIZE_PRIVATE (normalize);
switch (GST_MESSAGE_TYPE (msg)) {
case GST_MESSAGE_TAG:
/* This is the information we've been waiting for.
diff --git a/plugins/transcode/burn-vob.c b/plugins/transcode/burn-vob.c
index 80d0cc5..ced3c23 100644
--- a/plugins/transcode/burn-vob.c
+++ b/plugins/transcode/burn-vob.c
@@ -100,10 +100,6 @@ static BraseroBurnResult
brasero_vob_stop (BraseroJob *job,
GError **error)
{
- BraseroVobPrivate *priv;
-
- priv = BRASERO_VOB_PRIVATE (job);
-
brasero_vob_stop_pipeline (BRASERO_VOB (job));
return BRASERO_BURN_OK;
}
@@ -113,11 +109,8 @@ brasero_vob_finished (BraseroVob *vob)
{
BraseroTrackType *type = NULL;
BraseroTrackStream *track;
- BraseroVobPrivate *priv;
gchar *output = NULL;
- priv = BRASERO_VOB_PRIVATE (vob);
-
type = brasero_track_type_new ();
brasero_job_get_output_type (BRASERO_JOB (vob), type);
brasero_job_get_audio_output (BRASERO_JOB (vob), &output);
@@ -140,11 +133,9 @@ brasero_vob_bus_messages (GstBus *bus,
GstMessage *msg,
BraseroVob *vob)
{
- BraseroVobPrivate *priv;
GError *error = NULL;
gchar *debug;
- priv = BRASERO_VOB_PRIVATE (vob);
switch (GST_MESSAGE_TYPE (msg)) {
case GST_MESSAGE_TAG:
return TRUE;
diff --git a/plugins/vcdimager/burn-vcdimager.c b/plugins/vcdimager/burn-vcdimager.c
index 98dfd5e..7cafd7a 100644
--- a/plugins/vcdimager/burn-vcdimager.c
+++ b/plugins/vcdimager/burn-vcdimager.c
@@ -305,13 +305,7 @@ brasero_vcd_imager_generate_xml_file (BraseroProcess *process,
if (success < 0)
goto error;
- /* get all tracks */
- brasero_job_get_tracks (BRASERO_JOB (process), &tracks);
- for (i = 0, iter = tracks; iter; iter = iter->next, i++) {
- BraseroTrack *track;
-
- track = iter->data;
-
+ for (i = 0; i < priv->num_tracks; i++) {
sprintf (buffer, "playlist-%i", i);
success = xmlTextWriterStartElement (xml, (xmlChar *) "playlist");
if (success < 0)
diff --git a/src/brasero-app.c b/src/brasero-app.c
index 699f60d..ae88be3 100644
--- a/src/brasero-app.c
+++ b/src/brasero-app.c
@@ -29,6 +29,7 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
#include "brasero-misc.h"
#include "brasero-io.h"
@@ -1305,9 +1306,6 @@ brasero_app_open_project (BraseroApp *app,
gboolean burn)
{
BraseroSessionCfg *session;
- BraseroAppPrivate *priv;
-
- priv = BRASERO_APP_PRIVATE (app);
session = brasero_session_cfg_new ();
@@ -1340,10 +1338,6 @@ brasero_app_open_by_mime (BraseroApp *app,
const gchar *mime,
gboolean warn_user)
{
- BraseroAppPrivate *priv;
-
- priv = BRASERO_APP_PRIVATE (app);
-
if (!mime) {
/* that can happen when the URI could not be identified */
return FALSE;
@@ -1685,10 +1679,8 @@ brasero_app_recent_open (GtkRecentChooser *chooser,
gchar *uri;
const gchar *mime;
GtkRecentInfo *item;
- BraseroAppPrivate *priv;
GtkRecentManager *manager;
- priv = BRASERO_APP_PRIVATE (app);
/* This is a workaround since following code doesn't work */
/*
item = gtk_recent_chooser_get_current_item (GTK_RECENT_CHOOSER (chooser));
diff --git a/src/brasero-audio-disc.c b/src/brasero-audio-disc.c
index 70439f5..6227c89 100644
--- a/src/brasero-audio-disc.c
+++ b/src/brasero-audio-disc.c
@@ -363,10 +363,10 @@ brasero_audio_disc_selection_function (GtkTreeSelection *selection,
gboolean is_selected,
gpointer NULL_data)
{
- BraseroTrack *track;
+/* BraseroTrack *track;
track = brasero_video_tree_model_path_to_track (BRASERO_VIDEO_TREE_MODEL (model), treepath);
-/* if (track)
+ if (track)
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
BRASERO_VIDEO_TREE_MODEL_EDITABLE, (is_selected == FALSE),
-1);
@@ -884,7 +884,6 @@ brasero_audio_disc_session_changed (BraseroSessionCfg *session,
{
GSList *next;
GSList *tracks;
- gboolean notready;
BraseroStatus *status;
gboolean should_use_dts;
@@ -892,7 +891,6 @@ brasero_audio_disc_session_changed (BraseroSessionCfg *session,
return;
/* make sure all tracks have video */
- notready = FALSE;
should_use_dts = FALSE;
status = brasero_status_new ();
tracks = brasero_burn_session_get_tracks (BRASERO_BURN_SESSION (session));
@@ -950,10 +948,8 @@ brasero_audio_disc_session_changed (BraseroSessionCfg *session,
continue;
}
- if (result == BRASERO_BURN_NOT_READY || result == BRASERO_BURN_RUNNING) {
- notready = TRUE;
+ if (result == BRASERO_BURN_NOT_READY || result == BRASERO_BURN_RUNNING)
continue;
- }
if (result != BRASERO_BURN_OK)
continue;
@@ -1137,12 +1133,10 @@ brasero_audio_disc_display_edited_cb (GtkCellRendererText *renderer,
GtkTreeModel *model;
BraseroTrack *track;
GtkTreePath *treepath;
- BraseroSessionCfg *session;
tag = g_object_get_data (G_OBJECT (renderer), COL_KEY);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (disc->priv->tree));
- session = brasero_video_tree_model_get_session (BRASERO_VIDEO_TREE_MODEL (model));
treepath = gtk_tree_path_new_from_string (path_string);
track = brasero_video_tree_model_path_to_track (BRASERO_VIDEO_TREE_MODEL (model), treepath);
brasero_track_tag_add_string (BRASERO_TRACK (track),
@@ -1273,7 +1267,6 @@ static void
brasero_audio_disc_split (BraseroAudioDisc *disc)
{
GtkTreeSelection *selection;
- BraseroSessionCfg *session;
GtkTreePath *treepath;
GtkTreeModel *model;
BraseroTrack *track;
@@ -1306,7 +1299,6 @@ brasero_audio_disc_split (BraseroAudioDisc *disc)
g_list_free (selected);
/* NOTE: this is necessarily a song since otherwise button is grey */
- session = brasero_video_tree_model_get_session (BRASERO_VIDEO_TREE_MODEL (model));
track = brasero_video_tree_model_path_to_track (BRASERO_VIDEO_TREE_MODEL (model), treepath);
dialog = brasero_split_dialog_new ();
@@ -1359,12 +1351,10 @@ brasero_audio_disc_selection_changed (GtkTreeSelection *selection,
GtkAction *action_edit;
GtkAction *action_open;
guint selected_num = 0;
- GtkTreeView *treeview;
GtkTreeModel *model;
GList *selected;
GList *iter;
- treeview = gtk_tree_selection_get_tree_view (selection);
selected = gtk_tree_selection_get_selected_rows (selection, &model);
if (disc->priv->selected_path)
@@ -1470,12 +1460,9 @@ brasero_audio_disc_rename_songs (GtkTreeModel *model,
const gchar *old_name,
const gchar *new_name)
{
- BraseroSessionCfg *session;
BraseroTrack *track;
- session = brasero_video_tree_model_get_session (BRASERO_VIDEO_TREE_MODEL (model));
track = brasero_video_tree_model_path_to_track (BRASERO_VIDEO_TREE_MODEL (model), treepath);
-
brasero_track_tag_add_string (track,
BRASERO_TRACK_STREAM_TITLE_TAG,
new_name);
@@ -1594,7 +1581,6 @@ brasero_audio_disc_edit_single_song_properties (BraseroAudioDisc *disc,
GtkTreeModel *model;
BraseroTrack *track;
GtkResponseType result;
- BraseroSessionCfg *session;
guint64 length;
gchar *title;
gchar *artist;
@@ -1602,7 +1588,6 @@ brasero_audio_disc_edit_single_song_properties (BraseroAudioDisc *disc,
GtkTreeIter iter;
model = gtk_tree_view_get_model (GTK_TREE_VIEW (disc->priv->tree));
- session = brasero_video_tree_model_get_session (BRASERO_VIDEO_TREE_MODEL (model));
track = brasero_video_tree_model_path_to_track (BRASERO_VIDEO_TREE_MODEL (model), treepath);
if (!track)
return;
diff --git a/src/brasero-data-disc.c b/src/brasero-data-disc.c
index cc2b99e..b3db0d4 100644
--- a/src/brasero-data-disc.c
+++ b/src/brasero-data-disc.c
@@ -608,9 +608,6 @@ brasero_data_disc_image_uri_cb (BraseroTrackDataCfg *vfs,
gchar *string;
GtkWidget *button;
GtkWidget *dialog;
- BraseroDataDiscPrivate *priv;
-
- priv = BRASERO_DATA_DISC_PRIVATE (self);
dialog = brasero_app_dialog (brasero_app_get_default (),
_("Do you want to create a disc from the contents of the image or with the image file inside?"),
@@ -671,9 +668,6 @@ brasero_data_disc_unreadable_uri_cb (BraseroTrackDataCfg *vfs,
{
gchar *name;
gchar *primary;
- BraseroDataDiscPrivate *priv;
-
- priv = BRASERO_DATA_DISC_PRIVATE (self);
name = brasero_utils_get_uri_name (uri);
primary = g_strdup_printf (_("\"%s\" cannot be added to the selection."), name);
@@ -692,9 +686,6 @@ brasero_data_disc_recursive_uri_cb (BraseroTrackDataCfg *vfs,
{
gchar *name;
gchar *primary;
- BraseroDataDiscPrivate *priv;
-
- priv = BRASERO_DATA_DISC_PRIVATE (self);
name = brasero_utils_get_uri_name (uri);
primary = g_strdup_printf (_("\"%s\" cannot be added to the selection."), name);
@@ -713,9 +704,6 @@ brasero_data_disc_unknown_uri_cb (BraseroTrackDataCfg *vfs,
{
gchar *name;
gchar *primary;
- BraseroDataDiscPrivate *priv;
-
- priv = BRASERO_DATA_DISC_PRIVATE (self);
name = brasero_utils_get_uri_name (uri);
primary = g_strdup_printf (_("\"%s\" cannot be added to the selection."), name);
@@ -1657,11 +1645,8 @@ brasero_data_disc_set_session_contents (BraseroDisc *self,
BraseroBurnSession *session)
{
BraseroBurnResult result = BRASERO_BURN_OK;
- BraseroDataDiscPrivate *priv;
GSList *tracks;
- priv = BRASERO_DATA_DISC_PRIVATE (self);
-
brasero_data_disc_unset_track (BRASERO_DATA_DISC (self));
if (!session)
diff --git a/src/brasero-file-filtered.c b/src/brasero-file-filtered.c
index 37b25bc..677f60c 100644
--- a/src/brasero-file-filtered.c
+++ b/src/brasero-file-filtered.c
@@ -89,12 +89,9 @@ brasero_file_filtered_get_label_text (BraseroFileFiltered *self)
static void
brasero_file_filtered_update (BraseroFileFiltered *self)
{
- BraseroFileFilteredPrivate *priv;
GtkWidget *widget;
gchar *markup;
- priv = BRASERO_FILE_FILTERED_PRIVATE (self);
-
markup = brasero_file_filtered_get_label_text (self);
widget = gtk_expander_get_label_widget (GTK_EXPANDER (self));
diff --git a/src/brasero-player-bacon.c b/src/brasero-player-bacon.c
index 91a6424..3b9098e 100644
--- a/src/brasero-player-bacon.c
+++ b/src/brasero-player-bacon.c
@@ -133,10 +133,7 @@ brasero_player_bacon_realize (GtkWidget *widget)
gint attributes_mask;
GtkAllocation allocation;
GdkWindowAttr attributes;
- BraseroPlayerBacon *bacon;
- gfloat screen_width, screen_height, ratio;
-
- bacon = BRASERO_PLAYER_BACON (widget);
+ gfloat screen_width, screen_height;
attributes.window_type = GDK_WINDOW_CHILD;
@@ -144,12 +141,6 @@ brasero_player_bacon_realize (GtkWidget *widget)
screen_width = allocation.width;
screen_height = allocation.height;
-
- if ((gfloat) screen_width / PLAYER_BACON_WIDTH >
- (gfloat) screen_height / PLAYER_BACON_HEIGHT)
- ratio = (gfloat) screen_height / PLAYER_BACON_HEIGHT;
- else
- ratio = (gfloat) screen_width / PLAYER_BACON_WIDTH;
attributes.x = allocation.x + (allocation.width - (gint) screen_width) / 2;
attributes.y = allocation.y + (allocation.height - (gint) screen_height) / 2;
@@ -204,10 +195,7 @@ brasero_player_bacon_get_preferred_width (GtkWidget *widget,
gint *minimum,
gint *natural)
{
- BraseroPlayerBacon *bacon;
-
g_return_if_fail (widget != NULL);
- bacon = BRASERO_PLAYER_BACON (widget);
*minimum = *natural = PLAYER_BACON_WIDTH;
@@ -220,10 +208,7 @@ brasero_player_bacon_get_preferred_height (GtkWidget *widget,
gint *minimum,
gint *natural)
{
- BraseroPlayerBacon *bacon;
-
g_return_if_fail (widget != NULL);
- bacon = BRASERO_PLAYER_BACON (widget);
*minimum = *natural = PLAYER_BACON_WIDTH;
@@ -233,18 +218,18 @@ brasero_player_bacon_get_preferred_height (GtkWidget *widget,
static void
brasero_player_bacon_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
+ GtkAllocation *allocation)
{
int screen_x, screen_y;
BraseroPlayerBacon *bacon;
gfloat screen_width, screen_height, ratio;
g_return_if_fail (widget != NULL);
- bacon = BRASERO_PLAYER_BACON (widget);
if (!gtk_widget_get_realized (widget))
return;
+ bacon = BRASERO_PLAYER_BACON (widget);
if (bacon->priv->xoverlay) {
screen_width = allocation->width;
screen_height = allocation->height;
diff --git a/src/brasero-plugin-manager-ui.c b/src/brasero-plugin-manager-ui.c
index d0defe8..67a87ca 100644
--- a/src/brasero-plugin-manager-ui.c
+++ b/src/brasero-plugin-manager-ui.c
@@ -168,17 +168,13 @@ static void
configure_button_cb (GtkWidget *button,
BraseroPluginManagerUI *pm)
{
- GtkResponseType result;
BraseroPlugin *plugin;
- GtkWindow *toplevel;
GtkWidget *dialog;
plugin = plugin_manager_ui_get_selected_plugin (pm);
g_return_if_fail (plugin != NULL);
- toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET(pm)));
-
dialog = brasero_plugin_option_new ();
brasero_plugin_option_set_plugin (BRASERO_PLUGIN_OPTION (dialog), plugin);
@@ -188,7 +184,7 @@ configure_button_cb (GtkWidget *button,
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT);
- result = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
@@ -296,8 +292,7 @@ active_toggled_cb (GtkCellRendererToggle *cell,
model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree));
g_return_if_fail (model != NULL);
- gtk_tree_model_get_iter (model, &iter, path);
- if (&iter != NULL)
+ if (gtk_tree_model_get_iter (model, &iter, path))
plugin_manager_ui_toggle_active (&iter, model);
gtk_tree_path_free (path);
@@ -336,10 +331,7 @@ row_activated_cb (GtkTreeView *tree_view,
model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree));
g_return_if_fail (model != NULL);
-
- gtk_tree_model_get_iter (model, &iter, path);
-
- g_return_if_fail (&iter != NULL);
+ g_return_if_fail (gtk_tree_model_get_iter (model, &iter, path));
plugin_manager_ui_toggle_active (&iter, model);
}
diff --git a/src/brasero-pref.c b/src/brasero-pref.c
index 06db48c..dde6f21 100644
--- a/src/brasero-pref.c
+++ b/src/brasero-pref.c
@@ -52,12 +52,9 @@ brasero_pref_new (void)
static void
brasero_pref_init (BraseroPref *object)
{
- BraseroPrefPrivate *priv;
GtkWidget *notebook;
GtkWidget *plugins;
- priv = BRASERO_PREF_PRIVATE (object);
-
gtk_dialog_add_button (GTK_DIALOG (object), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
gtk_window_set_default_size (GTK_WINDOW (object), 600, 400);
diff --git a/src/brasero-project-name.c b/src/brasero-project-name.c
index a03c1e7..47b5dab 100644
--- a/src/brasero-project-name.c
+++ b/src/brasero-project-name.c
@@ -139,7 +139,6 @@ brasero_project_name_icon_button_clicked (BraseroProjectName *project,
GdkEvent *event,
gpointer NULL_data)
{
- BraseroProjectNamePrivate *priv;
BraseroTrackDataCfg *track;
GtkFileFilter *filter;
gchar *filename;
@@ -148,8 +147,6 @@ brasero_project_name_icon_button_clicked (BraseroProjectName *project,
gchar *path;
gint res;
- priv = BRASERO_PROJECT_NAME_PRIVATE (project);
-
track = brasero_project_name_get_track_data_cfg (project);
if (!track)
return;
@@ -359,7 +356,6 @@ brasero_project_name_label_insert_text (GtkEditable *editable,
gint *position,
gpointer NULL_data)
{
- BraseroProjectNamePrivate *priv;
const gchar *label;
gchar *new_text;
gint new_length;
@@ -368,8 +364,6 @@ brasero_project_name_label_insert_text (GtkEditable *editable,
gchar *prev;
gchar *next;
- priv = BRASERO_PROJECT_NAME_PRIVATE (editable);
-
/* check if this new text will fit in 32 _bytes_ long buffer */
label = gtk_entry_get_text (GTK_ENTRY (editable));
max_len = 32 - strlen (label) - length;
@@ -672,10 +666,6 @@ brasero_project_name_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- BraseroProjectNamePrivate *priv;
-
- priv = BRASERO_PROJECT_NAME_PRIVATE (object);
-
switch (property_id) {
case PROP_SESSION:
brasero_project_name_set_session (BRASERO_PROJECT_NAME (object),
@@ -710,10 +700,6 @@ brasero_project_name_get_property (GObject *object,
static void
brasero_project_name_finalize (GObject *object)
{
- BraseroProjectNamePrivate *priv;
-
- priv = BRASERO_PROJECT_NAME_PRIVATE (object);
-
brasero_project_name_unset_session (BRASERO_PROJECT_NAME (object));
G_OBJECT_CLASS (brasero_project_name_parent_class)->finalize (object);
diff --git a/src/brasero-project-parse.c b/src/brasero-project-parse.c
index a24edb5..5359678 100644
--- a/src/brasero-project-parse.c
+++ b/src/brasero-project-parse.c
@@ -1114,7 +1114,7 @@ brasero_project_save_audio_project_playlist (BraseroBurnSession *session,
result = totem_pl_parser_save (parser, playlist, file,
brasero_burn_session_get_label (session),
- type, NULL);
+ pl_type, NULL);
g_object_unref (playlist);
g_object_unref (parser);
diff --git a/src/brasero-rename.c b/src/brasero-rename.c
index 2429546..bf8f2c9 100644
--- a/src/brasero-rename.c
+++ b/src/brasero-rename.c
@@ -174,11 +174,11 @@ brasero_rename_sequence_string (BraseroRename *self,
guint nb_items)
{
BraseroRenamePrivate *priv;
- gboolean is_at_end;
priv = BRASERO_RENAME_PRIVATE (self);
- is_at_end = gtk_combo_box_get_active (GTK_COMBO_BOX (priv->insert_combo)) != 0;
+ if (!gtk_combo_box_get_active (GTK_COMBO_BOX (priv->insert_combo)))
+ return NULL;
if (nb_items < 10){
return g_strdup_printf ("%i%s", item_num, name);
diff --git a/src/brasero-setting.c b/src/brasero-setting.c
index ce6960a..beb3bc3 100644
--- a/src/brasero-setting.c
+++ b/src/brasero-setting.c
@@ -414,7 +414,6 @@ brasero_setting_save (BraseroSetting *setting)
gchar *contents = NULL;
gsize content_size = 0;
GKeyFile *key_file;
- gboolean res;
gchar *path;
priv = BRASERO_SETTING_PRIVATE (setting);
@@ -426,10 +425,10 @@ brasero_setting_save (BraseroSetting *setting)
NULL);
key_file = g_key_file_new ();
- res = g_key_file_load_from_file (key_file,
- path,
- G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
- NULL);
+ g_key_file_load_from_file (key_file,
+ path,
+ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
+ NULL);
/* Don't worry if it does not work, it could be
* that there isn't any at the moment. */
diff --git a/src/brasero-song-control.c b/src/brasero-song-control.c
index c775d89..a6c7305 100644
--- a/src/brasero-song-control.c
+++ b/src/brasero-song-control.c
@@ -81,13 +81,11 @@ static void
brasero_song_control_update_position (BraseroSongControl *player)
{
gdouble value;
- GtkAdjustment *adjustment;
BraseroSongControlPrivate *priv;
gchar *pos_string, *len_string, *result;
priv = BRASERO_SONG_CONTROL_PRIVATE (player);
- adjustment = gtk_range_get_adjustment (GTK_RANGE (priv->progress));
len_string = brasero_units_get_time_string (priv->end - priv->start, FALSE, FALSE);
value = gtk_range_get_value (GTK_RANGE (priv->progress));
@@ -160,14 +158,13 @@ static gboolean
brasero_song_control_update_progress_cb (BraseroSongControl *player)
{
gint64 pos;
- gboolean result;
BraseroSongControlPrivate *priv;
GstFormat format = GST_FORMAT_TIME;
priv = BRASERO_SONG_CONTROL_PRIVATE (player);
- result = gst_element_query_position (priv->pipe,
- &format,
- &pos);
+ gst_element_query_position (priv->pipe,
+ &format,
+ &pos);
if (pos >= 0) {
gtk_range_set_value (GTK_RANGE (priv->progress), (gsize) (pos - priv->start));
diff --git a/src/brasero-split-dialog.c b/src/brasero-split-dialog.c
index 790c450..7dcf6fc 100644
--- a/src/brasero-split-dialog.c
+++ b/src/brasero-split-dialog.c
@@ -726,7 +726,6 @@ brasero_split_dialog_cut_clicked_cb (GtkButton *button,
BraseroSplitDialog *self)
{
BraseroSplitDialogPrivate *priv;
- GtkTreeModel *model;
guint page;
priv = BRASERO_SPLIT_DIALOG_PRIVATE (self);
@@ -741,7 +740,6 @@ brasero_split_dialog_cut_clicked_cb (GtkButton *button,
return;
}
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree));
if (!brasero_split_dialog_clear_confirm_dialog (self,
_("Do you really want to carry on with automatic splitting?"),
_("_Don't split"),
@@ -958,7 +956,6 @@ brasero_split_dialog_reset_clicked_cb (GtkButton *button,
BraseroSplitDialog *self)
{
BraseroSplitDialogPrivate *priv;
- GtkTreeModel *model;
priv = BRASERO_SPLIT_DIALOG_PRIVATE (self);
if (!brasero_split_dialog_clear_confirm_dialog (self,
@@ -967,7 +964,6 @@ brasero_split_dialog_reset_clicked_cb (GtkButton *button,
_("Re_move All")))
return;
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree));
gtk_list_store_clear (priv->model);
}
diff --git a/src/brasero-video-disc.c b/src/brasero-video-disc.c
index 969a606..3ecdfeb 100644
--- a/src/brasero-video-disc.c
+++ b/src/brasero-video-disc.c
@@ -424,17 +424,12 @@ brasero_video_disc_session_changed (BraseroSessionCfg *session,
{
GSList *next;
GSList *tracks;
- gboolean notready;
BraseroStatus *status;
- BraseroVideoDiscPrivate *priv;
-
- priv = BRASERO_VIDEO_DISC_PRIVATE (self);
if (!gtk_widget_get_window (GTK_WIDGET (self)))
return;
/* make sure all tracks have video */
- notready = FALSE;
status = brasero_status_new ();
tracks = brasero_burn_session_get_tracks (BRASERO_BURN_SESSION (session));
for (; tracks; tracks = next) {
@@ -481,10 +476,8 @@ brasero_video_disc_session_changed (BraseroSessionCfg *session,
continue;
}
- if (result == BRASERO_BURN_NOT_READY || result == BRASERO_BURN_RUNNING) {
- notready = TRUE;
+ if (result == BRASERO_BURN_NOT_READY || result == BRASERO_BURN_RUNNING)
continue;
- }
if (result != BRASERO_BURN_OK)
continue;
@@ -588,12 +581,12 @@ brasero_video_disc_selection_function (GtkTreeSelection *selection,
gboolean path_currently_selected,
gpointer NULL_data)
{
- BraseroTrack *track;
+/* BraseroTrack *track;
track = brasero_video_tree_model_path_to_track (BRASERO_VIDEO_TREE_MODEL (model), treepath);
- /* FIXME: add a tag?? */
-/* if (track)
+ FIXME: add a tag??
+ if (track)
file->editable = !path_currently_selected;
*/
return TRUE;
@@ -721,13 +714,8 @@ brasero_video_disc_edit_song_properties_file (BraseroVideoDisc *self,
GtkWidget *props;
guint64 length = 0;
GtkWidget *toplevel;
- GtkTreeModel *model;
GtkResponseType result;
- BraseroVideoDiscPrivate *priv;
- priv = BRASERO_VIDEO_DISC_PRIVATE (self);
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree));
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (self));
brasero_track_stream_get_length (BRASERO_TRACK_STREAM (track), &length);
diff --git a/src/brasero-video-tree-model.c b/src/brasero-video-tree-model.c
index 2fe4d11..bef333e 100644
--- a/src/brasero-video-tree-model.c
+++ b/src/brasero-video-tree-model.c
@@ -153,7 +153,6 @@ brasero_video_tree_model_get_value (GtkTreeModel *model,
GValue *value)
{
BraseroVideoTreeModelPrivate *priv;
- BraseroVideoTreeModel *self;
BraseroBurnResult result;
BraseroStatus *status;
BraseroTrack *track;
@@ -163,7 +162,6 @@ brasero_video_tree_model_get_value (GtkTreeModel *model,
GSList *tracks;
gchar *text;
- self = BRASERO_VIDEO_TREE_MODEL (model);
priv = BRASERO_VIDEO_TREE_MODEL_PRIVATE (model);
/* make sure that iter comes from us */
@@ -885,8 +883,6 @@ brasero_video_tree_model_drag_data_received (GtkTreeDragDest *drag_dest,
else if (target == gdk_atom_intern ("text/uri-list", TRUE)) {
gint i;
gchar **uris = NULL;
- gboolean success = FALSE;
- const guchar *selection_data_raw;
/* NOTE: for some reason gdk_text_property_to_utf8_list_for_display ()
* fails with banshee DND URIs list when calling gtk_selection_data_get_uris ().
@@ -894,7 +890,6 @@ brasero_video_tree_model_drag_data_received (GtkTreeDragDest *drag_dest,
/* NOTE: there can be many URIs at the same time. One
* success is enough to return TRUE. */
- selection_data_raw = gtk_selection_data_get_data (selection_data);
uris = gtk_selection_data_get_uris (selection_data);
if (!uris) {
const guchar *selection_data_raw;
@@ -906,7 +901,6 @@ brasero_video_tree_model_drag_data_received (GtkTreeDragDest *drag_dest,
if (!uris)
return TRUE;
- success = FALSE;
for (i = 0; uris [i]; i ++) {
BraseroTrackStreamCfg *track;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
