[Mplayer-cvslog] CVS: main/Gui/mplayer/gtk eq.c,1.9,1.10 eq.h,1.3,1.4 menu.h,1.1,1.2 opts.h,1.3,1.4 pl.c,1.9,1.10 pl.h,1.5,1.6 url.c,1.6,1.7
Zoltan Ponekker
pontscho at mplayerhq.hu
Tue Aug 27 00:21:00 CEST 2002
Update of /cvsroot/mplayer/main/Gui/mplayer/gtk
In directory mail:/var/tmp.root/cvs-serv864/Gui/mplayer/gtk
Modified Files:
eq.c eq.h menu.h opts.h pl.c pl.h url.c
Log Message:
- warning fixes from Dominik Mierzejewski <dominik at rangers.eu.org>
- wsXDNDProcessSelection return Truae fix
- add url list saving support from Morten Volden <mvolden at tdcadsl.dk>
- fix bug's in this patches
- fix some memleak and bug
Index: eq.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/eq.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- eq.c 5 Aug 2002 01:14:14 -0000 1.9
+++ eq.c 26 Aug 2002 22:20:57 -0000 1.10
@@ -233,7 +233,6 @@
static void eqSelectChannelsListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data )
{
- char * tmp;
Channel=row - 1;
eqSetBands( Channel );
if ( Channel == -1 )
Index: eq.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/eq.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eq.h 25 Jul 2002 20:26:37 -0000 1.3
+++ eq.h 26 Aug 2002 22:20:57 -0000 1.4
@@ -9,4 +9,4 @@
extern GtkWidget * create_Equalizer( void );
extern void ShowEqualizer( void );
-#endif
\ No newline at end of file
+#endif
Index: menu.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/menu.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menu.h 14 Nov 2001 17:48:38 -0000 1.1
+++ menu.h 26 Aug 2002 22:20:57 -0000 1.2
@@ -10,4 +10,4 @@
extern GtkWidget * AddSeparator( GtkWidget * Menu );
extern GtkWidget * create_PopUpMenu( void );
-#endif
\ No newline at end of file
+#endif
Index: opts.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- opts.h 25 Jul 2002 20:26:37 -0000 1.3
+++ opts.h 26 Aug 2002 22:20:57 -0000 1.4
@@ -14,4 +14,4 @@
extern void ShowPreferences( void );
-#endif
\ No newline at end of file
+#endif
Index: pl.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/pl.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pl.c 14 Aug 2002 23:02:44 -0000 1.9
+++ pl.c 26 Aug 2002 22:20:57 -0000 1.10
@@ -266,7 +266,7 @@
{
if ( CLFileSelected[i] )
{
- gtk_clist_get_text( GTK_CLIST( CLFiles ),i,0,&itext );
+ gtk_clist_get_text( GTK_CLIST( CLFiles ),i,0,(char **)&itext );
text[0][0]=itext[0][0]; text[0][1]=current_path;
gtk_clist_append( GTK_CLIST( CLSelected ),text[0] );
NrOfSelected++;
Index: pl.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/pl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pl.h 12 Jul 2002 00:53:26 -0000 1.5
+++ pl.h 26 Aug 2002 22:20:57 -0000 1.6
@@ -11,4 +11,4 @@
extern GtkWidget * create_PlayList (void);
-#endif
\ No newline at end of file
+#endif
Index: url.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/url.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- url.c 4 Aug 2002 19:23:58 -0000 1.6
+++ url.c 26 Aug 2002 22:20:57 -0000 1.7
@@ -27,6 +27,18 @@
if ( gtkVURLDialogBox ) gtkActive( URL );
else URL=create_URL();
+ if ( URLList )
+ {
+ URLItem * item = URLList;
+ g_list_free( URLComboEntrys );
+ URLComboEntrys=NULL;
+ while( item )
+ {
+ URLComboEntrys=g_list_append( URLComboEntrys,(gchar *)item->url );
+ item=item->next;
+ }
+ }
+
if ( URLComboEntrys )
{
gtk_entry_set_text( GTK_ENTRY( URLEntry ),URLComboEntrys->data );
@@ -53,6 +65,8 @@
static void on_Button_pressed( GtkButton * button,gpointer user_data )
{
+ URLItem * item;
+
if ( (int)user_data )
{
gchar * str= strdup( gtk_entry_get_text( GTK_ENTRY( URLEntry ) ) );
@@ -67,6 +81,10 @@
free( str ); str=tmp;
}
URLComboEntrys=g_list_prepend( URLComboEntrys,(gchar *)str );
+
+ item=calloc( 1,sizeof( URLItem ) );
+ item->url=gstrdup( str );
+ gtkSet( gtkAddURLItem,0,(void *)item );
guiSetFilename( guiIntfStruct.Filename,str ); guiIntfStruct.FilenameChanged=1;
mplEventHandling( evPlayNetwork,0 );
More information about the MPlayer-cvslog
mailing list