Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12382/src
Modified Files:
Tag: gxine-0_5_11-branch
playlist.c preferences.c
Log Message:
Update to 0.5.11.
Index: playlist.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/playlist.c,v
retrieving revision 1.188
retrieving revision 1.188.2.1
diff -u -r1.188 -r1.188.2.1
--- playlist.c 3 Feb 2007 15:04:44 -0000 1.188
+++ playlist.c 3 Feb 2007 15:14:24 -0000 1.188.2.1
@@ -1584,7 +1584,9 @@
ui_set_control_adjustment (Control_SEEKER, 0);
if (!logo_mode)
{
+ gdk_threads_leave();
se_eval (gse, "eval (event.stream_end);", NULL, NULL, NULL,
"event.stream_end");
+ gdk_threads_enter();
play_next ();
}
gdk_threads_leave();
Index: preferences.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/preferences.c,v
retrieving revision 1.68
retrieving revision 1.68.2.1
diff -u -r1.68 -r1.68.2.1
--- preferences.c 7 Jan 2007 20:26:25 -0000 1.68
+++ preferences.c 3 Feb 2007 15:14:24 -0000 1.68.2.1
@@ -35,6 +35,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
#include "mediamarks.h"
#include "preferences.h"
@@ -300,7 +303,7 @@
return;
key = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
- if (strcmp (entry.str_value, key))
+ if (key && strcmp (entry.str_value, key))
{
logprintf ("preferences: updating entry\n");
entry.str_value = key;
@@ -314,6 +317,15 @@
file_cb (widget, GTK_RESPONSE_ACCEPT, data);
}
+static void file_map_cb (GtkWidget *fcb, gpointer key)
+{
+ if (!g_object_get_data (fcb, "gxine"))
+ {
+ g_signal_connect (fcb, "current-folder-changed",
+ G_CALLBACK(file_activate_cb), key);
+ g_object_set_data (fcb, "gxine", fcb);
+ }
+}
static GtkWidget *create_item_editable (const xine_cfg_entry_t *entry)
{
@@ -349,15 +361,22 @@
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE);
- gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget),
entry->str_value);
+ struct stat st;
+ if (stat (entry->str_value, &st))
+ {
+ g_printerr (_("warning: configuration item %s points to a non-existent
location %s\n"),
+ entry->key, entry->str_value);
+ xine_log (xine, 0, _("warning: configuration item %s points to a
non-existent location %s\n"),
+ entry->key, entry->str_value);
+ }
+ else
+ gtk_file_chooser_set_filename ((GtkFileChooser *) widget,
entry->str_value);
g_object_connect (G_OBJECT(widget),
"signal::response", G_CALLBACK(file_cb), (gchar *)entry->key,
"signal::file-activated", G_CALLBACK(file_activate_cb), (gchar
*)entry->key,
NULL);
widget = gtk_file_chooser_button_new_with_dialog (widget);
- g_object_connect (G_OBJECT(widget),
- "signal::current-folder-changed", G_CALLBACK(file_activate_cb), (gchar
*)entry->key,
- NULL);
+ g_signal_connect (G_OBJECT(widget), "map", G_CALLBACK(file_map_cb),
(gchar *)entry->key);
}
else
{
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
