Remove the tool name prefix from source files.

Remove the tool name prefix from source files as each tool now has
it's own separate directory.


git-svn-id: https://svn.o-hand.com/repos/gupnp/trunk/gupnp-tools@585 d8cb91d7-bff9-0310-92b9-80b65e4482b2

30 files changed, 147 insertions, 86 deletions

diff --git a/ChangeLog b/ChangeLog
index cf55e3b..11e602a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,64 @@
+2007-11-03  Zeeshan Ali Khattak  <zeenix@gstreamer.net>
+
+	* src/av-cp/Makefile.am:
+	* src/av-cp/av-cp-gui.c:
+	* src/av-cp/av-cp-gui.h:
+	* src/av-cp/av-cp-playlisttreeview.c:
+	* src/av-cp/av-cp-playlisttreeview.h:
+	* src/av-cp/av-cp-renderercombo.c:
+	* src/av-cp/av-cp-renderercombo.h:
+	* src/av-cp/av-cp.c:
+	* src/av-cp/av-cp.h:
+	* src/av-cp/gui.c:
+	* src/av-cp/gui.h:
+	* src/av-cp/main.c:
+	* src/av-cp/main.h:
+	* src/av-cp/playlisttreeview.c:
+	* src/av-cp/playlisttreeview.h:
+	* src/av-cp/renderercombo.c:
+	* src/av-cp/renderercombo.h:
+	* src/network-light/Makefile.am:
+	* src/network-light/gui.c:
+	* src/network-light/gui.h:
+	* src/network-light/main.c:
+	* src/network-light/main.h:
+	* src/network-light/network-light-gui.c:
+	* src/network-light/network-light-gui.h:
+	* src/network-light/network-light-upnp.c:
+	* src/network-light/network-light-upnp.h:
+	* src/network-light/network-light.c:
+	* src/network-light/network-light.h:
+	* src/network-light/upnp.c:
+	* src/network-light/upnp.h:
+	* src/universal-cp/Makefile.am:
+	* src/universal-cp/actiondialog.c:
+	* src/universal-cp/actiondialog.h:
+	* src/universal-cp/detailstreeview.c:
+	* src/universal-cp/detailstreeview.h:
+	* src/universal-cp/devicetreeview.c:
+	* src/universal-cp/devicetreeview.h:
+	* src/universal-cp/eventtreeview.c:
+	* src/universal-cp/eventtreeview.h:
+	* src/universal-cp/gui.c:
+	* src/universal-cp/gui.h:
+	* src/universal-cp/main.c:
+	* src/universal-cp/main.h:
+	* src/universal-cp/universal-cp-actiondialog.c:
+	* src/universal-cp/universal-cp-actiondialog.h:
+	* src/universal-cp/universal-cp-detailstreeview.c:
+	* src/universal-cp/universal-cp-detailstreeview.h:
+	* src/universal-cp/universal-cp-devicetreeview.c:
+	* src/universal-cp/universal-cp-devicetreeview.h:
+	* src/universal-cp/universal-cp-eventtreeview.c:
+	* src/universal-cp/universal-cp-eventtreeview.h:
+	* src/universal-cp/universal-cp-gui.c:
+	* src/universal-cp/universal-cp-gui.h:
+	* src/universal-cp/universal-cp.c:
+	* src/universal-cp/universal-cp.h:
+
+	Remove the tool name prefix from source files as each tool now has
+	it's own separate directory.
+
 2007-11-02  Zeeshan Ali Khattak  <zeenix@gstreamer.net>
 
 	* src/av-cp/av-cp-playlisttreeview.c:
diff --git a/src/av-cp/Makefile.am b/src/av-cp/Makefile.am
index 123373e..dc09d3b 100644
--- a/src/av-cp/Makefile.am
+++ b/src/av-cp/Makefile.am
@@ -9,14 +9,14 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) $(LIBGLADE_CFLAGS) -I$(top_srcdir) \
 
 bin_PROGRAMS = gupnp-av-cp
 
-gupnp_av_cp_SOURCES = av-cp.c \
-		      av-cp-gui.c \
-		      av-cp-playlisttreeview.c \
-		      av-cp-renderercombo.c \
-		      av-cp.h \
-		      av-cp-gui.h \
-		      av-cp-playlisttreeview.h \
-		      av-cp-renderercombo.h
+gupnp_av_cp_SOURCES = main.c \
+		      gui.c \
+		      playlisttreeview.c \
+		      renderercombo.c \
+		      main.h \
+		      gui.h \
+		      playlisttreeview.h \
+		      renderercombo.h
 
 gupnp_av_cp_LDADD = $(LIBGLADE_LIBS) $(LIBGUPNP_LIBS) \
 		    ../common/libicons.a
diff --git a/src/av-cp/av-cp-gui.c b/src/av-cp/gui.c
index 4da1e74..95e17f6 100644
--- a/src/av-cp/av-cp-gui.c
+++ b/src/av-cp/gui.c
@@ -22,10 +22,10 @@
 #include <stdlib.h>
 #include <config.h>
 
-#include "av-cp-gui.h"
-#include "av-cp-playlisttreeview.h"
-#include "av-cp-renderercombo.h"
-#include "av-cp.h"
+#include "gui.h"
+#include "playlisttreeview.h"
+#include "renderercombo.h"
+#include "main.h"
 #include "icons.h"
 
 #define GLADE_FILE DATA_DIR "/gupnp-av-cp.glade"
diff --git a/src/av-cp/av-cp-gui.h b/src/av-cp/gui.h
index d3cc3ae..9d4ca75 100644
--- a/src/av-cp/av-cp-gui.h
+++ b/src/av-cp/gui.h
@@ -18,14 +18,14 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GUPNP_AV_CP_GUI_H__
-#define __GUPNP_AV_CP_GUI_H__
+#ifndef __GUI_H__
+#define __GUI_H__
 
 #include <libgupnp/gupnp-control-point.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
-#include "av-cp-playlisttreeview.h"
+#include "playlisttreeview.h"
 
 gboolean
 init_ui                         (gint             *argc,
@@ -34,5 +34,5 @@ init_ui                         (gint             *argc,
 void
 deinit_ui                       (void);
 
-#endif /* __GUPNP_AV_CP_GUI_H__ */
+#endif /* __GUI_H__ */
 
diff --git a/src/av-cp/av-cp.c b/src/av-cp/main.c
index da38519..43ebb5d 100644
--- a/src/av-cp/av-cp.c
+++ b/src/av-cp/main.c
@@ -23,9 +23,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "av-cp-gui.h"
-#include "av-cp-renderercombo.h"
-#include "av-cp-playlisttreeview.h"
+#include "gui.h"
+#include "renderercombo.h"
+#include "playlisttreeview.h"
 
 static GUPnPContext      *context;
 static GUPnPControlPoint *cp;
diff --git a/src/av-cp/av-cp.h b/src/av-cp/main.h
index b9d712a..d095db9 100644
--- a/src/av-cp/av-cp.h
+++ b/src/av-cp/main.h
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GUPNP_AV_CP_H__
-#define __GUPNP_AV_CP_H__
+#ifndef __MAIN_H__
+#define __MAIN_H__
 
 #include <libgupnp/gupnp-control-point.h>
 #include <gtk/gtk.h>
@@ -28,4 +28,4 @@
 void
 application_exit            (void);
 
-#endif /* __GUPNP_AV_CP_H__ */
+#endif /* __MAIN_H__ */
diff --git a/src/av-cp/av-cp-playlisttreeview.c b/src/av-cp/playlisttreeview.c
index 81c11c8..a987adc 100644
--- a/src/av-cp/av-cp-playlisttreeview.c
+++ b/src/av-cp/playlisttreeview.c
@@ -22,10 +22,10 @@
 #include <stdlib.h>
 #include <config.h>
 
-#include "av-cp-playlisttreeview.h"
+#include "playlisttreeview.h"
 #include "icons.h"
-#include "av-cp-gui.h"
-#include "av-cp.h"
+#include "gui.h"
+#include "main.h"
 
 #define ITEM_CLASS_IMAGE "object.item.imageItem"
 #define ITEM_CLASS_AUDIO "object.item.audioItem"
diff --git a/src/av-cp/av-cp-playlisttreeview.h b/src/av-cp/playlisttreeview.h
index eb38845..644aafb 100644
--- a/src/av-cp/av-cp-playlisttreeview.h
+++ b/src/av-cp/playlisttreeview.h
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __AV_CP_PLAYLISTTREEVIEW_H__
-#define __AV_CP_PLAYLISTTREEVIEW_H__
+#ifndef __PLAYLISTTREEVIEW_H__
+#define __PLAYLISTTREEVIEW_H__
 
 #include <config.h>
 #include <gtk/gtk.h>
@@ -35,5 +35,5 @@ add_media_server                (GUPnPMediaServerProxy  *proxy);
 void
 remove_media_server             (GUPnPMediaServerProxy  *proxy);
 
-#endif /* __AV_CP_PLAYLISTTREEVIEW_H__ */
+#endif /* __PLAYLISTTREEVIEW_H__ */
 
diff --git a/src/av-cp/av-cp-renderercombo.c b/src/av-cp/renderercombo.c
index bb1bec7..8ba9592 100644
--- a/src/av-cp/av-cp-renderercombo.c
+++ b/src/av-cp/renderercombo.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <config.h>
 
-#include "av-cp-renderercombo.h"
+#include "renderercombo.h"
 #include "icons.h"
 
 static GtkWidget *renderer_combo;
diff --git a/src/av-cp/av-cp-renderercombo.h b/src/av-cp/renderercombo.h
index d5a2884..301c01d 100644
--- a/src/av-cp/av-cp-renderercombo.h
+++ b/src/av-cp/renderercombo.h
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __AV_CP_RENDERERCOMBO_H__
-#define __AV_CP_RENDERERCOMBO_H__
+#ifndef __RENDERERCOMBO_H__
+#define __RENDERERCOMBO_H__
 
 #include <libgupnp/gupnp.h>
 #include <libgupnp-av/gupnp-av.h>
@@ -39,4 +39,4 @@ remove_media_renderer           (GUPnPMediaRendererProxy *proxy);
 void
 setup_renderer_combo            (GladeXML                *glade_xml);
 
-#endif /* __AV_CP_RENDERERCOMBO_H__ */
+#endif /* __RENDERERCOMBO_H__ */
diff --git a/src/network-light/Makefile.am b/src/network-light/Makefile.am
index eac71bd..c38f4a1 100644
--- a/src/network-light/Makefile.am
+++ b/src/network-light/Makefile.am
@@ -9,12 +9,12 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) $(LIBGLADE_CFLAGS) -I$(top_srcdir) \
 
 bin_PROGRAMS = gupnp-network-light
 
-gupnp_network_light_SOURCES = network-light.c \
-			      network-light-gui.c \
-			      network-light-upnp.c \
-			      network-light.h \
-			      network-light-gui.h \
-			      network-light-upnp.h
+gupnp_network_light_SOURCES = main.c \
+			      gui.c \
+			      upnp.c \
+			      main.h \
+			      gui.h \
+			      upnp.h
 gupnp_network_light_LDADD = $(LIBGLADE_LIBS) $(LIBGUPNP_LIBS)
 gupnp_network_light_LDFLAGS = -export-dynamic
 
diff --git a/src/network-light/network-light-gui.c b/src/network-light/gui.c
index 4fe0356..9646652 100644
--- a/src/network-light/network-light-gui.c
+++ b/src/network-light/gui.c
@@ -22,9 +22,9 @@
 #include <stdlib.h>
 #include <config.h>
 
-#include "network-light-gui.h"
-#include "network-light-upnp.h"
-#include "network-light.h"
+#include "gui.h"
+#include "upnp.h"
+#include "main.h"
 
 #define GLADE_FILE DATA_DIR "/gupnp-network-light.glade"
 #define ICON_FILE  "pixmaps/network-light-256x256.png"
diff --git a/src/network-light/network-light-gui.h b/src/network-light/gui.h
index 376384d..a7fe6b8 100644
--- a/src/network-light/network-light-gui.h
+++ b/src/network-light/gui.h
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GUPNP_NETWORK_LIGHT_GUI_H__
-#define __GUPNP_NETWORK_LIGHT_GUI_H__
+#ifndef __GUI_H__
+#define __GUI_H__
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
@@ -34,4 +34,4 @@ init_ui            (gint             *argc,
 void
 deinit_ui          (void);
 
-#endif /* __GUPNP_NETWORK_LIGHT_GUI_H__ */
+#endif /* __GUI_H__ */
diff --git a/src/network-light/network-light.c b/src/network-light/main.c
index e16f8a3..6bb0f11 100644
--- a/src/network-light/network-light.c
+++ b/src/network-light/main.c
@@ -24,9 +24,9 @@
 #include <locale.h>
 #include <string.h>
 
-#include "network-light-gui.h"
-#include "network-light-upnp.h"
-#include "network-light.h"
+#include "gui.h"
+#include "upnp.h"
+#include "main.h"
 
 static gboolean light_status;
 static gint     light_load_level;
diff --git a/src/network-light/network-light.h b/src/network-light/main.h
index b1de57f..1988d87 100644
--- a/src/network-light/network-light.h
+++ b/src/network-light/main.h
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GUPNP_NETWORK_LIGHT_H__
-#define __GUPNP_NETWORK_LIGHT_H__
+#ifndef __MAIN_H__
+#define __MAIN_H__
 
 #include <libgupnp/gupnp.h>
 
@@ -35,4 +35,4 @@ set_load_level     (gint load_level);
 gint
 get_load_level     (void);
 
-#endif /* __GUPNP_NETWORK_LIGHT_H__ */
+#endif /* __MAIN_H__ */
diff --git a/src/network-light/network-light-upnp.c b/src/network-light/upnp.c
index 5ca5dcc..288f968 100644
--- a/src/network-light/network-light-upnp.c
+++ b/src/network-light/upnp.c
@@ -26,9 +26,9 @@
 #include <locale.h>
 #include <string.h>
 
-#include "network-light-gui.h"
-#include "network-light-upnp.h"
-#include "network-light.h"
+#include "gui.h"
+#include "upnp.h"
+#include "main.h"
 
 #define DESCRIPTION_DOC "xml/network-light-desc.xml"
 #define DIMMING_SERVICE "urn:schemas-upnp-org:service:Dimming:1"
diff --git a/src/network-light/network-light-upnp.h b/src/network-light/upnp.h
index d2d150c..750a2dc 100644
--- a/src/network-light/network-light-upnp.h
+++ b/src/network-light/upnp.h
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GUPNP_NETWORK_LIGHT_UPNP_H__
-#define __GUPNP_NETWORK_LIGHT_UPNP_H__
+#ifndef __UPNP_H__
+#define __UPNP_H__
 
 #include <libgupnp/gupnp.h>
 
@@ -35,4 +35,4 @@ init_upnp                       (void);
 void
 deinit_upnp                     (void);
 
-#endif /* __GUPNP_NETWORK_LIGHT_UPNP_H__ */
+#endif /* __UPNP_H__ */
diff --git a/src/universal-cp/Makefile.am b/src/universal-cp/Makefile.am
index 30f22fe..2b14a1b 100644
--- a/src/universal-cp/Makefile.am
+++ b/src/universal-cp/Makefile.am
@@ -9,18 +9,18 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) $(LIBGLADE_CFLAGS) -I$(top_srcdir) \
 
 bin_PROGRAMS = gupnp-universal-cp
 
-gupnp_universal_cp_SOURCES = universal-cp.c \
-			     universal-cp-gui.c \
-			     universal-cp-devicetreeview.c \
-			     universal-cp-detailstreeview.c \
-			     universal-cp-eventtreeview.c \
-			     universal-cp-actiondialog.c \
-			     universal-cp.h \
-			     universal-cp-gui.h \
-			     universal-cp-devicetreeview.h \
-			     universal-cp-detailstreeview.h \
-			     universal-cp-eventtreeview.h \
-			     universal-cp-actiondialog.h
+gupnp_universal_cp_SOURCES = main.c \
+			     gui.c \
+			     devicetreeview.c \
+			     detailstreeview.c \
+			     eventtreeview.c \
+			     actiondialog.c \
+			     main.h \
+			     gui.h \
+			     devicetreeview.h \
+			     detailstreeview.h \
+			     eventtreeview.h \
+			     actiondialog.h
 gupnp_universal_cp_LDADD = $(LIBGLADE_LIBS) $(LIBGUPNP_LIBS) \
 		    	   ../common/libicons.a
 gupnp_universal_cp_LDFLAGS = -export-dynamic
diff --git a/src/universal-cp/universal-cp-actiondialog.c b/src/universal-cp/actiondialog.c
index f9836b2..8befbad 100644
--- a/src/universal-cp/universal-cp-actiondialog.c
+++ b/src/universal-cp/actiondialog.c
@@ -22,10 +22,10 @@
 #include <stdlib.h>
 #include <config.h>
 
-#include "universal-cp-gui.h"
-#include "universal-cp-devicetreeview.h"
+#include "gui.h"
+#include "devicetreeview.h"
 #include "icons.h"
-#include "universal-cp.h"
+#include "main.h"
 
 static GtkWidget *dialog;
 static GtkWidget *in_args_table;
diff --git a/src/universal-cp/universal-cp-actiondialog.h b/src/universal-cp/actiondialog.h
index fbdf21d..fbdf21d 100644
--- a/src/universal-cp/universal-cp-actiondialog.h
+++ b/src/universal-cp/actiondialog.h
diff --git a/src/universal-cp/universal-cp-detailstreeview.c b/src/universal-cp/detailstreeview.c
index 5205394..5de2cce 100644
--- a/src/universal-cp/universal-cp-detailstreeview.c
+++ b/src/universal-cp/detailstreeview.c
@@ -22,8 +22,8 @@
 #include <stdlib.h>
 #include <config.h>
 
-#include "universal-cp-detailstreeview.h"
-#include "universal-cp-gui.h"
+#include "detailstreeview.h"
+#include "gui.h"
 
 static GtkWidget *treeview;
 static GtkWidget *copy_value_menuitem;
diff --git a/src/universal-cp/universal-cp-detailstreeview.h b/src/universal-cp/detailstreeview.h
index 3ddae88..3ddae88 100644
--- a/src/universal-cp/universal-cp-detailstreeview.h
+++ b/src/universal-cp/detailstreeview.h
diff --git a/src/universal-cp/universal-cp-devicetreeview.c b/src/universal-cp/devicetreeview.c
index a2091f8..fa23acf 100644
--- a/src/universal-cp/universal-cp-devicetreeview.c
+++ b/src/universal-cp/devicetreeview.c
@@ -22,10 +22,10 @@
 #include <stdlib.h>
 #include <config.h>
 
-#include "universal-cp-gui.h"
+#include "gui.h"
 #include "icons.h"
-#include "universal-cp-actiondialog.h"
-#include "universal-cp.h"
+#include "actiondialog.h"
+#include "main.h"
 
 static const char *default_details[] = {
         "Software", "GUPnP Universal Control Point",
diff --git a/src/universal-cp/universal-cp-devicetreeview.h b/src/universal-cp/devicetreeview.h
index 2e3f564..2e3f564 100644
--- a/src/universal-cp/universal-cp-devicetreeview.h
+++ b/src/universal-cp/devicetreeview.h
diff --git a/src/universal-cp/universal-cp-eventtreeview.c b/src/universal-cp/eventtreeview.c
index 1239728..bb27b6c 100644
--- a/src/universal-cp/universal-cp-eventtreeview.c
+++ b/src/universal-cp/eventtreeview.c
@@ -22,8 +22,8 @@
 #include <stdlib.h>
 #include <config.h>
 
-#include "universal-cp-eventtreeview.h"
-#include "universal-cp-gui.h"
+#include "eventtreeview.h"
+#include "gui.h"
 
 #define MAX_VALUE_SIZE 128
 
diff --git a/src/universal-cp/universal-cp-eventtreeview.h b/src/universal-cp/eventtreeview.h
index c92fd20..c92fd20 100644
--- a/src/universal-cp/universal-cp-eventtreeview.h
+++ b/src/universal-cp/eventtreeview.h
diff --git a/src/universal-cp/universal-cp-gui.c b/src/universal-cp/gui.c
index 85446d3..e918417 100644
--- a/src/universal-cp/universal-cp-gui.c
+++ b/src/universal-cp/gui.c
@@ -22,12 +22,12 @@
 #include <stdlib.h>
 #include <config.h>
 
-#include "universal-cp-gui.h"
-#include "universal-cp-devicetreeview.h"
-#include "universal-cp-eventtreeview.h"
-#include "universal-cp-actiondialog.h"
+#include "gui.h"
+#include "devicetreeview.h"
+#include "eventtreeview.h"
+#include "actiondialog.h"
 #include "icons.h"
-#include "universal-cp.h"
+#include "main.h"
 
 #define GLADE_FILE DATA_DIR "/gupnp-universal-cp.glade"
 
diff --git a/src/universal-cp/universal-cp-gui.h b/src/universal-cp/gui.h
index 9a8edd9..e15c885 100644
--- a/src/universal-cp/universal-cp-gui.h
+++ b/src/universal-cp/gui.h
@@ -25,8 +25,8 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
-#include "universal-cp-devicetreeview.h"
-#include "universal-cp-detailstreeview.h"
+#include "devicetreeview.h"
+#include "detailstreeview.h"
 
 void
 display_event      (const char       *notified_at,
diff --git a/src/universal-cp/universal-cp.c b/src/universal-cp/main.c
index 92de0bd..a0b450a 100644
--- a/src/universal-cp/universal-cp.c
+++ b/src/universal-cp/main.c
@@ -19,7 +19,7 @@
  */
 
 #include <libgupnp/gupnp-control-point.h>
-#include "universal-cp-gui.h"
+#include "gui.h"
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/universal-cp/universal-cp.h b/src/universal-cp/main.h
index b413f74..b413f74 100644
--- a/src/universal-cp/universal-cp.h
+++ b/src/universal-cp/main.h