diff --combined xfburn/xfburn-audio-composition.c
index d0b11f8,6a9d014..0000000
--- a/xfburn/xfburn-audio-composition.c
+++ b/xfburn/xfburn-audio-composition.c
@@@ -148,7 -148,7 +148,7 @@@ static void cb_cell_title_edited (GtkCe
  static void cb_content_drag_data_rcv (GtkWidget * widget, GdkDragContext * dc, guint x, guint y, GtkSelectionData * sd,
                                        guint info, guint t, XfburnAudioComposition * composition);
  static void cb_content_drag_data_get (GtkWidget * widget, GdkDragContext * dc, GtkSelectionData * data, guint info,
 -                                      guint time, XfburnAudioComposition * content);
 +                                      guint tm, XfburnAudioComposition * content);
  static void cb_adding_done (XfburnAddingProgress *progress, XfburnAudioComposition *dc);
  
  /* thread entry points */
@@@ -1027,7 -1027,7 +1027,7 @@@ action_info (GtkAction * action, Xfburn
  
  static void
  cb_content_drag_data_get (GtkWidget * widget, GdkDragContext * dc,
 -                          GtkSelectionData * data, guint info, guint time, XfburnAudioComposition * content)
 +                          GtkSelectionData * data, guint info, guint tm, XfburnAudioComposition * content)
  {
    if (info == AUDIO_COMPOSITION_DND_TARGET_INSIDE) {
      GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
@@@ -1309,7 -1309,7 +1309,7 @@@ thread_add_files_cli (ThreadAddFilesCLI
  }
  
  static gboolean
 -show_add_home_question_dialog ()
 +show_add_home_question_dialog (void)
  {
    gboolean ok = TRUE;
  
diff --combined xfburn/xfburn-audio-track-gst.c
index 9498ce8,85117a3..0000000
--- a/xfburn/xfburn-audio-track-gst.c
+++ b/xfburn/xfburn-audio-track-gst.c
@@@ -29,7 -29,7 +29,7 @@@ void audio_track_gst_free (gpointer box
  
  /* implementations */
  GType
 -xfburn_audio_track_gst_get_type ()
 +xfburn_audio_track_gst_get_type (void)
  {
    static GType type = 0;
  
diff --combined xfburn/xfburn-audio-track.c
index 200be4f,261307d..0000000
--- a/xfburn/xfburn-audio-track.c
+++ b/xfburn/xfburn-audio-track.c
@@@ -29,7 -29,7 +29,7 @@@ void audio_track_free (gpointer boxed)
  
  /* implementations */
  GType
 -xfburn_audio_track_get_type ()
 +xfburn_audio_track_get_type (void)
  {
    static GType type = 0;
  
diff --combined xfburn/xfburn-blank-dialog.c
index 4fe4eca,9776e0c..0000000
--- a/xfburn/xfburn-blank-dialog.c
+++ b/xfburn/xfburn-blank-dialog.c
@@@ -110,7 -110,7 +110,7 @@@ static XfceTitledDialogClass *parent_cl
  
  
  GType
 -xfburn_blank_dialog_get_type ()
 +xfburn_blank_dialog_get_type (void)
  {
    static GType type = 0;
  
@@@ -531,7 -531,7 +531,7 @@@ cb_volume_changed (GtkWidget *device_bo
  
  /* public */
  GtkWidget *
 -xfburn_blank_dialog_new ()
 +xfburn_blank_dialog_new (void)
  {
    GtkWidget *obj;
  
diff --combined xfburn/xfburn-burn-audio-cd-composition-dialog.c
index 06cf8a1,1b513c0..0000000
--- a/xfburn/xfburn-burn-audio-cd-composition-dialog.c
+++ b/xfburn/xfburn-burn-audio-cd-composition-dialog.c
@@@ -83,7 -83,7 +83,7 @@@ static void cb_dialog_response (XfburnB
  static XfceTitledDialogClass *parent_class = NULL;
  
  GType
 -xfburn_burn_audio_cd_composition_dialog_get_type ()
 +xfburn_burn_audio_cd_composition_dialog_get_type (void)
  {
    static GType type = 0;
  
@@@ -367,7 -367,7 +367,7 @@@ thread_burn_composition (ThreadBurnComp
    int i,j;
    GSList *track_list;
    int *track_sectors;
 -  gboolean abort = FALSE;
 +  gboolean abort_burn = FALSE;
    XfburnTranscoder *trans;
    GError *error = NULL;
  
@@@ -390,7 -390,7 +390,7 @@@
      if (tracks[i] == NULL) {
        xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), error->message);
        g_error_free (error);
 -      abort = TRUE;
 +      abort_burn = TRUE;
        break;
      }
      srcs[i] = atrack->src;
@@@ -400,15 -400,15 +400,15 @@@
      track_list = g_slist_next (track_list);
    }
  
 -  if (!abort) {
 +  if (!abort_burn) {
      if (!xfburn_transcoder_prepare (trans, &error)) {
        xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), error->message);
        g_error_free (error);
 -      abort = TRUE;
 +      abort_burn = TRUE;
      }
    }
  
 -  if (!abort) {
 +  if (!abort_burn) {
      if (!xfburn_device_grab (params->device, &drive_info)) {
        xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), _("Unable to grab the drive."));
      } else {
@@@ -440,11 -440,6 +440,11 @@@ cb_dialog_response (XfburnBurnAudioCdCo
  {
    if (response_id == GTK_RESPONSE_OK) {
      GtkWidget *dialog_progress;
 +    ThreadBurnCompositionParams *params = NULL;
 +    XfburnDevice *device;
 +    gint speed;
 +    XfburnWriteMode write_mode;
 +    //struct burn_source * src_fifo = NULL;
  
      /* If the name was the default, update the image volume id and volset id */
      /*
@@@ -461,6 -456,12 +461,6 @@@
      
      gtk_widget_show (dialog_progress);
  
 -    ThreadBurnCompositionParams *params = NULL;
 -    XfburnDevice *device;
 -    gint speed;
 -    XfburnWriteMode write_mode;
 -    //struct burn_source * src_fifo = NULL;
 -
      device = xfburn_device_box_get_selected_device (XFBURN_DEVICE_BOX (priv->device_box));
      speed = xfburn_device_box_get_speed (XFBURN_DEVICE_BOX (priv->device_box));
      /* cdrskin burns audio with SAO */
diff --combined xfburn/xfburn-burn-data-cd-composition-dialog.c
index e3c3e02,116350a..0000000
--- a/xfburn/xfburn-burn-data-cd-composition-dialog.c
+++ b/xfburn/xfburn-burn-data-cd-composition-dialog.c
@@@ -55,7 -55,7 +55,7 @@@ static void xfburn_burn_data_cd_composi
  static XfceTitledDialogClass *parent_class = NULL;
  
  GType
 -xfburn_burn_data_cd_composition_dialog_get_type ()
 +xfburn_burn_data_cd_composition_dialog_get_type (void)
  {
    static GType type = 0;
  
diff --combined xfburn/xfburn-burn-data-composition-base-dialog.c
index 35d8a94,e6d2232..0000000
--- a/xfburn/xfburn-burn-data-composition-base-dialog.c
+++ b/xfburn/xfburn-burn-data-composition-base-dialog.c
@@@ -113,7 -113,7 +113,7 @@@ static void cb_dialog_response (XfburnB
  static XfceTitledDialogClass *parent_class = NULL;
  
  GType
 -xfburn_burn_data_composition_base_dialog_get_type ()
 +xfburn_burn_data_composition_base_dialog_get_type (void)
  {
    static GType type = 0;
  
@@@ -500,8 -500,8 +500,8 @@@ thread_write_iso (ThreadWriteIsoParams 
        i++;
  
        if (i >= 1000) {
 -	i = 0;
  	gdouble percent = 0;
 +	i = 0;
  
  	percent = ((gdouble) written / (gdouble) size);
  
diff --combined xfburn/xfburn-burn-data-dvd-composition-dialog.c
index da4b83a,05917a4..0000000
--- a/xfburn/xfburn-burn-data-dvd-composition-dialog.c
+++ b/xfburn/xfburn-burn-data-dvd-composition-dialog.c
@@@ -56,7 -56,7 +56,7 @@@ static void xfburn_burn_data_dvd_compos
  static XfceTitledDialogClass *parent_class = NULL;
  
  GType
 -xfburn_burn_data_dvd_composition_dialog_get_type ()
 +xfburn_burn_data_dvd_composition_dialog_get_type (void)
  {
    static GType type = 0;
  
diff --combined xfburn/xfburn-burn-image-dialog.c
index a4deb7d,68b568f..0000000
--- a/xfburn/xfburn-burn-image-dialog.c
+++ b/xfburn/xfburn-burn-image-dialog.c
@@@ -90,7 -90,7 +90,7 @@@ static void cb_clicked_ok (GtkButton * 
  static XfceTitledDialogClass *parent_class = NULL;
  
  GType
 -xfburn_burn_image_dialog_get_type ()
 +xfburn_burn_image_dialog_get_type (void)
  {
    static GType type = 0;
  
@@@ -581,7 -581,7 +581,7 @@@ cb_clicked_ok (GtkButton *button, gpoin
  
  /* public */
  GtkWidget *
 -xfburn_burn_image_dialog_new ()
 +xfburn_burn_image_dialog_new (void)
  {
    GtkWidget *obj;
  
diff --combined xfburn/xfburn-compositions-notebook.c
index 8830723,f9d8087..0000000
--- a/xfburn/xfburn-compositions-notebook.c
+++ b/xfburn/xfburn-compositions-notebook.c
@@@ -59,7 -59,7 +59,7 @@@ static XfburnComposition * add_composit
  static GtkNotebookClass *parent_class = NULL;
  
  GType
 -xfburn_compositions_notebook_get_type ()
 +xfburn_compositions_notebook_get_type (void)
  {
    static GType type = 0;
  
@@@ -210,7 -210,7 +210,7 @@@ add_composition_with_data (XfburnCompos
  /* public */
  /**********/
  GtkWidget *
 -xfburn_compositions_notebook_new ()
 +xfburn_compositions_notebook_new (void)
  {
    GtkWidget *obj;
  
diff --combined xfburn/xfburn-data-composition.c
index d2e1c61,54c1a97..0000000
--- a/xfburn/xfburn-data-composition.c
+++ b/xfburn/xfburn-data-composition.c
@@@ -130,7 -130,7 +130,7 @@@ static void cb_cell_file_edited (GtkCel
  static void cb_content_drag_data_rcv (GtkWidget * widget, GdkDragContext * dc, guint x, guint y, GtkSelectionData * sd,
                                        guint info, guint t, XfburnDataComposition * composition);
  static void cb_content_drag_data_get (GtkWidget * widget, GdkDragContext * dc, GtkSelectionData * data, guint info,
 -                                      guint time, XfburnDataComposition * content);
 +                                      guint tm, XfburnDataComposition * content);
  static void cb_adding_done (XfburnAddingProgress *progress, XfburnDataComposition *dc);
  
  /* thread entry points */
@@@ -999,7 -999,7 +999,7 @@@ action_clear (GtkAction * action, Xfbur
  
  static void
  cb_content_drag_data_get (GtkWidget * widget, GdkDragContext * dc,
 -                          GtkSelectionData * data, guint info, guint time, XfburnDataComposition * content)
 +                          GtkSelectionData * data, guint info, guint tm, XfburnDataComposition * content)
  {
    if (info == DATA_COMPOSITION_DND_TARGET_INSIDE) {
      GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
@@@ -1283,7 -1283,7 +1283,7 @@@ thread_add_files_cli (ThreadAddFilesCLI
  }
  
  static gboolean
 -show_add_home_question_dialog ()
 +show_add_home_question_dialog (void)
  {
    gboolean ok = TRUE;
  
diff --combined xfburn/xfburn-device-box.c
index 41d81f5,ad209af..0000000
--- a/xfburn/xfburn-device-box.c
+++ b/xfburn/xfburn-device-box.c
@@@ -376,7 -376,7 +376,7 @@@ xfburn_device_box_set_property (GObjec
  /*************/
  
  static void
 -empty_speed_list_dialog ()
 +empty_speed_list_dialog (void)
  {
    GtkDialog *dialog;
    GtkWidget *label;
diff --combined xfburn/xfburn-device-list.c
index cc59455,6dcf3b1..0000000
--- a/xfburn/xfburn-device-list.c
+++ b/xfburn/xfburn-device-list.c
@@@ -316,17 -316,17 +316,17 @@@ get_libburn_device_list (XfburnDeviceLi
    for (i = 0; i < priv->num_drives; i++) {
      XfburnDevice *device = xfburn_device_new ();
      const gchar *name;
 -    char addr[BURN_DRIVE_ADR_LEN];;
 -    gint ret = 0;
 +    char addr[BURN_DRIVE_ADR_LEN];
 +    gint retval = 0;
      
      name = xfburn_device_set_name (device, drives[i].vendor, drives[i].product);
  
      xfburn_device_fillin_libburn_info (device, &drives[i]);
  
      
 -    ret = burn_drive_d_get_adr (drives[i].drive, addr);
 -    if (ret <= 0)
 -      g_error ("Unable to get drive %s address (ret=%d). Please report this problem to libburn-hackers@pykix.org", name, ret);
 +    retval = burn_drive_d_get_adr (drives[i].drive, addr);
 +    if (retval <= 0)
 +      g_error ("Unable to get drive %s address (ret=%d). Please report this problem to libburn-hackers@pykix.org", name, retval);
      //DBG ("device->addr = %s", device->addr);
  
      g_object_set (device, "address", addr, NULL);
diff --combined xfburn/xfburn-directory-browser.c
index 53465ef,0191cd3..0000000
--- a/xfburn/xfburn-directory-browser.c
+++ b/xfburn/xfburn-directory-browser.c
@@@ -202,7 -202,7 +202,7 @@@ directory_tree_sortfunc (GtkTreeModel 
  
  static void
  cb_browser_drag_data_get (GtkWidget * widget, GdkDragContext * dc,
 -                          GtkSelectionData * data, guint info, guint time, gpointer user_data)
 +                          GtkSelectionData * data, guint info, guint tm, gpointer user_data)
  {
    if (info == DATA_COMPOSITION_DND_TARGET_TEXT_PLAIN) {
      gchar *full_paths = NULL;
diff --combined xfburn/xfburn-disc-usage.c
index 5971272,08b1c16..0000000
--- a/xfburn/xfburn-disc-usage.c
+++ b/xfburn/xfburn-disc-usage.c
@@@ -81,6 -81,8 +81,6 @@@ enu
    LAST_SIGNAL,
  };
  
 -static guint signals[LAST_SIGNAL];
 -
  /*******************************/
  /* XfburnDiscUsage class */
  /*******************************/
diff --combined xfburn/xfburn-error.c
index 5883182,35e54d7..0000000
--- a/xfburn/xfburn-error.c
+++ b/xfburn/xfburn-error.c
@@@ -23,7 -23,7 +23,7 @@@
  #include "xfburn-error.h"
  
  GQuark
 -xfburn_error_quark ()
 +xfburn_error_quark (void)
  {
    return g_quark_from_static_string ("xfburn-error-quark");
  }
diff --combined xfburn/xfburn-fs-browser.c
index be51943,dcde5da..0000000
--- a/xfburn/xfburn-fs-browser.c
+++ b/xfburn/xfburn-fs-browser.c
@@@ -46,7 -46,7 +46,7 @@@ static void cb_browser_drag_data_get (G
  static ExoTreeViewClass *parent_class = NULL;
  
  GType
 -xfburn_fs_browser_get_type ()
 +xfburn_fs_browser_get_type (void)
  {
    static GType type = 0;
  
@@@ -222,7 -222,7 +222,7 @@@ cb_browser_row_activated (GtkTreeView *
  
  static void
  cb_browser_drag_data_get (GtkWidget * widget, GdkDragContext * dc,
 -                          GtkSelectionData * data, guint info, guint time, XfburnFsBrowser *browser)
 +                          GtkSelectionData * data, guint info, guint tm, XfburnFsBrowser *browser)
  {
    if (info == DATA_COMPOSITION_DND_TARGET_TEXT_PLAIN) {
      gchar *full_path = NULL;
@@@ -235,7 -235,7 +235,7 @@@
  
  /* public methods */
  GtkWidget *
 -xfburn_fs_browser_new ()
 +xfburn_fs_browser_new (void)
  {
    return g_object_new (XFBURN_TYPE_FS_BROWSER, NULL);
  }
diff --combined xfburn/xfburn-hal-manager.c
index 8805c6b,b01ad87..0000000
--- a/xfburn/xfburn-hal-manager.c
+++ b/xfburn/xfburn-hal-manager.c
@@@ -44,7 -44,6 +44,7 @@@
  #include "xfburn-hal-manager.h"
  
  static void xfburn_hal_manager_class_init (XfburnHalManagerClass * klass);
 +GObject * xfburn_hal_manager_new (void);
  static void xfburn_hal_manager_init (XfburnHalManager * obj);
  static void xfburn_hal_manager_finalize (GObject * object);
  
@@@ -80,7 -79,7 +80,7 @@@ static XfburnProgressDialogClass *paren
  static guint signals[LAST_SIGNAL];
  
  GType
 -xfburn_hal_manager_get_type ()
 +xfburn_hal_manager_get_type (void)
  {
    static GType type = 0;
  
@@@ -257,7 -256,7 +257,7 @@@ static void cb_prop_modified (LibHalCon
  }
  
  GObject *
 -xfburn_hal_manager_new ()
 +xfburn_hal_manager_new (void)
  {
    if (G_UNLIKELY (halman != NULL))
      g_error ("Trying to create a second instance of hal manager!");
@@@ -269,7 -268,7 +269,7 @@@
  /*        */
  
  gchar *
 -xfburn_hal_manager_create_global ()
 +xfburn_hal_manager_create_global (void)
  {
    XfburnHalManagerPrivate *priv;
  
@@@ -290,7 -289,7 +290,7 @@@
  }
  
  XfburnHalManager *
 -xfburn_hal_manager_get_global ()
 +xfburn_hal_manager_get_global (void)
  {
    if (G_UNLIKELY (halman == NULL))
      g_error ("There is no instance of a hal manager!");
@@@ -298,7 -297,7 +298,7 @@@
  }
  
  void
 -xfburn_hal_manager_shutdown ()
 +xfburn_hal_manager_shutdown (void)
  {
    if (G_UNLIKELY (halman == NULL))
      g_error ("There is no instance of a hal manager!");
@@@ -307,7 -306,7 +307,7 @@@
  }
  
  void
 -xfburn_hal_manager_send_volume_changed ()
 +xfburn_hal_manager_send_volume_changed (void)
  {
    //gdk_threads_enter ();
    g_signal_emit (halman, signals[VOLUME_CHANGED], 0);
@@@ -315,9 -314,9 +315,9 @@@
  }
  
  int 
 -xfburn_hal_manager_get_devices (XfburnHalManager *halman, GList **device_list)
 +xfburn_hal_manager_get_devices (XfburnHalManager *hal_man, GList **device_list)
  {
 -  XfburnHalManagerPrivate *priv = XFBURN_HAL_MANAGER_GET_PRIVATE (halman);
 +  XfburnHalManagerPrivate *priv = XFBURN_HAL_MANAGER_GET_PRIVATE (hal_man);
    char **all_devices, **devices;
    int num;
    DBusError error;
@@@ -483,9 -482,9 +483,9 @@@ is_a_device
  }
  
  gboolean
 -xfburn_hal_manager_check_ask_umount (XfburnHalManager *halman, XfburnDevice *device)
 +xfburn_hal_manager_check_ask_umount (XfburnHalManager *hal_man, XfburnDevice *device)
  {
 -  XfburnHalManagerPrivate *priv = XFBURN_HAL_MANAGER_GET_PRIVATE (halman);
 +  XfburnHalManagerPrivate *priv = XFBURN_HAL_MANAGER_GET_PRIVATE (hal_man);
    LibHalVolume *vol;
  #ifdef HAVE_THUNAR_VFS
    const char *mp;
diff --combined xfburn/xfburn-main-window.c
index 9e0e7ec,b587643..0000000
--- a/xfburn/xfburn-main-window.c
+++ b/xfburn/xfburn-main-window.c
@@@ -683,7 -683,7 +683,7 @@@ xfburn_main_window_new (void
  }
  
  XfburnMainWindow *
 -xfburn_main_window_get_instance ()
 +xfburn_main_window_get_instance (void)
  {
    if (!instance)
      g_warning ("No existing instance of XfburnMainWindow");
diff --combined xfburn/xfburn-main.c
index 9b29120,192d2aa..0000000
--- a/xfburn/xfburn-main.c
+++ b/xfburn/xfburn-main.c
@@@ -50,14 -50,11 +50,14 @@@
  #include "xfburn-hal-manager.h"
  #include "xfburn-transcoder-basic.h"
  #include "xfburn-transcoder-gst.h"
 +#include "xfburn-main.h"
  
  
  /* internal prototypes */
  static gboolean parse_option (const gchar *option_name, const gchar *value,
  			      gpointer data, GError **error);
 +void xfburn_main_enter_main_window (void);
 +void print_available_transcoders (void);
  
  /* globals */
  static int window_counter = 0;
@@@ -102,7 -99,7 +102,7 @@@ static GOptionEntry optionentries[] = 
  
  /* public functions */
  void
 -xfburn_main_enter_window ()
 +xfburn_main_enter_window (void)
  {
    /* if a main window is present, then it is in control */
    if (window_counter != -42)
@@@ -110,7 -107,7 +110,7 @@@
  }
  
  void 
 -xfburn_main_leave_window ()
 +xfburn_main_leave_window (void)
  {
    /* if a main window is present, then it is in control */
    if (window_counter == -42)
@@@ -122,7 -119,7 +122,7 @@@
  }
  
  void
 -xfburn_main_enter_main_window ()
 +xfburn_main_enter_main_window (void)
  {
    /* mark the window_counter as having a main window */
    window_counter = -42;
@@@ -173,7 -170,7 +173,7 @@@ static gboolean parse_option (const gch
  
  
  void
 -print_available_transcoders ()
 +print_available_transcoders (void)
  {
    g_print ("Valid transcoders are:\n");
    g_print ("\tbasic\tCan only burn uncompressed CD quality .wav files.\n");
diff --combined xfburn/xfburn-notebook-tab.c
index a08677b,369bc42..0000000
--- a/xfburn/xfburn-notebook-tab.c
+++ b/xfburn/xfburn-notebook-tab.c
@@@ -63,7 -63,7 +63,7 @@@ static guint notebook_tab_signals[LAST_
  /* class initiliazation */
  /************************/
  GType
 -xfburn_notebook_tab_get_type ()
 +xfburn_notebook_tab_get_type (void)
  {
    static GType type = 0;
  
diff --combined xfburn/xfburn-preferences-dialog.c
index 6e9d025,c5081e1..0000000
--- a/xfburn/xfburn-preferences-dialog.c
+++ b/xfburn/xfburn-preferences-dialog.c
@@@ -87,7 -87,7 +87,7 @@@ typedef struc
  static XfceTitledDialogClass *parent_class = NULL;
  
  GType
 -xfburn_preferences_dialog_get_type ()
 +xfburn_preferences_dialog_get_type (void)
  {
    static GType type = 0;
  
@@@ -136,7 -136,7 +136,7 @@@ xfburn_preferences_dialog_init (XfburnP
    GtkTreeViewColumn *column_name;
    GtkCellRenderer *cell_icon, *cell_name;
    GtkWidget *button_close;
 -  gint index;
 +  gint idx;
    
    gtk_window_set_title (GTK_WINDOW (obj), _("Preferences"));
    xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (obj), _("Tune how Xfburn behaves"));
@@@ -179,7 -179,7 +179,7 @@@
    /* general tab */
    vbox = gtk_vbox_new (FALSE, 0);
    gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
 -  index = gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), vbox, NULL);
 +  idx = gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), vbox, NULL);
    gtk_widget_show (vbox);
  
    vbox2 = gtk_vbox_new (FALSE, 0);
@@@ -221,14 -221,14 +221,14 @@@
    gtk_list_store_set (icon_store, &iter,
                        SETTINGS_LIST_PIXBUF_COLUMN, icon,
                        SETTINGS_LIST_TEXT_COLUMN, _("General"),
 -                      SETTINGS_LIST_INDEX_COLUMN, index,
 +                      SETTINGS_LIST_INDEX_COLUMN, idx,
                        -1);
    g_object_unref (G_OBJECT (icon));
    
    /* devices tab */
    vbox = gtk_vbox_new (FALSE, 0);
    gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
 -  index = gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), vbox, NULL);
 +  idx = gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), vbox, NULL);
    gtk_widget_show (vbox);
  
    label = gtk_label_new (_("Devices"));
@@@ -309,7 -309,7 +309,7 @@@
    gtk_list_store_set (icon_store, &iter,
                        SETTINGS_LIST_PIXBUF_COLUMN, icon,
                        SETTINGS_LIST_TEXT_COLUMN, _("Devices"),
 -                      SETTINGS_LIST_INDEX_COLUMN, index,
 +                      SETTINGS_LIST_INDEX_COLUMN, idx,
                        -1);
    if (icon)
      g_object_unref (G_OBJECT (icon));
@@@ -465,7 -465,7 +465,7 @@@ cb_show_hidden_clicked (GtkButton * But
  
  /* public */
  GtkWidget *
 -xfburn_preferences_dialog_new ()
 +xfburn_preferences_dialog_new (void)
  {
    GtkWidget *obj;
  
diff --combined xfburn/xfburn-progress-dialog.c
index b3a145b,3706504..0000000
--- a/xfburn/xfburn-progress-dialog.c
+++ b/xfburn/xfburn-progress-dialog.c
@@@ -111,7 -111,7 +111,7 @@@ xfburn_progress_dialog_status_get_type 
  static GtkDialogClass *parent_class = NULL;
  
  GType
 -xfburn_progress_dialog_get_type ()
 +xfburn_progress_dialog_get_type (void)
  {
    static GType type = 0;
  
diff --combined xfburn/xfburn-settings.c
index a3a7948,1e4676b..0000000
--- a/xfburn/xfburn-settings.c
+++ b/xfburn/xfburn-settings.c
@@@ -83,7 -83,7 +83,7 @@@ static GObjectClass *parent_class = NUL
  static XfburnSettings *instance = NULL;
  
  GType
 -xfburn_settings_get_type ()
 +xfburn_settings_get_type (void)
  {
    static GType type = 0;
  
@@@ -327,7 -327,7 +327,7 @@@ value_destroy (Setting * val
  }
  
  static XfburnSettings*
 -get_instance ()
 +get_instance (void)
  {
    if (G_LIKELY (instance))
  	return instance;
@@@ -341,7 -341,7 +341,7 @@@
  /* public methods */
  /******************/
  void
 -xfburn_settings_init ()
 +xfburn_settings_init (void)
  {
    if (G_LIKELY (instance == NULL)) {
  	XfburnSettingsPrivate *priv;
@@@ -358,27 -358,27 +358,27 @@@
  }
  
  void
 -xfburn_settings_flush ()
 +xfburn_settings_flush (void)
  {
 -  XfburnSettings *instance = get_instance ();
 -  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
 +  XfburnSettings *settings_instance = get_instance ();
 +  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings_instance);
    
    save_settings (priv);
  }
  
  void
 -xfburn_settings_free ()
 +xfburn_settings_free (void)
  {
 -  XfburnSettings *instance = get_instance ();
 +  XfburnSettings *settings_instance = get_instance ();
   
 -  g_object_unref (instance);
 +  g_object_unref (settings_instance);
  }
  
  gboolean
  xfburn_settings_get_boolean (const gchar * key, gboolean fallback)
  {
 -  XfburnSettings *instance = get_instance ();
 -  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
 +  XfburnSettings *settings_instance = get_instance ();
 +  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings_instance);
    gpointer orig;
    gpointer value;
  
@@@ -397,8 -397,8 +397,8 @@@
  gint
  xfburn_settings_get_int (const gchar * key, gint fallback)
  {
 -  XfburnSettings *instance = get_instance ();
 -  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
 +  XfburnSettings *settings_instance = get_instance ();
 +  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings_instance);
    gpointer orig;
    gpointer value;
  
@@@ -417,8 -417,8 +417,8 @@@
  gchar *
  xfburn_settings_get_string (const gchar * key, const gchar * fallback)
  {
 -  XfburnSettings *instance = get_instance ();
 -  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
 +  XfburnSettings *settings_instance = get_instance ();
 +  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings_instance);
    gpointer orig;
    gpointer value;
  
@@@ -437,8 -437,8 +437,8 @@@
  void
  xfburn_settings_set_boolean (const gchar * key, gboolean value)
  {
 -  XfburnSettings *instance = get_instance ();
 -  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
 +  XfburnSettings *settings_instance = get_instance ();
 +  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings_instance);
    Setting *setting;
  
    setting = g_new0 (Setting, 1);
@@@ -451,8 -451,8 +451,8 @@@
  void
  xfburn_settings_set_int (const gchar * key, gint value)
  {
 -  XfburnSettings *instance = get_instance ();
 -  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
 +  XfburnSettings *settings_instance = get_instance ();
 +  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings_instance);
    Setting *setting;
  
    setting = g_new0 (Setting, 1);
@@@ -465,8 -465,8 +465,8 @@@
  void
  xfburn_settings_set_string (const gchar * key, const gchar * value)
  {
 -  XfburnSettings *instance = get_instance ();
 -  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
 +  XfburnSettings *settings_instance = get_instance ();
 +  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings_instance);
    Setting *setting;
  
    setting = g_new0 (Setting, 1);
diff --combined xfburn/xfburn-transcoder-basic.c
index d9aeb4d,b1ba774..0000000
--- a/xfburn/xfburn-transcoder-basic.c
+++ b/xfburn/xfburn-transcoder-basic.c
@@@ -83,7 -83,7 +83,7 @@@ static GObject *parent_class = NULL
  //static guint signals[LAST_SIGNAL];
  
  GType
 -xfburn_transcoder_basic_get_type ()
 +xfburn_transcoder_basic_get_type (void)
  {
    static GType type = 0;
  
@@@ -366,7 -366,7 +366,7 @@@ needs_swap (char header[44]
  /*        */
  
  GObject *
 -xfburn_transcoder_basic_new ()
 +xfburn_transcoder_basic_new (void)
  {
    return g_object_new (XFBURN_TYPE_TRANSCODER_BASIC, NULL);
  }
diff --combined xfburn/xfburn-transcoder-gst.c
index da17d6f,6ef1f49..0000000
--- a/xfburn/xfburn-transcoder-gst.c
+++ b/xfburn/xfburn-transcoder-gst.c
@@@ -155,7 -155,7 +155,7 @@@ static GObject *parent_class = NULL
  //static guint signals[LAST_SIGNAL];
  
  GType
 -xfburn_transcoder_gst_get_type ()
 +xfburn_transcoder_gst_get_type (void)
  {
    static GType type = 0;
  
@@@ -682,7 -682,7 +682,7 @@@ on_pad_added (GstElement *element, GstP
  
      gchar *error_msg = "File content has a decoder but is not audio.";
  
 -    DBG (error_msg);
 +    DBG ("%s", error_msg);
      
      gst_caps_unref (caps);
      gst_object_unref (audiopad);
@@@ -1025,7 -1025,7 +1025,7 @@@ is_initialized (XfburnTranscoder *trans
  /*        */
  
  GObject *
 -xfburn_transcoder_gst_new ()
 +xfburn_transcoder_gst_new (void)
  {
    return g_object_new (XFBURN_TYPE_TRANSCODER_GST, NULL);
  }
diff --combined xfburn/xfburn-transcoder.c
index 64a721e,b647d9b..0000000
--- a/xfburn/xfburn-transcoder.c
+++ b/xfburn/xfburn-transcoder.c
@@@ -44,7 -44,7 +44,7 @@@ XfburnTranscoder *transcoder = NULL
  //static guint signals[LAST_SIGNAL];
  
  GType
 -xfburn_transcoder_get_type ()
 +xfburn_transcoder_get_type (void)
  {
    static GType type = 0;
  
@@@ -225,7 -225,7 +225,7 @@@ xfburn_transcoder_set_global (XfburnTra
  }
  
  XfburnTranscoder *
 -xfburn_transcoder_get_global ()
 +xfburn_transcoder_get_global (void)
  {
    g_object_ref (transcoder);
    return transcoder;
diff --combined xfburn/xfburn-utils.c
index 9cf052b,a3cd58f..0000000
--- a/xfburn/xfburn-utils.c
+++ b/xfburn/xfburn-utils.c
@@@ -64,16 -64,16 +64,16 @@@ xfburn_default_cursor (GtkWidget * widg
  gchar *
  xfburn_humanreadable_filesize (guint64 size)
  {
 -  if (!xfburn_settings_get_boolean ("human-readable-units", TRUE))
 -    return g_strdup_printf ("%lu B", (long unsigned int) size);
 -  
 -  /* copied from GnomeBaker */
 -
    gchar *ret = NULL;
    const gchar *unit_list[5] = { "B ", "KB", "MB", "GB", "TB" };
    gint unit = 0;
    gdouble human_size = (gdouble) size;
  
 +  if (!xfburn_settings_get_boolean ("human-readable-units", TRUE))
 +    return g_strdup_printf ("%lu B", (long unsigned int) size);
 +  
 +  /* copied from GnomeBaker */
 +
    while (human_size > 1024 && unit < 4) {
      human_size = human_size / 1024;
      unit++;
@@@ -181,7 -181,7 +181,7 @@@ xfburn_ask_yes_no (GtkMessageType type
  static char * libburn_msg_prefix = "libburn-";
  
  void
 -xfburn_capture_libburn_messages ()
 +xfburn_capture_libburn_messages (void)
  {
    int ret;
  
@@@ -196,7 -196,7 +196,7 @@@
  }
  
  void
 -xfburn_console_libburn_messages ()
 +xfburn_console_libburn_messages (void)
  {
    int ret;
  
diff --combined xfburn/xfburn-welcome-tab.c
index 2bfe1b5,b12645e..0000000
--- a/xfburn/xfburn-welcome-tab.c
+++ b/xfburn/xfburn-welcome-tab.c
@@@ -69,7 -69,7 +69,7 @@@ static void blank_disc (GtkButton *butt
  static GtkWidget *parent_class = NULL;
  
  GType
 -xfburn_welcome_tab_get_type ()
 +xfburn_welcome_tab_get_type (void)
  {
    static GType type = 0;