[MPlayer-cvslog] r26169 - in trunk/gui: Makefile mplayer/gtk/gtk_url.c mplayer/gtk/gtk_url.h mplayer/gtk/url.c mplayer/gtk/url.h mplayer/widgets.c

[diego]

Author: diego
Date: Wed Mar  5 08:59:37 2008
New Revision: 26169

Log:
Rename url.c/url.h to the less generic gtk_url.c/gtk_url.h.


Added:
   trunk/gui/mplayer/gtk/gtk_url.c
      - copied, changed from r26155, /trunk/gui/mplayer/gtk/url.c
   trunk/gui/mplayer/gtk/gtk_url.h
      - copied, changed from r26168, /trunk/gui/mplayer/gtk/url.h
Removed:
   trunk/gui/mplayer/gtk/url.c
   trunk/gui/mplayer/gtk/url.h
Modified:
   trunk/gui/Makefile
   trunk/gui/mplayer/widgets.c

Modified: trunk/gui/Makefile
==============================================================================
--- trunk/gui/Makefile	(original)
+++ trunk/gui/Makefile	Wed Mar  5 08:59:37 2008
@@ -31,12 +31,12 @@ SRCS_MPLAYER = app.c \
                mplayer/gtk/eq.c \
                mplayer/gtk/fs.c \
                mplayer/gtk/gtk_common.c \
+               mplayer/gtk/gtk_url.c \
                mplayer/gtk/mb.c \
                mplayer/gtk/menu.c \
                mplayer/gtk/opts.c \
                mplayer/gtk/pl.c \
                mplayer/gtk/sb.c \
-               mplayer/gtk/url.c \
                skin/cut.c \
                skin/font.c \
                skin/skin.c \

Copied: trunk/gui/mplayer/gtk/gtk_url.c (from r26155, /trunk/gui/mplayer/gtk/url.c)
==============================================================================
--- /trunk/gui/mplayer/gtk/url.c	(original)
+++ trunk/gui/mplayer/gtk/gtk_url.c	Wed Mar  5 08:59:37 2008
@@ -9,7 +9,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "url.h"
+#include "gtk_url.h"
 #include "gtk_common.h"
 #include "interface.h"
 #include "app.h"

Copied: trunk/gui/mplayer/gtk/gtk_url.h (from r26168, /trunk/gui/mplayer/gtk/url.h)
==============================================================================
--- /trunk/gui/mplayer/gtk/url.h	(original)
+++ trunk/gui/mplayer/gtk/gtk_url.h	Wed Mar  5 08:59:37 2008
@@ -1,5 +1,5 @@
-#ifndef MPLAYER_GUI_URL_H
-#define MPLAYER_GUI_URL_H
+#ifndef MPLAYER_GUI_GTK_URL_H
+#define MPLAYER_GUI_GTK_URL_H
 
 #include <gtk/gtk.h>
 
@@ -9,4 +9,4 @@ extern int         gtkVURLDialogBox;
 extern void ShowURLDialogBox( void );
 extern GtkWidget * create_URL( void );
 
-#endif /* MPLAYER_GUI_URL_H */
+#endif /* MPLAYER_GUI_GTK_URL_H */

Modified: trunk/gui/mplayer/widgets.c
==============================================================================
--- trunk/gui/mplayer/widgets.c	(original)
+++ trunk/gui/mplayer/widgets.c	Wed Mar  5 08:59:37 2008
@@ -44,7 +44,7 @@ int gtkInitialized = 0;
 #include "gtk/about.h"
 #include "gtk/opts.h"
 #include "gtk/menu.h"
-#include "gtk/url.h"
+#include "gtk/gtk_url.h"
 #include "gtk/eq.h"
 
 #include "pixmaps/MPlayer_mini.xpm"