[Xfce4-commits] [apps/xfburn] 03/06: Revert "Adding option to only accept cds to the device box"

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

squisher pushed a commit to branch master
in repository apps/xfburn.

commit 7985cecb27dabf6730fba9c332ec72597e30f5ba
Author: David Mohr <david at mcbf.net>
Date:   Tue Mar 18 11:41:17 2014 -0600

    Revert "Adding option to only accept cds to the device box"
    
    This reverts commit 1ca9b01ff299ca7fe7695cfb5335bf8dcc505aca.
    
    Conflicts:
    	xfburn/xfburn-burn-audio-cd-composition-dialog.c
    	xfburn/xfburn-device-box.c
---
 xfburn/xfburn-burn-audio-cd-composition-dialog.c |    2 +-
 xfburn/xfburn-device-box.c                       |   22 +++-------------------
 xfburn/xfburn-device-box.h                       |    1 -
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/xfburn/xfburn-burn-audio-cd-composition-dialog.c b/xfburn/xfburn-burn-audio-cd-composition-dialog.c
index b67696c..8cd6581 100644
--- a/xfburn/xfburn-burn-audio-cd-composition-dialog.c
+++ b/xfburn/xfburn-burn-audio-cd-composition-dialog.c
@@ -153,7 +153,7 @@ xfburn_burn_audio_cd_composition_dialog_constructor (GType type, guint n_constru
 
   /* burning devices list */
   priv->device_box = xfburn_device_box_new (SHOW_CD_WRITERS | SHOW_CDRW_WRITERS |
-                                            SHOW_SPEED_SELECTION | SHOW_MODE_SELECTION |ACCEPT_ONLY_CD);
+                                            SHOW_SPEED_SELECTION | SHOW_MODE_SELECTION);
   g_signal_connect (G_OBJECT (priv->device_box), "volume-changed", G_CALLBACK (cb_volume_changed), obj);
   gtk_widget_show (priv->device_box);
 
diff --git a/xfburn/xfburn-device-box.c b/xfburn/xfburn-device-box.c
index 0e31d17..a17f113 100644
--- a/xfburn/xfburn-device-box.c
+++ b/xfburn/xfburn-device-box.c
@@ -40,7 +40,6 @@ enum {
   PROP_SHOW_MODE_SELECTION,
   PROP_VALID,
   PROP_BLANK_MODE,
-  PROP_ACCEPT_ONLY_CD,
 };
 
 enum {
@@ -84,7 +83,6 @@ typedef struct
   GtkWidget *combo_mode;
 
   gboolean have_asked_for_blanking;
-  gboolean accept_only_cd;
 
   gulong handler_volume_change_start;
   gulong handler_volume_change_end;
@@ -187,10 +185,6 @@ xfburn_device_box_class_init (XfburnDeviceBoxClass * klass)
                                    g_param_spec_boolean ("blank-mode", _("Blank mode"),
                                                         _("The blank mode shows different disc status messages than regular mode"), 
                                                         FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-  g_object_class_install_property (object_class, PROP_ACCEPT_ONLY_CD, 
-                                   g_param_spec_boolean ("accept-only-cd", _("Accept only CDs as valid discs"),
-                                                        _("Accept only CDs as valid discs"), 
-                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 }
 
 static GObject * 
@@ -333,9 +327,6 @@ xfburn_device_box_get_property (GObject *object, guint prop_id, GValue *value, G
     case PROP_BLANK_MODE:
       g_value_set_boolean (value, priv->blank_mode);
       break;
-    case PROP_ACCEPT_ONLY_CD:
-      g_value_set_boolean (value, priv->accept_only_cd);
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -360,9 +351,6 @@ xfburn_device_box_set_property (GObject *object, guint prop_id, const GValue *va
     case PROP_BLANK_MODE:
       priv->blank_mode = g_value_get_boolean (value);
       break;
-    case PROP_ACCEPT_ONLY_CD:
-      priv->accept_only_cd = g_value_get_boolean (value);
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -562,8 +550,7 @@ check_disc_validity (XfburnDeviceBoxPrivate *priv)
         g_object_get (G_OBJECT (device), "cdrw", &priv->valid_disc, NULL);
         break;
       case XFBURN_PROFILE_DVDRAM:
-        if (!priv->accept_only_cd)
-          g_object_get (G_OBJECT (device), "dvdram", &priv->valid_disc, NULL);
+        g_object_get (G_OBJECT (device), "dvdram", &priv->valid_disc, NULL);
         break;
       case XFBURN_PROFILE_DVD_MINUS_R:
       case XFBURN_PROFILE_DVD_MINUS_RW_OVERWRITE:
@@ -572,13 +559,11 @@ check_disc_validity (XfburnDeviceBoxPrivate *priv)
       case XFBURN_PROFILE_DVD_PLUS_R:
       case XFBURN_PROFILE_DVD_PLUS_R_DL:
       case XFBURN_PROFILE_DVD_PLUS_RW:
-        if (!priv->accept_only_cd)
-          g_object_get (G_OBJECT (device), "dvdr", &priv->valid_disc, NULL);
+        g_object_get (G_OBJECT (device), "dvdr", &priv->valid_disc, NULL);
         break;
       case XFBURN_PROFILE_BD_R:
       case XFBURN_PROFILE_BD_RE:
-        if (!priv->accept_only_cd)
-          g_object_get (G_OBJECT (device), "dvdr", &priv->valid_disc, NULL);
+        g_object_get (G_OBJECT (device), "dvdr", &priv->valid_disc, NULL);
         break;
       default:
 
@@ -788,7 +773,6 @@ xfburn_device_box_new (XfburnDeviceBoxFlags flags)
                       "show-speed-selection", ((flags & SHOW_SPEED_SELECTION) != 0), 
 		      "show-mode-selection", ((flags & SHOW_MODE_SELECTION) != 0),
 		      "blank-mode", ((flags & BLANK_MODE) != 0),
-		      "accept-only-cd", ((flags & ACCEPT_ONLY_CD) != 0),
                       NULL);
   
   return obj;
diff --git a/xfburn/xfburn-device-box.h b/xfburn/xfburn-device-box.h
index 90d83db..d73b01f 100644
--- a/xfburn/xfburn-device-box.h
+++ b/xfburn/xfburn-device-box.h
@@ -60,7 +60,6 @@ typedef enum
   SHOW_SPEED_SELECTION = 1 << 7,
   SHOW_MODE_SELECTION = 1 << 8,
   BLANK_MODE = 1 << 9,
-  ACCEPT_ONLY_CD = 1 << 10,
 } XfburnDeviceBoxFlags;
 
 typedef enum

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.