patches/nautilus-cd-burner-03-eject.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 12311 3b16ff0a59fc
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12311
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
     1
--- nautilus-cd-burner-2.22.0/src/nautilus-burn-drive.c.bak	2008-05-16 17:36:53.167745000 +0800
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
     2
+++ nautilus-cd-burner-2.22.0/src/nautilus-burn-drive.c	2008-05-16 17:36:39.179548000 +0800
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
     3
@@ -43,6 +43,10 @@
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
     4
 #include <scsi/sg.h>
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
     5
 #endif /* __linux__ */
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
     6
 
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
     7
+#ifdef sun
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
     8
+#include <sys/dkio.h>
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
     9
+#endif /* sun */
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    10
+
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    11
 #ifdef __FreeBSD__
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    12
 #include <sys/cdio.h>
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    13
 #include <sys/cdrio.h>
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    14
@@ -799,6 +803,13 @@
10042
53220a5d12de 2007-06-12 Irene Huang <[email protected]>
sh162551
parents:
diff changeset
    15
 
11504
80a0f3123533 2008-01-22 Damien Carbery <[email protected]>
dcarbery
parents: 10042
diff changeset
    16
         g_return_val_if_fail (drive != NULL, FALSE);
10042
53220a5d12de 2007-06-12 Irene Huang <[email protected]>
sh162551
parents:
diff changeset
    17
 
12311
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    18
+#ifdef sun
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    19
+       if (drive->priv->media_udi != NULL) {
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    20
+		cmd = g_strdup_printf ("gnome-mount --block --eject --no-ui --hal-udi=%s", drive->priv->media_udi);
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    21
+	} else {
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    22
+		cmd = g_strdup ("eject cdrom");
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    23
+	}
10042
53220a5d12de 2007-06-12 Irene Huang <[email protected]>
sh162551
parents:
diff changeset
    24
+#else
11504
80a0f3123533 2008-01-22 Damien Carbery <[email protected]>
dcarbery
parents: 10042
diff changeset
    25
         if (drive->priv->device == NULL) {
80a0f3123533 2008-01-22 Damien Carbery <[email protected]>
dcarbery
parents: 10042
diff changeset
    26
                 return FALSE;
80a0f3123533 2008-01-22 Damien Carbery <[email protected]>
dcarbery
parents: 10042
diff changeset
    27
         }
12311
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    28
@@ -808,6 +819,7 @@
10042
53220a5d12de 2007-06-12 Irene Huang <[email protected]>
sh162551
parents:
diff changeset
    29
 #else
11504
80a0f3123533 2008-01-22 Damien Carbery <[email protected]>
dcarbery
parents: 10042
diff changeset
    30
         cmd = g_strdup_printf ("eject %s", drive->priv->device);
10042
53220a5d12de 2007-06-12 Irene Huang <[email protected]>
sh162551
parents:
diff changeset
    31
 #endif
53220a5d12de 2007-06-12 Irene Huang <[email protected]>
sh162551
parents:
diff changeset
    32
+#endif
53220a5d12de 2007-06-12 Irene Huang <[email protected]>
sh162551
parents:
diff changeset
    33
 
11504
80a0f3123533 2008-01-22 Damien Carbery <[email protected]>
dcarbery
parents: 10042
diff changeset
    34
         res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL);
80a0f3123533 2008-01-22 Damien Carbery <[email protected]>
dcarbery
parents: 10042
diff changeset
    35
         g_free (cmd);
12311
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    36
@@ -1463,7 +1475,7 @@
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    37
                 return status & CDC_OPEN_TRAY;
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    38
         }
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    39
 #else
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    40
-        return FALSE;
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    41
+	return TRUE;
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    42
 #endif
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    43
 }
3b16ff0a59fc merge 2 patch into 1
jerrytan
parents: 11504
diff changeset
    44