[Rhythmbox-devel] [PATCH] update to latest nautilus-burn and compile error
- From: Aurélien Naldi <aurelien naldi gmail com>
- To: rhythmbox-devel gnome org
- Subject: [Rhythmbox-devel] [PATCH] update to latest nautilus-burn and compile error
- Date: Wed, 26 Jan 2005 14:02:45 +0100
hi to all
the attached patch allow RB to compile against nautilus-burn > 2.9.4
which changed the API
I haven't updated the version checked by configure and couldn't test
it as I get an error (see bellow).
has anyone experienced this?
a problem on my box ?
I'm really willing to try out RB 0.9 :-)
please CC me as I'm not subscribed
/bin/sh ../libtool --mode=link gcc -Wall -Wchar-subscripts
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs
-Wpointer-arith -Wcast-align -Wsign-compare -Werror -std=gnu89
-I/usr/X11R6/include -g -O2 -Wno-strict-aliasing -Wno-sign-compare
-o rhythmbox -export-dynamic main.o rb-shell.o rb-shell-player.o
rb-source-header.o rb-statusbar.o rb-shell-preferences.o
rb-shell-clipboard.o rb-playlist-manager.o rb-history.o
rb-play-order.o rb-play-order-linear.o rb-play-order-linear-loop.o
rb-play-order-shuffle.o rb-play-order-random.o
rb-play-order-random-equal-weights.o rb-play-order-random-by-age.o
rb-play-order-random-by-age-and-rating.o
rb-play-order-random-by-rating.o rb-remote.o rb-tray-icon.o
../lib/librb.la ../metadata/librbmetadata.la ../player/librbplayer.la
../widgets/librbwidgets.la ../rhythmdb/librhythmdb.la
../sources/libsources.la ../sources/libsourcesimpl.la
../iradio/librbiradio.la ../remote/librbremote.la
-Wl,--export-dynamic -pthread -L/usr/X11R6/lib -lgnomeui-2 -lSM -lICE
-lbonoboui-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2
-lpangoft2-1.0 -lglade-2.0 -lxml2 -lpthread -lz -lbonobo-2 -lgconf-2
-lgnomevfs-2 -lbonobo-activation -lORBit-2 -lgthread-2.0
-lnautilus-burn -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0
-lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0
-lgmodule-2.0 -ldl -lglib-2.0 -Wl,--export-dynamic -pthread
-lgstcontrol-0.8 -lgstgconf-0.8 -lgstreamer-0.8 -lgconf-2
-lgobject-2.0 -lxml2 -lpthread -lz -lORBit-2 -lm -lgmodule-2.0 -ldl
-lgthread-2.0 -lglib-2.0 ../remote/bonobo/librbbonobo.la
../remote/dbus/librbdbus.la -L/usr/X11R6/lib
mkdir .libs
gcc -Wall -Wchar-subscripts -Wmissing-declarations
-Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align
-Wsign-compare -Werror -std=gnu89 -I/usr/X11R6/include -g -O2
-Wno-strict-aliasing -Wno-sign-compare -o rhythmbox main.o rb-shell.o
rb-shell-player.o rb-source-header.o rb-statusbar.o
rb-shell-preferences.o rb-shell-clipboard.o rb-playlist-manager.o
rb-history.o rb-play-order.o rb-play-order-linear.o
rb-play-order-linear-loop.o rb-play-order-shuffle.o
rb-play-order-random.o rb-play-order-random-equal-weights.o
rb-play-order-random-by-age.o rb-play-order-random-by-age-and-rating.o
rb-play-order-random-by-rating.o rb-remote.o rb-tray-icon.o
-Wl,--export-dynamic -Wl,--export-dynamic -Wl,--export-dynamic
../lib/.libs/librb.a -L/usr/X11R6/lib
../metadata/.libs/librbmetadata.a -L/usr/lib
../player/.libs/librbplayer.a ../widgets/.libs/librbwidgets.a
../rhythmdb/.libs/librhythmdb.a ../sources/.libs/libsources.a
../sources/.libs/libsourcesimpl.a ../iradio/.libs/librbiradio.a
../remote/.libs/librbremote.a -pthread
../remote/bonobo/.libs/librbbonobo.a ../remote/dbus/.libs/librbdbus.a
/usr/lib/libgnomeui-2.so /usr/lib/libgnome-keyring.so
/usr/lib/libjpeg.so /usr/lib/libbonoboui-2.so -lSM -lICE -lX11
/usr/lib/libgnomecanvas-2.so /usr/lib/libgnome-2.so /usr/lib/libesd.so
/usr/lib/libaudiofile.so /usr/lib/libart_lgpl_2.so
/usr/lib/libpangoft2-1.0.so /usr/lib/libglade-2.0.so
/usr/lib/libgnomevfs-2.so /usr/lib/libbonobo-2.so
/usr/lib/libgnutls.so /usr/lib/libtasn1.so /usr/lib/libgcrypt.so -lnsl
/usr/lib/libgpg-error.so /usr/lib/libhowl.so -lresolv -lrt
/usr/lib/libbonobo-activation.so /usr/lib/libORBitCosNaming-2.so
/usr/lib/libnautilus-burn.so /usr/lib/libhal.so
/usr/lib/libgtk-x11-2.0.so /usr/lib/libgdk-x11-2.0.so
/usr/lib/libatk-1.0.so /usr/lib/libgdk_pixbuf-2.0.so
/usr/lib/libpangoxft-1.0.so /usr/lib/libpangox-1.0.so
/usr/lib/libpango-1.0.so /usr/lib/libgstcontrol-0.8.so
/usr/lib/libgstgconf-0.8.so /usr/lib/libgstreamer-0.8.so
/usr/lib/libgconf-2.so /usr/lib/libxml2.so -lz /usr/lib/libORBit-2.so
/usr/lib/libpopt.so /usr/lib/libgobject-2.0.so -lm
/usr/lib/libgmodule-2.0.so -ldl /usr/lib/libgthread-2.0.so -lpthread
-ldbus-glib-1 -ldbus-1 /usr/lib/libglib-2.0.so
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0x0): In function
`g_bit_nth_lsf':
/usr/include/glib-2.0/glib/gutils.h:247: multiple definition of `g_bit_nth_lsf'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0x0):/usr/include/glib-2.0/glib/gutils.h:247:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0x30): In function
`g_bit_nth_msf':
/usr/include/glib-2.0/glib/gutils.h:260: multiple definition of `g_bit_nth_msf'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0x30):/usr/include/glib-2.0/glib/gutils.h:260:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0x60): In function
`g_bit_storage':
/usr/include/glib-2.0/glib/gutils.h:274: multiple definition of `g_bit_storage'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0x60):/usr/include/glib-2.0/glib/gutils.h:274:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0x80): In function
`g_trash_stack_push':
/usr/include/glib-2.0/glib/gutils.h:288: multiple definition of
`g_trash_stack_push'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0x80):/usr/include/glib-2.0/glib/gutils.h:288:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0xa0): In function
`g_trash_stack_pop':
/usr/include/glib-2.0/glib/gutils.h:296: multiple definition of
`g_trash_stack_pop'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0xa0):/usr/include/glib-2.0/glib/gutils.h:296:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0xc0): In function
`g_trash_stack_peek':
/usr/include/glib-2.0/glib/gutils.h:313: multiple definition of
`g_trash_stack_peek'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0xc0):/usr/include/glib-2.0/glib/gutils.h:313:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0xd0): In function
`g_trash_stack_height':
/usr/include/glib-2.0/glib/gutils.h:322: multiple definition of
`g_trash_stack_height'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0xd0):/usr/include/glib-2.0/glib/gutils.h:322:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0xf0): In function
`rb_refstring_new':
/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:65:
multiple definition of `rb_refstring_new'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0xf0):/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:65:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0x120): In function
`rb_refstring_ref':
/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:71:
multiple definition of `rb_refstring_ref'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0x120):/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:71:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0x130): In function
`rb_refstring_unref':
/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:78:
multiple definition of `rb_refstring_unref'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0x130):/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:78:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0x170): In function
`rb_refstring_get':
/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:85:
multiple definition of `rb_refstring_get'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0x170):/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:85:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0x180): In function
`rb_refstring_get_folded':
/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:91:
multiple definition of `rb_refstring_get_folded'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0x180):/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:91:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0x190): In function
`rb_refstring_get_sort_key':
/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:97:
multiple definition of `rb_refstring_get_sort_key'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0x190):/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:97:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0x1a0): In function
`rb_refstring_hash':
/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:103:
multiple definition of `rb_refstring_hash'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0x1a0):/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:103:
first defined here
../widgets/.libs/librbwidgets.a(rhythmdb.o)(.text+0x1d0): In function
`rb_refstring_equal':
/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:110:
multiple definition of `rb_refstring_equal'
../widgets/.libs/librbwidgets.a(rb-refstring.o)(.text+0x1d0):/home/nemo/dl/soft/gnome/rhythmbox/rhythmdb/rb-refstring.h:110:
first defined here
collect2: ld returned 1 exit status
make[1]: *** [rhythmbox] Erreur 1
make[1]: quittant le répertoire « /home/nemo/dl/soft/gnome/rhythmbox/shell »
make: *** [all] Erreur 2
--
aurelien naldi
? .in
? lib/totemplparser-marshal.c
? lib/totemplparser-marshal.h
? metadata/Makefile
? metadata/Makefile.in
? player/Makefile
? player/Makefile.in
? player/rb-recorder-marshal.c
? player/rb-recorder-marshal.h
? remote/Makefile
? remote/Makefile.in
? remote/bonobo/Makefile
? remote/bonobo/Makefile.in
? remote/bonobo/Rhythmbox-common.c
? remote/bonobo/Rhythmbox-skels.c
? remote/bonobo/Rhythmbox-stubs.c
? remote/bonobo/Rhythmbox.h
? remote/bonobo/Rhythmbox_Nautilus_Context_Menu.server
? remote/bonobo/Rhythmbox_Nautilus_Context_Menu.server.in
? remote/bonobo/test-corba
? remote/dbus/Makefile
? remote/dbus/Makefile.in
? rhythmdb/rhythmdb-marshal.c
? rhythmdb/rhythmdb-marshal.h
Index: player/rb-recorder-gst.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/player/rb-recorder-gst.c,v
retrieving revision 1.3
diff -u -r1.3 rb-recorder-gst.c
--- player/rb-recorder-gst.c 16 Sep 2004 19:16:40 -0000 1.3
+++ player/rb-recorder-gst.c 26 Jan 2005 12:40:36 -0000
@@ -28,7 +28,7 @@
#include <gst/gconf/gconf.h>
#include <gst/play/play.h>
#include <libgnome/gnome-i18n.h>
-#include <cd-recorder.h>
+#include <nautilus-burn-recorder.h>
#include <sys/vfs.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -68,7 +68,7 @@
double progress;
GList *tracks;
- CDDrive *drive;
+ NautilusBurnDrive *drive;
gboolean playing;
@@ -241,16 +241,16 @@
add_track (RBRecorder *recorder,
const char *cdtext)
{
- Track *track;
+ NautilusBurnRecorderTrack *track;
char *filename;
g_return_val_if_fail (RB_IS_RECORDER (recorder), FALSE);
filename = g_strdup (recorder->priv->dest_file);
- track = g_new0 (Track, 1);
+ track = g_new0 (NautilusBurnRecorderTrack, 1);
- track->type = TRACK_TYPE_AUDIO;
+ track->type = NAUTILUS_BURN_RECORDER_TRACK_TYPE_AUDIO;
track->contents.audio.filename = filename;
if (cdtext)
track->contents.audio.cdtext = g_strdup (cdtext);
@@ -439,7 +439,7 @@
}
static void
-recorder_track_free (Track *track)
+recorder_track_free (NautilusBurnRecorderTrack *track)
{
if (track->contents.audio.filename) {
char *lockfile = NULL;
@@ -458,7 +458,7 @@
}
}
- cd_recorder_track_free (track);
+ nautilus_burn_recorder_track_free (track);
}
static void
@@ -759,15 +759,15 @@
*error = NULL;
- drives = scan_for_cdroms (TRUE, FALSE);
+ drives = nautilus_burn_drive_get_list (TRUE, FALSE);
for (tmp = drives; tmp != NULL; tmp = tmp->next) {
- CDDrive *drive = (CDDrive*) tmp->data;
+ NautilusBurnDrive *drive = (NautilusBurnDrive*) tmp->data;
if (strcmp (drive->device, device) == 0) {
recorder->priv->drive = drive;
break;
}
- cd_drive_free (drive);
+ nautilus_burn_drive_free (drive);
}
g_list_free (drives);
@@ -780,12 +780,12 @@
}
if (!(recorder->priv->drive->type
- & (CDDRIVE_TYPE_CD_RECORDER
- | CDDRIVE_TYPE_CDRW_RECORDER
- | CDDRIVE_TYPE_DVD_RAM_RECORDER
- | CDDRIVE_TYPE_DVD_RW_RECORDER
- | CDDRIVE_TYPE_DVD_PLUS_R_RECORDER
- | CDDRIVE_TYPE_DVD_PLUS_RW_RECORDER))) {
+ & (NAUTILUS_BURN_DRIVE_TYPE_CD_RECORDER
+ | NAUTILUS_BURN_DRIVE_TYPE_CDRW_RECORDER
+ | NAUTILUS_BURN_DRIVE_TYPE_DVD_RAM_RECORDER
+ | NAUTILUS_BURN_DRIVE_TYPE_DVD_RW_RECORDER
+ | NAUTILUS_BURN_DRIVE_TYPE_DVD_PLUS_R_RECORDER
+ | NAUTILUS_BURN_DRIVE_TYPE_DVD_PLUS_RW_RECORDER))) {
g_set_error (error, RB_RECORDER_ERROR,
RB_RECORDER_ERROR_GENERAL,
_("Drive %s is not a recorder"),
@@ -797,25 +797,25 @@
}
static void
-rb_recorder_action_changed_cb (CDRecorder *cdrecorder,
- CDRecorderActions cd_action,
- CDRecorderMedia cd_media,
+rb_recorder_action_changed_cb (NautilusBurnRecorder *cdrecorder,
+ NautilusBurnRecorderActions cd_action,
+ NautilusBurnRecorderMedia cd_media,
gpointer data)
{
RBRecorder *recorder = (RBRecorder*) data;
RBRecorderAction action;
switch (cd_action) {
- case PREPARING_WRITE:
+ case NAUTILUS_BURN_RECORDER_ACTION_PREPARING_WRITE:
action = RB_RECORDER_ACTION_DISC_PREPARING_WRITE;
break;
- case WRITING:
+ case NAUTILUS_BURN_RECORDER_ACTION_WRITING:
action = RB_RECORDER_ACTION_DISC_WRITING;
break;
- case FIXATING:
+ case NAUTILUS_BURN_RECORDER_ACTION_FIXATING:
action = RB_RECORDER_ACTION_DISC_FIXATING;
break;
- case BLANKING:
+ case NAUTILUS_BURN_RECORDER_ACTION_BLANKING:
action = RB_RECORDER_ACTION_DISC_BLANKING;
break;
default:
@@ -829,7 +829,7 @@
}
static void
-rb_recorder_burn_progress_cb (CDRecorder *cdrecorder,
+rb_recorder_burn_progress_cb (NautilusBurnRecorder *cdrecorder,
gdouble fraction,
gpointer data)
{
@@ -842,7 +842,7 @@
}
static gboolean
-rb_recorder_insert_cd_request_cb (CDRecorder *cdrecorder,
+rb_recorder_insert_cd_request_cb (NautilusBurnRecorder *cdrecorder,
gboolean is_reload,
gboolean can_rewrite,
gboolean busy_cd,
@@ -863,21 +863,21 @@
return res;
}
-static CDDrive *
+static NautilusBurnDrive *
rb_recorder_get_default_drive (void)
{
- CDDrive *drive = NULL;
+ NautilusBurnDrive *drive = NULL;
GList *drives = NULL;
- drives = scan_for_cdroms (TRUE, FALSE);
+ drives = nautilus_burn_drive_get_list (TRUE, FALSE);
if (drives) {
/* FIXME: really need someone to write a cd_drive_copy */
- drive = (CDDrive*) drives->data;
+ drive = (NautilusBurnDrive*) drives->data;
drives = drives->next;
}
- g_list_foreach (drives, (GFunc)cd_drive_free, NULL);
+ g_list_foreach (drives, (GFunc)nautilus_burn_drive_free, NULL);
g_list_free (drives);
return drive;
@@ -886,14 +886,14 @@
char *
rb_recorder_get_default_device (void)
{
- CDDrive *drive;
+ NautilusBurnDrive *drive;
char *device = NULL;
drive = rb_recorder_get_default_drive ();
if (drive) {
device = g_strdup (drive->device);
- cd_drive_free (drive);
+ nautilus_burn_drive_free (drive);
}
return device;
@@ -916,7 +916,7 @@
else
device = rb_recorder_get_default_device ();
- size = cd_drive_get_media_size_from_path (device);
+ size = nautilus_burn_drive_get_media_size_from_path (device);
if (size > 0)
secs = SIZE_TO_TIME(size);
else
@@ -1031,7 +1031,7 @@
return -1;
for (l = recorder->priv->tracks; l; l = l->next) {
- Track *track = l->data;
+ NautilusBurnRecorderTrack *track = l->data;
gint64 length;
length = acb_wave_time (track->contents.audio.filename);
@@ -1050,8 +1050,8 @@
rb_recorder_burn (RBRecorder *recorder,
GError **error)
{
- CDRecorder *cdrecorder;
- CDRecorderWriteFlags flags;
+ NautilusBurnRecorder *cdrecorder;
+ NautilusBurnRecorderWriteFlags flags;
int res;
gboolean result;
gint64 tracks_length;
@@ -1102,7 +1102,7 @@
return FALSE;
}
- cdrecorder = cd_recorder_new ();
+ cdrecorder = nautilus_burn_recorder_new ();
g_signal_connect_object (G_OBJECT (cdrecorder), "progress-changed",
G_CALLBACK (rb_recorder_burn_progress_cb), recorder, 0);
@@ -1113,26 +1113,26 @@
flags = 0;
if (FALSE)
- flags |= CDRECORDER_DUMMY_WRITE;
+ flags |= NAUTILUS_BURN_RECORDER_WRITE_DUMMY_WRITE;
if (TRUE)
- flags |= CDRECORDER_DEBUG;
+ flags |= NAUTILUS_BURN_RECORDER_WRITE_DEBUG;
if (TRUE)
- flags |= CDRECORDER_DISC_AT_ONCE;
+ flags |= NAUTILUS_BURN_RECORDER_WRITE_DISC_AT_ONCE;
- res = cd_recorder_write_tracks (cdrecorder,
+ res = nautilus_burn_recorder_write_tracks (cdrecorder,
recorder->priv->drive,
recorder->priv->tracks,
0,
flags);
- if (res == RESULT_FINISHED) {
+ if (res == NAUTILUS_BURN_RECORDER_RESULT_FINISHED) {
result = TRUE;
- } else if (res == RESULT_ERROR) {
+ } else if (res == NAUTILUS_BURN_RECORDER_RESULT_ERROR) {
char *msg;
- msg = cd_recorder_get_error_message (cdrecorder) ?
+ msg = nautilus_burn_recorder_get_error_message (cdrecorder) ?
g_strdup_printf (_("There was an error writing to the CD:\n%s"),
- cd_recorder_get_error_message (cdrecorder))
+ nautilus_burn_recorder_get_error_message (cdrecorder))
: g_strdup (_("There was an error writing to the CD"));
g_set_error (error,
RB_RECORDER_ERROR,
Index: sources/rb-playlist-source-recorder.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/sources/rb-playlist-source-recorder.c,v
retrieving revision 1.4
diff -u -r1.4 rb-playlist-source-recorder.c
--- sources/rb-playlist-source-recorder.c 27 Sep 2004 16:20:48 -0000 1.4
+++ sources/rb-playlist-source-recorder.c 26 Jan 2005 12:40:37 -0000
@@ -33,7 +33,7 @@
#include <libgnomevfs/gnome-vfs-uri.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <glade/glade.h>
-#include <bacon-cd-selection.h>
+#include <nautilus-burn-drive-selection.h>
#include "rb-file-helpers.h"
#include "rb-glade-helpers.h"
#include "rb-preferences.h"
@@ -59,7 +59,7 @@
static void rb_playlist_source_recorder_init (RBPlaylistSourceRecorder *source);
static void rb_playlist_source_recorder_finalize (GObject *object);
-void rb_playlist_source_recorder_device_changed_cb (BaconCdSelection *bcs,
+void rb_playlist_source_recorder_device_changed_cb (NautilusBurnDriveSelection *bcs,
const char *device_path,
gpointer data);
@@ -180,13 +180,13 @@
GtkWidget *widget;
char *value;
- widget = bacon_cd_selection_new ();
+ widget = nautilus_burn_drive_selection_new ();
g_object_set (widget, "file-image", FALSE, NULL);
g_object_set (widget, "show-recorders-only", TRUE, NULL);
value = eel_gconf_get_string (CONF_STATE_BURN_DEVICE);
if (value) {
- bacon_cd_selection_set_device (BACON_CD_SELECTION (widget),
+ nautilus_burn_drive_selection_set_device (NAUTILUS_BURN_DRIVE_SELECTION (widget),
value);
g_free (value);
}
@@ -197,7 +197,7 @@
}
void
-rb_playlist_source_recorder_device_changed_cb (BaconCdSelection *bcs,
+rb_playlist_source_recorder_device_changed_cb (NautilusBurnDriveSelection *bcs,
const char *device_path,
gpointer data)
{
@@ -213,7 +213,7 @@
const char *device;
GError *error;
- device = bacon_cd_selection_get_device (BACON_CD_SELECTION (source->priv->device_menu));
+ device = nautilus_burn_drive_selection_get_device (NAUTILUS_BURN_DRIVE_SELECTION (source->priv->device_menu));
if (device && strcmp (device, "")) {
rb_recorder_set_device (source->priv->recorder, device, &error);
if (error) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
