From: Guenter B. <gu...@us...> - 2003-03-28 17:18:29
|
Update of /cvsroot/xine/gnome-xine/src In directory sc8-pr-cvs1:/tmp/cvs-serv4105 Modified Files: open_mrl.c Log Message: fix delete event handling, use stock buttons, fix ok button handling Index: open_mrl.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/open_mrl.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- open_mrl.c 7 Mar 2003 14:31:28 -0000 1.4 +++ open_mrl.c 28 Mar 2003 17:18:19 -0000 1.5 @@ -63,23 +63,25 @@ /* nothing to be done natm */ } -static void open_mrl_ok_cb (GtkWidget* widget, gpointer data) { +static gboolean open_mrl_ok_cb (GtkWidget* widget, gpointer data) { GtkWidget *dlg = (GtkWidget *) data; const gchar *mrl; int item; gtk_widget_hide (dlg); + mrl_visible = 0; mrl = gtk_entry_get_text (GTK_ENTRY (mrl_entry)); item = playlist_add_mrl (mrl); playlist_play (item); + + return TRUE; } static gboolean open_mrl_cancel_cb (GtkWidget* widget, gpointer data) { - GtkWidget *dlg = (GtkWidget *) data; - gtk_widget_hide (dlg); + gtk_widget_hide (mrl_dialog); mrl_visible = 0; return TRUE; @@ -96,7 +98,7 @@ gtk_window_set_title (GTK_WINDOW (mrl_dialog), "open mrl..."); gtk_window_set_position (GTK_WINDOW (mrl_dialog), GTK_WIN_POS_CENTER); g_signal_connect (GTK_OBJECT (mrl_dialog), "delete_event", - G_CALLBACK (open_mrl_cancel_cb), NULL ); + G_CALLBACK (open_mrl_cancel_cb), mrl_dialog ); hbox = gtk_hbox_new (0, 2); @@ -112,15 +114,11 @@ hbox, TRUE, TRUE, 0); - button = gtk_button_new_with_label ("OK"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (mrl_dialog)->action_area), - button, TRUE, TRUE, 0); + button = gtk_dialog_add_button (GTK_DIALOG (mrl_dialog), GTK_STOCK_OK, 0); g_signal_connect (GTK_OBJECT (button), "clicked", G_CALLBACK (open_mrl_ok_cb), mrl_dialog); - button = gtk_button_new_with_label ("Cancel"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (mrl_dialog)->action_area), - button, TRUE, TRUE, 0); + button = gtk_dialog_add_button (GTK_DIALOG (mrl_dialog), GTK_STOCK_CANCEL, 0); g_signal_connect (GTK_OBJECT (button), "clicked", G_CALLBACK (open_mrl_cancel_cb), mrl_dialog); |