comparison src/audacious/util.c @ 3122:6b76324748f5 trunk

Automated merge with ssh://hg.atheme.org//hg/audacious
author William Pitcock <nenolod@atheme-project.org>
date Fri, 20 Jul 2007 09:00:33 -0500
parents 3b6d316f8b09 3262bf0b8831
children f1c756f39e6c
comparison
equal deleted inserted replaced
3121:3b6d316f8b09 3122:6b76324748f5
928 g_signal_connect_swapped( G_OBJECT(dialog_bbox_b1) , "clicked" , 928 g_signal_connect_swapped( G_OBJECT(dialog_bbox_b1) , "clicked" ,
929 G_CALLBACK(gtk_widget_destroy) , dialog ); 929 G_CALLBACK(gtk_widget_destroy) , dialog );
930 if ( button_action ) 930 if ( button_action )
931 g_signal_connect( G_OBJECT(dialog_bbox_b1) , "clicked" , 931 g_signal_connect( G_OBJECT(dialog_bbox_b1) , "clicked" ,
932 button_action , action_data ); 932 button_action , action_data );
933
934 gtk_container_add( GTK_CONTAINER(dialog_bbox) , dialog_bbox_b1 );
935 gtk_box_pack_start( GTK_BOX(dialog_vbox) , dialog_bbox , FALSE , FALSE , 0 );
936
937 gtk_container_add( GTK_CONTAINER(dialog) , dialog_vbox );
938
933 GTK_WIDGET_SET_FLAGS( dialog_bbox_b1 , GTK_CAN_DEFAULT); 939 GTK_WIDGET_SET_FLAGS( dialog_bbox_b1 , GTK_CAN_DEFAULT);
934 gtk_widget_grab_default( dialog_bbox_b1 ); 940 gtk_widget_grab_default( dialog_bbox_b1 );
935 941
936 gtk_container_add( GTK_CONTAINER(dialog_bbox) , dialog_bbox_b1 );
937 gtk_box_pack_start( GTK_BOX(dialog_vbox) , dialog_bbox , FALSE , FALSE , 0 );
938
939 gtk_container_add( GTK_CONTAINER(dialog) , dialog_vbox );
940 gtk_widget_show_all(dialog); 942 gtk_widget_show_all(dialog);
941 943
942 return dialog; 944 return dialog;
943 } 945 }
944 946