summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-05 07:59:37 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-05 07:59:37 +0000
commit9e1391b5344ec30267260bab51dcf9a41af1d2e1 (patch)
tree56937c00d16c0c7252c349afea14b0810b09e9fb /gui
parentbab8e78a2bc9862881f18b163a0c4062facac356 (diff)
downloadmpv-9e1391b5344ec30267260bab51dcf9a41af1d2e1.tar.bz2
mpv-9e1391b5344ec30267260bab51dcf9a41af1d2e1.tar.xz
Rename url.c/url.h to the less generic gtk_url.c/gtk_url.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26169 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'gui')
-rw-r--r--gui/Makefile2
-rw-r--r--gui/mplayer/gtk/gtk_url.c (renamed from gui/mplayer/gtk/url.c)2
-rw-r--r--gui/mplayer/gtk/gtk_url.h (renamed from gui/mplayer/gtk/url.h)6
-rw-r--r--gui/mplayer/widgets.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/gui/Makefile b/gui/Makefile
index b2d67a334b..777fa031d0 100644
--- a/gui/Makefile
+++ b/gui/Makefile
@@ -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 \
diff --git a/gui/mplayer/gtk/url.c b/gui/mplayer/gtk/gtk_url.c
index c4809e8d13..1ce9a315e8 100644
--- a/gui/mplayer/gtk/url.c
+++ b/gui/mplayer/gtk/gtk_url.c
@@ -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"
diff --git a/gui/mplayer/gtk/url.h b/gui/mplayer/gtk/gtk_url.h
index c29895d889..9e0284a832 100644
--- a/gui/mplayer/gtk/url.h
+++ b/gui/mplayer/gtk/gtk_url.h
@@ -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 */
diff --git a/gui/mplayer/widgets.c b/gui/mplayer/widgets.c
index 891b44b32f..3595966223 100644
--- a/gui/mplayer/widgets.c
+++ b/gui/mplayer/widgets.c
@@ -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"