sound-juicer r2040 - in trunk: . src

[rburton svn gnome org]

Author: rburton
Date: Thu Feb 14 08:53:36 2008
New Revision: 2040
URL: http://svn.gnome.org/viewvc/sound-juicer?rev=2040&view=rev

Log:
2008-02-14  Ross Burton  <ross burtonini com>

	* configure.ac:
	Check for nautilus_burn_drive_can_eject.

	* src/sj-main.c:
	Use nautilus_burn_drive_can_eject to enable/disable the Eject button.

	Thanks Dave Meikle (#430787).


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/sj-main.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Feb 14 08:53:36 2008
@@ -44,6 +44,12 @@
 AC_SUBST(BURN_CFLAGS)
 AC_SUBST(BURN_LIBS)
 
+# Set a flag if we have _can_eject, added in 2.21.5.
+oldlibs=$LIBS
+LIBS="$LIBS $BURN_LIBS"
+AC_CHECK_FUNCS(nautilus_burn_drive_can_eject)
+LIBS="$oldlibs"
+
 # Find the UI libraries
 PKG_CHECK_MODULES(UI, gtk+-2.0 >= 2.8  libglade-2.0  gconf-2.0  libgnomeui-2.0 >= 2.13.0  gnome-vfs-2.0 >= 2.9 gnome-vfs-module-2.0 > 2.9 gmodule-export-2.0 dbus-glib-1)
 AC_SUBST(UI_CFLAGS)

Modified: trunk/src/sj-main.c
==============================================================================
--- trunk/src/sj-main.c	(original)
+++ trunk/src/sj-main.c	Thu Feb 14 08:53:36 2008
@@ -82,7 +82,7 @@
 static GtkWidget *status_bar;
 static GtkWidget *extract_menuitem, *play_menuitem, *next_menuitem, *prev_menuitem, *select_all_menuitem, *deselect_all_menuitem;
 static GtkWidget *submit_menuitem;
-static GtkWidget *duplicate;
+static GtkWidget *duplicate, *eject;
 GtkListStore *track_store;
 static BaconMessageConnection *connection;
 GtkCellRenderer *toggle_renderer, *title_renderer, *artist_renderer;
@@ -1084,6 +1084,10 @@
     if (tray_opened == FALSE) {
       reread_cd (ignore_no_media);
     }
+#if HAVE_NAUTILUS_BURN_DRIVE_CAN_EJECT
+    // Enable/disable the eject options based on wether the drive supports ejection
+    gtk_widget_set_sensitive (eject, nautilus_burn_drive_can_eject (drive));
+#endif
   }
 }
 
@@ -1710,6 +1714,7 @@
   prev_menuitem = glade_xml_get_widget (glade, "previous_track_menuitem");
   status_bar = glade_xml_get_widget (glade, "status_bar");
   duplicate = glade_xml_get_widget (glade, "duplicate_menuitem");
+  eject = glade_xml_get_widget (glade, "eject");
 
   { /* ensure that the play/pause button's size is constant */
     GtkWidget *fake_button1, *fake_button2;