Update of /cvsroot/player/app/gtk
In directory cvs-new:/tmp/cvs-serv30611

Modified Files:
	mainapp.cpp 
Log Message:
Show filename in window title, misc bug fixes


Index: mainapp.cpp
===================================================================
RCS file: /cvsroot/player/app/gtk/mainapp.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- mainapp.cpp	19 Jul 2004 19:54:34 -0000	1.77
+++ mainapp.cpp	20 Jul 2004 17:03:27 -0000	1.78
@@ -2721,7 +2721,7 @@
                                       G_CALLBACK(favorites_menu_refresh),
                                       window);
 
-            g_signal_connect_swapped (G_OBJECT(window->preferences_dialog),
+            g_signal_connect_swapped (G_OBJECT(window->manage_favorites_dialog),
                                       "response",
                                       G_CALLBACK(hxcommon_save_preferences),
                                       window);
@@ -3679,6 +3679,33 @@
         hxwindow_recent_urls_prepend(window, url);
         hxcommon_save_preferences(window);
     }
+
+    /* Update the window title */
+    gchar* window_title;
+    const gchar* title = hx_player_get_title(HX_PLAYER(window->player));
+
+    if(title && *title)
+    {
+        window_title = g_strdup_printf("%s - %s", APP_NAME_LONG, title);
+    }
+    else
+    {
+        const gchar* url = hx_player_get_url(HX_PLAYER(window->player));
+        if(url)
+        {
+            gchar* url_title = hxcommon_get_title_from_url(url);
+            window_title = g_strdup_printf("%s - %s", APP_NAME_LONG, url_title);
+            g_free(url_title);
+        }
+        else
+        {
+            window_title = g_strdup(APP_NAME_LONG);
+        }
+    }   
+    
+    gtk_window_set_title(GTK_WINDOW(window->window), window_title);
+
+    g_free(window_title);
 }
 
 
@@ -3865,25 +3892,6 @@
     }
 }
 
-static void
-hpw_title_changed(HXMainWindow* window, const gchar* title)
-{
-    gchar *window_title;
-
-    if(title && *title)
-    {
-        window_title = g_strdup_printf("%s - %s", APP_NAME_LONG, title);
-    }
-    else
-    {
-        window_title = g_strdup(APP_NAME_LONG);
-    }   
-    
-    gtk_window_set_title(GTK_WINDOW(window->window), window_title);
-
-    g_free(window_title);
-}
-
 static gint
 hpw_popup_menu(HXMainWindow* window,
                GdkEvent* event)
@@ -4295,11 +4303,6 @@
                              G_CALLBACK(hpw_visual_state_changed),
                              window);    
 
-    g_signal_connect_swapped(G_OBJECT(window->player),
-                             "title_changed",
-                             G_CALLBACK(hpw_title_changed),
-                             window);    
-    
     g_signal_connect_swapped(G_OBJECT(window->player),
                              "hxerror",
                              G_CALLBACK(hpw_hxerror),