ekiga r5864 - in trunk: . lib/gui

[dsandras svn gnome org]

Author: dsandras
Date: Sun Jan  6 18:11:05 2008
New Revision: 5864
URL: http://svn.gnome.org/viewvc/ekiga?rev=5864&view=rev

Log:
Renamed the previous.


Added:
   trunk/lib/gui/codecsbox.cpp
      - copied unchanged from r5863, /trunk/lib/gui/gmcodecsbox.cpp
   trunk/lib/gui/codecsbox.h
      - copied unchanged from r5863, /trunk/lib/gui/gmcodecsbox.h
Removed:
   trunk/lib/gui/gmcodecsbox.cpp
   trunk/lib/gui/gmcodecsbox.h
Modified:
   trunk/ChangeLog
   trunk/lib/gui/Makefile.am

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Sun Jan  6 18:11:05 2008
@@ -1,5 +1,10 @@
 2008-01-06  Damien Sandras  <dsandras gnome org>
 
+	* lib/gui/codecsbox.cpp, lib/gui/codecsbox.h, lib/gui/Makefile.am:
+	Renamed the previous.
+
+2008-01-06  Damien Sandras  <dsandras gnome org>
+
 	* lib/gui/gmcodecsbox.cpp, lib/guigmcodecsbox.h:
 	Improved GObject code. Adapted so that it works with the new engine.
 	It can now deal with audio and video codecs separately and update the

Modified: trunk/lib/gui/Makefile.am
==============================================================================
--- trunk/lib/gui/Makefile.am	(original)
+++ trunk/lib/gui/Makefile.am	Sun Jan  6 18:11:05 2008
@@ -7,8 +7,8 @@
 	gmwindow.h		\
 	gmconfwidgets.c		\
 	gmconfwidgets.h		\
-	gmcodecsbox.cpp		\
-	gmcodecsbox.h		\
+	codecsbox.cpp		\
+	codecsbox.h		\
 	gmconnectbutton.c	\
 	gmconnectbutton.h	\
 	gmdialog.c		\
@@ -71,9 +71,9 @@
 	-I$(top_srcdir)/lib/pixops
 endif
 
-AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(XV_CFLAGS) $(DX_CFLAGS)
-AM_CFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS)
-AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(XV_LIBS) $(DX_LIBS) $(GNOME_LIBS) 
+AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(XV_CFLAGS) $(DX_CFLAGS) $(SIGC_CFLAGS) -I ../../lib/engine/protocol/skel/ -I ../../lib/engine/framework/
+AM_CFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS) 
+AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(XV_LIBS) $(DX_LIBS) $(GNOME_LIBS) $(SIGC_LIBS)
 
 libgmwidgets_la_LDFLAGS = -export-dynamic
 libgmwidgets_la_LIBADD = $(AM_LIBS)