Author: pollux
Date: 2006-08-15 16:17:38 +0000 (Tue, 15 Aug 2006)
New Revision: 22778
Modified:
xfburn/trunk/NEWS
xfburn/trunk/xfburn/xfburn-burn-image-dialog.c
xfburn/trunk/xfburn/xfburn-data-composition.c
Log:
- Fix wrong get_speed call in burn iso dialog
- Directory are sort before files in data composition
Modified: xfburn/trunk/NEWS
===================================================================
--- xfburn/trunk/NEWS 2006-08-15 15:25:40 UTC (rev 22777)
+++ xfburn/trunk/NEWS 2006-08-15 16:17:38 UTC (rev 22778)
@@ -1,6 +1,8 @@
xfburn 0.x
==========
+- Fix wrong get_speed call in burn iso dialog
+- Directory are sort before files in data composition
- Fix segfault when removing a file and one of its parent directory together
xfburn 0.2.0beta
Modified: xfburn/trunk/xfburn/xfburn-burn-image-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-image-dialog.c 2006-08-15 15:25:40 UTC
(rev 22777)
+++ xfburn/trunk/xfburn/xfburn-burn-image-dialog.c 2006-08-15 16:17:38 UTC
(rev 22778)
@@ -39,7 +39,6 @@
GtkWidget *chooser_image;
GtkWidget *device_box;
- GtkWidget *combo_speed;
GtkWidget *combo_mode;
GtkWidget *check_eject;
@@ -190,9 +189,8 @@
iso_path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER
(priv->chooser_image));
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));
- speed = gtk_combo_box_get_active_text (GTK_COMBO_BOX (priv->combo_speed));
-
write_mode = xfburn_write_mode_combo_box_get_cdrecord_param
(XFBURN_WRITE_MODE_COMBO_BOX (priv->combo_mode));
command = g_strconcat ("cdrecord -v gracetime=2", " dev=",
device->node_path, " ", write_mode, " speed=", speed,
Modified: xfburn/trunk/xfburn/xfburn-data-composition.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-data-composition.c 2006-08-15 15:25:40 UTC
(rev 22777)
+++ xfburn/trunk/xfburn/xfburn-data-composition.c 2006-08-15 16:17:38 UTC
(rev 22778)
@@ -525,28 +525,22 @@
directory_tree_sortfunc (GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter *
b, gpointer user_data)
{
/* adapted from gnomebaker */
- gchar *aname, *bname, *apath, *bpath;
- gboolean aisdir = FALSE;
- gboolean bisdir = FALSE;
+ gchar *aname, *bname;
+ DataCompositionEntryType atype = -1, btype = -1;
gint result = 0;
- gtk_tree_model_get (model, a, DATA_COMPOSITION_COLUMN_CONTENT, &aname,
DATA_COMPOSITION_COLUMN_PATH, &apath, -1);
- gtk_tree_model_get (model, b, DATA_COMPOSITION_COLUMN_CONTENT, &bname,
DATA_COMPOSITION_COLUMN_PATH, &bpath, -1);
+ gtk_tree_model_get (model, a, DATA_COMPOSITION_COLUMN_CONTENT, &aname,
DATA_COMPOSITION_COLUMN_TYPE, &atype, -1);
+ gtk_tree_model_get (model, b, DATA_COMPOSITION_COLUMN_CONTENT, &bname,
DATA_COMPOSITION_COLUMN_TYPE, &btype, -1);
- aisdir = g_file_test (apath, G_FILE_TEST_IS_DIR);
- bisdir = g_file_test (bpath, G_FILE_TEST_IS_DIR);
-
- if (aisdir && !bisdir)
+ if ( (atype == DATA_COMPOSITION_TYPE_DIRECTORY) && (btype !=
DATA_COMPOSITION_TYPE_DIRECTORY) )
result = -1;
- else if (!aisdir && bisdir)
+ else if ( (atype != DATA_COMPOSITION_TYPE_DIRECTORY) && (btype ==
DATA_COMPOSITION_TYPE_DIRECTORY) )
result = 1;
else
result = g_ascii_strcasecmp (aname, bname);
g_free (aname);
- g_free (apath);
g_free (bname);
- g_free (bpath);
return result;
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
