[MPlayer-cvslog] r25629 - in trunk/gui: Makefile mplayer/gtk/about.c mplayer/gtk/common.c mplayer/gtk/common.h mplayer/gtk/eq.c mplayer/gtk/fs.c mplayer/gtk/gtk_common.c mplayer/gtk/gtk_common.h mplayer/gtk/mb.c mplayer/gtk/opts.c mplayer/gtk/pl.c mplayer/gtk/sb.c mplayer/gtk/url.c

[diego]

Author: diego
Date: Sun Jan  6 17:22:00 2008
New Revision: 25629

Log:
Rename common.[ch] to gtk_common.[ch], there are too many files by that name.


Added:
   trunk/gui/mplayer/gtk/gtk_common.c
      - copied, changed from r25628, /trunk/gui/mplayer/gtk/common.c
   trunk/gui/mplayer/gtk/gtk_common.h
      - copied unchanged from r25628, /trunk/gui/mplayer/gtk/common.h
Removed:
   trunk/gui/mplayer/gtk/common.c
   trunk/gui/mplayer/gtk/common.h
Modified:
   trunk/gui/Makefile
   trunk/gui/mplayer/gtk/about.c
   trunk/gui/mplayer/gtk/eq.c
   trunk/gui/mplayer/gtk/fs.c
   trunk/gui/mplayer/gtk/mb.c
   trunk/gui/mplayer/gtk/opts.c
   trunk/gui/mplayer/gtk/pl.c
   trunk/gui/mplayer/gtk/sb.c
   trunk/gui/mplayer/gtk/url.c

Modified: trunk/gui/Makefile
==============================================================================
--- trunk/gui/Makefile	(original)
+++ trunk/gui/Makefile	Sun Jan  6 17:22:00 2008
@@ -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
 

Modified: trunk/gui/mplayer/gtk/about.c
==============================================================================
--- trunk/gui/mplayer/gtk/about.c	(original)
+++ trunk/gui/mplayer/gtk/about.c	Sun Jan  6 17:22:00 2008
@@ -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;
 

Modified: trunk/gui/mplayer/gtk/eq.c
==============================================================================
--- trunk/gui/mplayer/gtk/eq.c	(original)
+++ trunk/gui/mplayer/gtk/eq.c	Sun Jan  6 17:22:00 2008
@@ -22,7 +22,7 @@
 #include "../widgets.h"
 
 #include "eq.h"
-#include "common.h"
+#include "gtk_common.h"
 
 #define eqRange 15
 

Modified: trunk/gui/mplayer/gtk/fs.c
==============================================================================
--- trunk/gui/mplayer/gtk/fs.c	(original)
+++ trunk/gui/mplayer/gtk/fs.c	Sun Jan  6 17:22:00 2008
@@ -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)

Copied: trunk/gui/mplayer/gtk/gtk_common.c (from r25628, /trunk/gui/mplayer/gtk/common.c)
==============================================================================
--- /trunk/gui/mplayer/gtk/common.c	(original)
+++ trunk/gui/mplayer/gtk/gtk_common.c	Sun Jan  6 17:22:00 2008
@@ -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 )
 {

Modified: trunk/gui/mplayer/gtk/mb.c
==============================================================================
--- trunk/gui/mplayer/gtk/mb.c	(original)
+++ trunk/gui/mplayer/gtk/mb.c	Sun Jan  6 17:22:00 2008
@@ -8,7 +8,7 @@
 
 #include "../widgets.h"
 #include "mb.h"
-#include "common.h"
+#include "gtk_common.h"
 
 GtkWidget * gtkMessageBoxText;
 GtkWidget * MessageBox = NULL;

Modified: trunk/gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/gui/mplayer/gtk/opts.c	(original)
+++ trunk/gui/mplayer/gtk/opts.c	Sun Jan  6 17:22:00 2008
@@ -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"

Modified: trunk/gui/mplayer/gtk/pl.c
==============================================================================
--- trunk/gui/mplayer/gtk/pl.c	(original)
+++ trunk/gui/mplayer/gtk/pl.c	Sun Jan  6 17:22:00 2008
@@ -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",

Modified: trunk/gui/mplayer/gtk/sb.c
==============================================================================
--- trunk/gui/mplayer/gtk/sb.c	(original)
+++ trunk/gui/mplayer/gtk/sb.c	Sun Jan  6 17:22:00 2008
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 #include "sb.h"
-#include "common.h"
+#include "gtk_common.h"
 
 #include "app.h"
 #include "config.h"

Modified: trunk/gui/mplayer/gtk/url.c
==============================================================================
--- trunk/gui/mplayer/gtk/url.c	(original)
+++ trunk/gui/mplayer/gtk/url.c	Sun Jan  6 17:22:00 2008
@@ -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"