summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-06 16:22:00 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-06 16:22:00 +0000
commitd64cf433158588a377421c7a90e4c0169b4841f8 (patch)
treeb584df08830a56bf4c87a20e69c7e4bbf13e0db8 /gui
parent2bc03fd010f18df0be4d2aeae4b461c47f807180 (diff)
downloadmpv-d64cf433158588a377421c7a90e4c0169b4841f8.tar.bz2
mpv-d64cf433158588a377421c7a90e4c0169b4841f8.tar.xz
Rename common.[ch] to gtk_common.[ch], there are too many files by that name.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25629 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'gui')
-rw-r--r--gui/Makefile2
-rw-r--r--gui/mplayer/gtk/about.c2
-rw-r--r--gui/mplayer/gtk/eq.c2
-rw-r--r--gui/mplayer/gtk/fs.c2
-rw-r--r--gui/mplayer/gtk/gtk_common.c (renamed from gui/mplayer/gtk/common.c)2
-rw-r--r--gui/mplayer/gtk/gtk_common.h (renamed from gui/mplayer/gtk/common.h)0
-rw-r--r--gui/mplayer/gtk/mb.c2
-rw-r--r--gui/mplayer/gtk/opts.c2
-rw-r--r--gui/mplayer/gtk/pl.c2
-rw-r--r--gui/mplayer/gtk/sb.c2
-rw-r--r--gui/mplayer/gtk/url.c2
11 files changed, 10 insertions, 10 deletions
diff --git a/gui/Makefile b/gui/Makefile
index 28c806a0cb..76c938991f 100644
--- a/gui/Makefile
+++ b/gui/Makefile
@@ -41,7 +41,7 @@ SRCS_MPLAYER = wm/ws.c \
mplayer/gtk/opts.c \
mplayer/gtk/url.c \
mplayer/gtk/eq.c \
- mplayer/gtk/common.c \
+ mplayer/gtk/gtk_common.c \
endif
diff --git a/gui/mplayer/gtk/about.c b/gui/mplayer/gtk/about.c
index a19bb55065..47a2b993df 100644
--- a/gui/mplayer/gtk/about.c
+++ b/gui/mplayer/gtk/about.c
@@ -6,7 +6,7 @@
#include "mplayer/pixmaps/about.xpm"
#include "../widgets.h"
#include "about.h"
-#include "common.h"
+#include "gtk_common.h"
GtkWidget * About = NULL;
diff --git a/gui/mplayer/gtk/eq.c b/gui/mplayer/gtk/eq.c
index 1e19fcf0f2..57901e86d0 100644
--- a/gui/mplayer/gtk/eq.c
+++ b/gui/mplayer/gtk/eq.c
@@ -22,7 +22,7 @@
#include "../widgets.h"
#include "eq.h"
-#include "common.h"
+#include "gtk_common.h"
#define eqRange 15
diff --git a/gui/mplayer/gtk/fs.c b/gui/mplayer/gtk/fs.c
index 5a45a13b29..62191cade4 100644
--- a/gui/mplayer/gtk/fs.c
+++ b/gui/mplayer/gtk/fs.c
@@ -21,7 +21,7 @@
#include "../widgets.h"
#include "fs.h"
#include "opts.h"
-#include "common.h"
+#include "gtk_common.h"
#ifndef __linux__
#define get_current_dir_name() getcwd(NULL, PATH_MAX)
diff --git a/gui/mplayer/gtk/common.c b/gui/mplayer/gtk/gtk_common.c
index 7a21969e2f..de7b4487d7 100644
--- a/gui/mplayer/gtk/common.c
+++ b/gui/mplayer/gtk/gtk_common.c
@@ -2,7 +2,7 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "common.h"
+#include "gtk_common.h"
void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer )
{
diff --git a/gui/mplayer/gtk/common.h b/gui/mplayer/gtk/gtk_common.h
index f96b9d2bb5..f96b9d2bb5 100644
--- a/gui/mplayer/gtk/common.h
+++ b/gui/mplayer/gtk/gtk_common.h
diff --git a/gui/mplayer/gtk/mb.c b/gui/mplayer/gtk/mb.c
index 5f3873d054..db2ec24749 100644
--- a/gui/mplayer/gtk/mb.c
+++ b/gui/mplayer/gtk/mb.c
@@ -8,7 +8,7 @@
#include "../widgets.h"
#include "mb.h"
-#include "common.h"
+#include "gtk_common.h"
GtkWidget * gtkMessageBoxText;
GtkWidget * MessageBox = NULL;
diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
index ffd79fd2fd..234245c908 100644
--- a/gui/mplayer/gtk/opts.c
+++ b/gui/mplayer/gtk/opts.c
@@ -25,7 +25,7 @@
#include "../widgets.h"
#include "opts.h"
#include "fs.h"
-#include "common.h"
+#include "gtk_common.h"
// for mpcodecs_[av]d_drivers:
#include "libmpcodecs/vd.h"
diff --git a/gui/mplayer/gtk/pl.c b/gui/mplayer/gtk/pl.c
index 8ca2f1e3fa..1e5b81eb6f 100644
--- a/gui/mplayer/gtk/pl.c
+++ b/gui/mplayer/gtk/pl.c
@@ -17,7 +17,7 @@
#include "interface.h"
#include "../widgets.h"
#include "pl.h"
-#include "common.h"
+#include "gtk_common.h"
static char * book_open_xpm[] = {
"16 16 4 1",
diff --git a/gui/mplayer/gtk/sb.c b/gui/mplayer/gtk/sb.c
index bae48c523f..d5e3e4bb20 100644
--- a/gui/mplayer/gtk/sb.c
+++ b/gui/mplayer/gtk/sb.c
@@ -7,7 +7,7 @@
#include <stdio.h>
#include "sb.h"
-#include "common.h"
+#include "gtk_common.h"
#include "app.h"
#include "config.h"
diff --git a/gui/mplayer/gtk/url.c b/gui/mplayer/gtk/url.c
index 591923f6f2..c4809e8d13 100644
--- a/gui/mplayer/gtk/url.c
+++ b/gui/mplayer/gtk/url.c
@@ -10,7 +10,7 @@
#include <gtk/gtk.h>
#include "url.h"
-#include "common.h"
+#include "gtk_common.h"
#include "interface.h"
#include "app.h"
#include "../widgets.h"