[Xfce4-commits] <xfburn:master> Fixed compiler errors and warnings after applying the patches
David Mohr
noreply at xfce.org
Sun Apr 15 23:34:07 CEST 2012
Updating branch refs/heads/master
to 293d5f48588de941b894c79b0bca5c5c41fb9431 (commit)
from 0e2bdafe39c15183b88a554b23df11d2429b5faa (commit)
commit 293d5f48588de941b894c79b0bca5c5c41fb9431
Author: David Mohr <david at mcbf.net>
Date: Sat Apr 14 23:17:39 2012 -0600
Fixed compiler errors and warnings after applying the patches
configure.in.in | 6 +++---
xfburn/xfburn-audio-composition.c | 18 ++++++++++--------
xfburn/xfburn-blank-dialog.c | 5 +++--
xfburn/xfburn-burn-image-dialog.c | 2 +-
xfburn/xfburn-compositions-notebook.c | 4 ++--
xfburn/xfburn-data-composition.c | 12 +++++++-----
xfburn/xfburn-main.c | 2 +-
xfburn/xfburn-progress-dialog.c | 2 +-
xfburn/xfburn-transcoder-basic.c | 2 +-
9 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 88b7a9d..59e36c8 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -2,14 +2,14 @@ dnl $Id$
dnl Version information
m4_define([xfburn_version_major], [0])
-m4_define([xfburn_version_minor], [4])
-m4_define([xfburn_version_micro], [3])
+m4_define([xfburn_version_minor], [5])
+m4_define([xfburn_version_micro], [0])
m4_define([xfburn_version_build], [@REVISION@])
m4_define([xfburn_version_tag], [])
m4_define([xfburn_version], [xfburn_version_major().xfburn_version_minor().xfburn_version_micro()ifelse(xfburn_version_tag(), [git], [xfburn_version_tag()-xfburn_version_build()], [xfburn_version_tag()])])
dnl Initialize autoconf
-AC_COPYRIGHT([Copyright (c) 2005-2008 Jean-François Wauthy <pollux at xfce.org>, David Mohr <david at mcbf.net>])
+AC_COPYRIGHT([Copyright (c) 2005-2008 Jean-François Wauthy <pollux at xfce.org>, 2008-2012 David Mohr <david at mcbf.net>])
AC_INIT([xfburn], [xfburn_version], [xfburn at xfce.org])
dnl Initialize automake
diff --git a/xfburn/xfburn-audio-composition.c b/xfburn/xfburn-audio-composition.c
index 9528aee..f34ed4a 100644
--- a/xfburn/xfburn-audio-composition.c
+++ b/xfburn/xfburn-audio-composition.c
@@ -1021,7 +1021,7 @@ action_info (GtkAction * action, XfburnAudioComposition * dc)
{
XfburnAudioCompositionPrivate *priv = XFBURN_AUDIO_COMPOSITION_GET_PRIVATE (dc);
- xfce_dialog_show_info(NULL, NULL, xfburn_transcoder_get_description (priv->trans));
+ xfce_dialog_show_info(NULL, NULL, "%s", xfburn_transcoder_get_description (priv->trans));
}
static void
@@ -1062,6 +1062,7 @@ static void
set_modified (XfburnAudioCompositionPrivate *priv)
{
if (!(priv->modified)) {
+ /*
XfburnMainWindow *mainwin;
GtkUIManager *ui_manager;
GtkActionGroup *action_group;
@@ -1071,7 +1072,6 @@ set_modified (XfburnAudioCompositionPrivate *priv)
action_group = (GtkActionGroup *) gtk_ui_manager_get_action_groups (ui_manager)->data;
- /*
action = gtk_action_group_get_action (action_group, "save-composition");
gtk_action_set_sensitive (GTK_ACTION (action), TRUE);
*/
@@ -1089,14 +1089,14 @@ notify_not_adding (XfburnAudioComposition * dc, GError *error)
g_assert (error != NULL);
if (error->domain != XFBURN_ERROR) {
- xfce_dialog_show_warning(NULL, NULL, error->message);
+ xfce_dialog_show_warning(NULL, NULL, "%s", error->message);
return;
}
if (g_hash_table_lookup (priv->warned_about, GINT_TO_POINTER (error->code)) == NULL) {
g_hash_table_insert (priv->warned_about, GINT_TO_POINTER (error->code), did_warn);
- xfce_dialog_show_warning(NULL, NULL, error->message);
+ xfce_dialog_show_warning(NULL, NULL, "%s", error->message);
}
}
@@ -1894,6 +1894,7 @@ typedef struct
GQueue *queue_iter;
} LoadParserStruct;
+/*
static gint
_find_attribute (const gchar ** attribute_names, const gchar * attr)
{
@@ -1906,16 +1907,19 @@ _find_attribute (const gchar ** attribute_names, const gchar * attr)
return -1;
}
+*/
static void
load_composition_start (GMarkupParseContext * context, const gchar * element_name,
const gchar ** attribute_names, const gchar ** attribute_values,
gpointer data, GError ** error)
{
+ g_error ("This method needs to get fixed, and does not work right now!");
+
+ /*
LoadParserStruct * parserinfo = (LoadParserStruct *) data;
XfburnAudioCompositionPrivate *priv = XFBURN_AUDIO_COMPOSITION_GET_PRIVATE (parserinfo->dc);
-
if (!(parserinfo->started) && !strcmp (element_name, "xfburn-composition"))
parserinfo->started = TRUE;
else if (!(parserinfo->started))
@@ -1933,11 +1937,8 @@ load_composition_start (GMarkupParseContext * context, const gchar * element_nam
model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->content));
parent = g_queue_peek_head (parserinfo->queue_iter);
- g_error ("This method needs to get fixed, and does not work right now!");
- /*
add_file_to_list_with_name (attribute_values[i], parserinfo->dc, model, attribute_values[j], &iter,
parent, GTK_TREE_VIEW_DROP_INTO_OR_AFTER);
- */
}
} else if (!strcmp (element_name, "directory")) {
int i, j;
@@ -1952,6 +1953,7 @@ load_composition_start (GMarkupParseContext * context, const gchar * element_nam
//add_directory_to_list (attribute_values[i], parserinfo->dc, model, attribute_values[j], &iter, parent);
}
}
+ */
}
static void
diff --git a/xfburn/xfburn-blank-dialog.c b/xfburn/xfburn-blank-dialog.c
index 94270eb..638770d 100644
--- a/xfburn/xfburn-blank-dialog.c
+++ b/xfburn/xfburn-blank-dialog.c
@@ -327,6 +327,7 @@ thread_blank_perform_blank (ThreadBlankParams * params, struct burn_drive_info *
struct burn_drive *drive;
enum burn_disc_status disc_state;
+ enum burn_drive_status drive_state;
struct burn_progress progress;
int ret;
@@ -412,8 +413,8 @@ thread_blank_perform_blank (ThreadBlankParams * params, struct burn_drive_info *
xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Blanking disc..."));
- while ((disc_state = burn_drive_get_status (drive, &progress)) != BURN_DRIVE_IDLE) {
- //DBG ("disc_state = %d", disc_state);
+ while ((drive_state = burn_drive_get_status (drive, &progress)) != BURN_DRIVE_IDLE) {
+ //DBG ("drive_state = %d", drive_state);
if(progress.sectors>0 && progress.sector>=0) {
gdouble percent = 1.0 + ((gdouble) progress.sector+1.0) / ((gdouble) progress.sectors) * 98.0;
diff --git a/xfburn/xfburn-burn-image-dialog.c b/xfburn/xfburn-burn-image-dialog.c
index 1fb36f5..f14dc93 100644
--- a/xfburn/xfburn-burn-image-dialog.c
+++ b/xfburn/xfburn-burn-image-dialog.c
@@ -400,7 +400,7 @@ thread_burn_iso (ThreadBurnIsoParams * params)
void
burn_image_dialog_error (XfburnBurnImageDialog * dialog, const gchar * msg_error)
{
- xfce_dialog_show_error (NULL, NULL, msg_error);
+ xfce_dialog_show_error (NULL, NULL, "%s", msg_error);
}
static void
diff --git a/xfburn/xfburn-compositions-notebook.c b/xfburn/xfburn-compositions-notebook.c
index 8830723..e3f2389 100644
--- a/xfburn/xfburn-compositions-notebook.c
+++ b/xfburn/xfburn-compositions-notebook.c
@@ -146,10 +146,10 @@ cb_composition_close (XfburnNotebookTab *tab, GtkNotebook *notebook)
static void
cb_composition_name_changed (XfburnComposition *composition, const gchar * name, XfburnCompositionsNotebook *notebook)
{
- guint page_num;
+ //guint page_num;
GtkWidget *tab, *menu_label;
- page_num = gtk_notebook_page_num (GTK_NOTEBOOK (notebook), GTK_WIDGET (composition));
+ //page_num = gtk_notebook_page_num (GTK_NOTEBOOK (notebook), GTK_WIDGET (composition));
tab = gtk_notebook_get_tab_label (GTK_NOTEBOOK (notebook), GTK_WIDGET (composition));
xfburn_notebook_tab_set_label (XFBURN_NOTEBOOK_TAB (tab), name);
diff --git a/xfburn/xfburn-data-composition.c b/xfburn/xfburn-data-composition.c
index d1c5974..4ee22d1 100644
--- a/xfburn/xfburn-data-composition.c
+++ b/xfburn/xfburn-data-composition.c
@@ -1031,6 +1031,7 @@ static void
set_modified (XfburnDataCompositionPrivate *priv)
{
if (!(priv->modified)) {
+ /*
XfburnMainWindow *mainwin;
GtkUIManager *ui_manager;
GtkActionGroup *action_group;
@@ -1040,10 +1041,9 @@ set_modified (XfburnDataCompositionPrivate *priv)
action_group = (GtkActionGroup *) gtk_ui_manager_get_action_groups (ui_manager)->data;
- /*
action = gtk_action_group_get_action (action_group, "save-composition");
gtk_action_set_sensitive (GTK_ACTION (action), TRUE);
- */
+ */
priv->modified = TRUE;
}
}
@@ -1919,6 +1919,7 @@ typedef struct
GQueue *queue_iter;
} LoadParserStruct;
+/*
static gint
_find_attribute (const gchar ** attribute_names, const gchar * attr)
{
@@ -1931,12 +1932,15 @@ _find_attribute (const gchar ** attribute_names, const gchar * attr)
return -1;
}
+*/
static void
load_composition_start (GMarkupParseContext * context, const gchar * element_name,
const gchar ** attribute_names, const gchar ** attribute_values,
gpointer data, GError ** error)
{
+ g_error ("This method needs to get fixed, and does not work right now!");
+/*
LoadParserStruct * parserinfo = (LoadParserStruct *) data;
XfburnDataCompositionPrivate *priv = XFBURN_DATA_COMPOSITION_GET_PRIVATE (parserinfo->dc);
@@ -1958,11 +1962,8 @@ load_composition_start (GMarkupParseContext * context, const gchar * element_nam
model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->content));
parent = g_queue_peek_head (parserinfo->queue_iter);
- g_error ("This method needs to get fixed, and does not work right now!");
- /*
add_file_to_list_with_name (attribute_values[i], parserinfo->dc, model, attribute_values[j], &iter,
parent, GTK_TREE_VIEW_DROP_INTO_OR_AFTER);
- */
}
} else if (!strcmp (element_name, "directory")) {
int i, j;
@@ -1977,6 +1978,7 @@ load_composition_start (GMarkupParseContext * context, const gchar * element_nam
//add_directory_to_list (attribute_values[i], parserinfo->dc, model, attribute_values[j], &iter, parent);
}
}
+ */
}
static void
diff --git a/xfburn/xfburn-main.c b/xfburn/xfburn-main.c
index bd1168c..9bfd574 100644
--- a/xfburn/xfburn-main.c
+++ b/xfburn/xfburn-main.c
@@ -361,7 +361,7 @@ main (int argc, char **argv)
if (g_file_test (image_fullname, G_FILE_TEST_EXISTS))
xfburn_burn_image_dialog_set_filechooser_name (dialog, image_fullname);
else
- xfce_dialog_show_error (NULL, NULL, g_strdup_printf ( _("Image file '%s' does not exist."), image_fullname));
+ xfce_dialog_show_error (NULL, NULL, _("Image file '%s' does not exist."), image_fullname);
}
gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/xfburn/xfburn-progress-dialog.c b/xfburn/xfburn-progress-dialog.c
index 2b5ecc3..1272e03 100644
--- a/xfburn/xfburn-progress-dialog.c
+++ b/xfburn/xfburn-progress-dialog.c
@@ -603,7 +603,7 @@ xfburn_progress_dialog_burning_failed (XfburnProgressDialog * dialog, const gcha
xfburn_progress_dialog_set_status_with_text (dialog, XFBURN_PROGRESS_DIALOG_STATUS_FAILED, _("Failure"));
gdk_threads_enter ();
- xfce_dialog_show_error (NULL, NULL, msg_error);
+ xfce_dialog_show_error (NULL, NULL, "%s", msg_error);
gdk_threads_leave ();
}
diff --git a/xfburn/xfburn-transcoder-basic.c b/xfburn/xfburn-transcoder-basic.c
index 3796c8f..2cc8b58 100644
--- a/xfburn/xfburn-transcoder-basic.c
+++ b/xfburn/xfburn-transcoder-basic.c
@@ -235,7 +235,7 @@ is_valid_wav (const gchar *path)
fd = open (path, 0);
if (fd == -1) {
- xfce_dialog_show_warning(NULL, _("Could not open %s."), path);
+ xfce_dialog_show_warning(NULL, "", _("Could not open %s."), path);
return FALSE;
}
More information about the Xfce4-commits
mailing list