# HG changeset patch
# User nkeynes
# Date 1264926966 -36000
# Node ID 4f2750753a6ca5f6a24078d0f1a657df2de708ab
# Parent  d4807997e4509ec258652a4e6ae79d0cc2f89203
Show '<no disc>' in the title bar when there is no cdrom disc attached

--- a/src/cocoaui/cocoa_win.m	Sun Jan 31 18:35:06 2010 +1000
+++ b/src/cocoaui/cocoa_win.m	Sun Jan 31 18:36:06 2010 +1000
@@ -179,7 +179,7 @@
     NSString *title;
     const char *disc_title = gdrom_get_current_disc_title();
     if( disc_title == NULL ) {
-        title = [NSString stringWithCString: lxdream_package_name];
+        title = [NSString stringWithFormat: @"%s - <no disc>", lxdream_package_name];
     } else {
         title = [NSString stringWithFormat: @"%s - %s", lxdream_package_name, disc_title];
     }
--- a/src/cocoaui/cocoaui.m	Sun Jan 31 18:35:06 2010 +1000
+++ b/src/cocoaui/cocoaui.m	Sun Jan 31 18:36:06 2010 +1000
@@ -59,7 +59,7 @@
 - (void) setAppleMenu:(NSMenu *)aMenu;
 @end
 
-gboolean cocoa_gui_disc_changed( gdrom_disc_t disc, const gchar *disc_name, void *user_data )
+gboolean cocoa_gui_disc_changed( cdrom_disc_t disc, const gchar *disc_name, void *user_data )
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     LxdreamMainWindow *window = (LxdreamMainWindow *)user_data;
--- a/src/gtkui/gtk_win.c	Sun Jan 31 18:35:06 2010 +1000
+++ b/src/gtkui/gtk_win.c	Sun Jan 31 18:36:06 2010 +1000
@@ -422,12 +422,12 @@
 void main_window_update_title( main_window_t win )
 {
     const char *disc = gdrom_get_current_disc_title();
+    char buf[256];
     
     if( disc == NULL ) {
-        gtk_window_set_title( GTK_WINDOW(win->window), lxdream_package_name );
+        snprintf( buf, sizeof(buf), "%s - <%s>", lxdream_package_name, _("no disc") );
     } else {
-        char buf[256];
         snprintf( buf, sizeof(buf), "%s - %s", lxdream_package_name, disc );
-        gtk_window_set_title( GTK_WINDOW(win->window), buf );
     }
+    gtk_window_set_title( GTK_WINDOW(win->window), buf );
 }
--- a/src/gtkui/gtkui.c	Sun Jan 31 18:35:06 2010 +1000
+++ b/src/gtkui/gtkui.c	Sun Jan 31 18:36:06 2010 +1000
@@ -232,7 +232,7 @@
     return gtk_gui_init_ok;
 }
 
-gboolean gtk_gui_disc_changed( gdrom_disc_t disc, const gchar *disc_name, void *ptr )
+gboolean gtk_gui_disc_changed( cdrom_disc_t disc, const gchar *disc_name, void *ptr )
 {
     main_window_update_title( main_win );
     return TRUE;