Rename common.[ch] to gtk_common.[ch], there are too many files by that name.
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Sun, 6 Jan 2008 16:22:00 +0000 (16:22 +0000)
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Sun, 6 Jan 2008 16:22:00 +0000 (16:22 +0000)
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@25629 b3059339-0415-0410-9bf9-f77b7e298cf2

gui/Makefile
gui/mplayer/gtk/about.c
gui/mplayer/gtk/eq.c
gui/mplayer/gtk/fs.c
gui/mplayer/gtk/gtk_common.c [moved from gui/mplayer/gtk/common.c with 99% similarity]
gui/mplayer/gtk/gtk_common.h [moved from gui/mplayer/gtk/common.h with 100% similarity]
gui/mplayer/gtk/mb.c
gui/mplayer/gtk/opts.c
gui/mplayer/gtk/pl.c
gui/mplayer/gtk/sb.c
gui/mplayer/gtk/url.c

index 28c806a..76c9389 100644 (file)
@@ -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
 
index a19bb55..47a2b99 100644 (file)
@@ -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;
 
index 1e19fcf..57901e8 100644 (file)
@@ -22,7 +22,7 @@
 #include "../widgets.h"
 
 #include "eq.h"
-#include "common.h"
+#include "gtk_common.h"
 
 #define eqRange 15
 
index 5a45a13..62191ca 100644 (file)
@@ -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)
similarity index 99%
rename from gui/mplayer/gtk/common.c
rename to gui/mplayer/gtk/gtk_common.c
index 7a21969..de7b448 100644 (file)
@@ -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 )
 {
index 5f3873d..db2ec24 100644 (file)
@@ -8,7 +8,7 @@
 
 #include "../widgets.h"
 #include "mb.h"
-#include "common.h"
+#include "gtk_common.h"
 
 GtkWidget * gtkMessageBoxText;
 GtkWidget * MessageBox = NULL;
index ffd79fd..234245c 100644 (file)
@@ -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"
index 8ca2f1e..1e5b81e 100644 (file)
@@ -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",
index bae48c5..d5e3e4b 100644 (file)
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 #include "sb.h"
-#include "common.h"
+#include "gtk_common.h"
 
 #include "app.h"
 #include "config.h"
index 591923f..c4809e8 100644 (file)
@@ -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"