Update of /cvsroot/xine/gnome-xine/src In directory sc8-pr-cvs1:/tmp/cvs-serv12929/src Modified Files: key_events.c log_window.c mediamarks.c play_item.c playlist.c preferences.c settings.c stream_info.c wizards.c Log Message: make sure dialog widgets are not destroyed when closed using the window manager's close button Index: key_events.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/key_events.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- key_events.c 1 Mar 2003 18:53:02 -0000 1.8 +++ key_events.c 1 Mar 2003 23:37:56 -0000 1.9 @@ -86,9 +86,11 @@ return FALSE; } -static void close_cb (GtkWidget* widget, gpointer data) { +static gboolean close_cb (GtkWidget* widget, gpointer data) { is_visible = FALSE; gtk_widget_unmap (kb_edit_dlg); + + return TRUE; } static key_binding_t *find_key_binding (gchar *cmd, GtkTreeIter *iter) { Index: log_window.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/log_window.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- log_window.c 22 Feb 2003 20:29:48 -0000 1.6 +++ log_window.c 1 Mar 2003 23:37:56 -0000 1.7 @@ -70,9 +70,11 @@ } } -static void close_cb (GtkWidget* widget, gpointer data) { +static gboolean close_cb (GtkWidget* widget, gpointer data) { is_visible = FALSE; gtk_widget_destroy (win); + + return TRUE; } static void refresh_cb (GtkWidget* widget, gpointer data) { Index: mediamarks.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/mediamarks.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mediamarks.c 23 Feb 2003 16:35:50 -0000 1.14 +++ mediamarks.c 1 Mar 2003 23:37:56 -0000 1.15 @@ -316,9 +316,11 @@ is_visible = 0; } -static void close_cb (GtkWidget* widget, gpointer data) { +static gboolean close_cb (GtkWidget* widget, gpointer data) { gtk_widget_hide (manage_dlg); is_visible = 0; + + return TRUE; } static void cat_apply (void) { Index: play_item.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/play_item.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- play_item.c 23 Feb 2003 16:35:50 -0000 1.2 +++ play_item.c 1 Mar 2003 23:37:56 -0000 1.3 @@ -152,11 +152,13 @@ static GtkWidget *entry, *mrl_entry, *time_entry; static int is_visible; -static void close_cb (GtkWidget* widget, gpointer data) { +static gboolean close_cb (GtkWidget* widget, gpointer data) { gtk_widget_hide (dlg); is_visible = 0; gtk_main_quit(); + + return TRUE; } void play_item_init (void) { Index: playlist.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/playlist.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- playlist.c 25 Feb 2003 22:35:11 -0000 1.53 +++ playlist.c 1 Mar 2003 23:37:56 -0000 1.54 @@ -61,9 +61,11 @@ static int cur_list_pos; static char *cur_mrl; -static void close_cb (GtkWidget* widget, gpointer data) { +static gboolean close_cb (GtkWidget* widget, gpointer data) { is_visible = FALSE; gtk_widget_unmap (dlg); + + return TRUE; } void playlist_clear (void) { Index: preferences.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/preferences.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- preferences.c 1 Mar 2003 19:26:04 -0000 1.17 +++ preferences.c 1 Mar 2003 23:37:56 -0000 1.18 @@ -377,9 +377,10 @@ is_visible = 0; } -static void close_cb (GtkWidget* widget, gpointer data) { +static gboolean close_cb (GtkWidget* widget, gpointer data) { gtk_widget_hide (prefs_dialog); is_visible = 0; + return TRUE; } void preferences_init (void) { Index: settings.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/settings.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- settings.c 22 Jan 2003 01:26:43 -0000 1.7 +++ settings.c 1 Mar 2003 23:37:56 -0000 1.8 @@ -35,9 +35,11 @@ static int is_visible; static GtkWidget *win; -static void close_cb (GtkWidget* widget, gpointer data) { +static gboolean close_cb (GtkWidget* widget, gpointer data) { is_visible = FALSE; gtk_widget_unmap (win); + + return TRUE; } void settings_show (void) { @@ -216,7 +218,7 @@ hbox = gtk_hbox_new (0,2); - button = gtk_button_new_with_label ("close"); + button = gtk_button_new_from_stock (GTK_STOCK_CLOSE); gtk_signal_connect (GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(close_cb), NULL); Index: stream_info.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/stream_info.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- stream_info.c 1 Mar 2003 18:37:48 -0000 1.5 +++ stream_info.c 1 Mar 2003 23:37:56 -0000 1.6 @@ -127,9 +127,11 @@ } } -static void close_cb (GtkWidget* widget, gpointer data) { +static gboolean close_cb (GtkWidget* widget, gpointer data) { is_visible = FALSE; gtk_widget_unmap (dlg); + + return TRUE; } void stream_info_init (void) { Index: wizards.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/wizards.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- wizards.c 1 Feb 2003 23:30:11 -0000 1.15 +++ wizards.c 1 Mar 2003 23:37:56 -0000 1.16 @@ -268,11 +268,14 @@ #define RESPONSE_CLOSE 0 #define RESPONSE_NEXT 1 -static void close_cb (GtkWidget* widget, gpointer data) { +static gboolean close_cb (GtkWidget* widget, gpointer data) { int *b = data; *b = RESPONSE_CLOSE; gtk_main_quit(); + + return TRUE; } + static void next_cb (GtkWidget* widget, gpointer data) { int *b = data; *b = RESPONSE_NEXT; |