ekiga r7698 - in trunk: . src

[dsandras svn gnome org]

Author: dsandras
Date: Fri Feb 27 16:00:37 2009
New Revision: 7698
URL: http://svn.gnome.org/viewvc/ekiga?rev=7698&view=rev

Log:
Various patches from Eugen.


Modified:
   trunk/ChangeLog
   trunk/Coding_Policy
   trunk/ekiga.schemas.in.in
   trunk/src/ekiga-config-tool.in

Modified: trunk/Coding_Policy
==============================================================================
--- trunk/Coding_Policy	(original)
+++ trunk/Coding_Policy	Fri Feb 27 16:00:37 2009
@@ -1,11 +1,19 @@
-Developers :
-- Please keep the current coding style in GnomeMeeting and put comments.
-Functions descriptions should have 3 fields. DESCRIPTION, BEHAVIOR and PRE.
-PRE means the set of conditions on the parameters to be sure that the 
-function works.
-- About gconf: All notifiers and all gconf_client_notify_add must be in
-confing.cpp. The callback that updates the gconf cache must be located
-in the file containing the widget associated to the callback. Some general
-callbacks for toggles, entries, option menus are located in gconf.cpp.
-- Options: GnomeMeeting follows the "Instant Apply" model.
-- The way to include things is the following: include the GnomeMeeting headers before the others. All the .h files should contain #include "common.h" as first include because it will itself include a ptlib file containing compilation flags required to have a well-working GnomeMeeting. The .h corresponding to the .cpp file must be included before the other includes. Libraries headers includes must follow the application headers includes. ../config.h must be included before the rest in all .cpp files.
\ No newline at end of file
+Developers:
+- Please keep the current coding style in Ekiga and put comments.
+  Functions descriptions should have 3 fields: DESCRIPTION, BEHAVIOR
+  and PRE.  PRE means the set of conditions on the parameters to be
+  sure that the function works.
+- About gconf: All notifiers and all gconf_client_notify_add must be
+  in config.cpp.  The callback that updates the gconf cache must be
+  located in the file containing the widget associated to the
+  callback.  Some general callbacks for toggles, entries, option menus
+  are located in gconf.cpp.
+- Options: Ekiga follows the "Instant Apply" model.
+- The way to include things is the following: include the Ekiga
+  headers before the others.  All the .h files should contain #include
+  "common.h" as first include because it will itself include a ptlib
+  file containing compilation flags required to have a well-working
+  Ekiga.  The .h corresponding to the .cpp file must be included
+  before the other includes.  Libraries headers includes must follow
+  the application headers includes.  ../config.h must be included
+  before the rest in all .cpp files.
\ No newline at end of file

Modified: trunk/ekiga.schemas.in.in
==============================================================================
--- trunk/ekiga.schemas.in.in	(original)
+++ trunk/ekiga.schemas.in.in	Fri Feb 27 16:00:37 2009
@@ -74,7 +74,7 @@
       <default>0</default>
       <locale name="C">
 	<short>Video preview</short>
-	<long>Video preview</long>
+ 	<long>Display images from your camera device</long>
       </locale>
     </schema>
     <schema>

Modified: trunk/src/ekiga-config-tool.in
==============================================================================
--- trunk/src/ekiga-config-tool.in	(original)
+++ trunk/src/ekiga-config-tool.in	Fri Feb 27 16:00:37 2009
@@ -71,8 +71,8 @@
 
 	$GETTEXT "Removing schemas"; echo
 	SOURCE=`echo $SOURCE | sed "s/xml:://"`
-	SCHEMAS=$SOURCE/schemas/apps/ekiga
-	SOURCE=$SOURCE/apps/ekiga
+	SCHEMAS=$SOURCE/schemas/apps/@PACKAGE_NAME@
+	SOURCE=$SOURCE/apps/@PACKAGE_NAME@
 	echo $SCHEMAS
 	echo $SOURCE
 	rm -rf $SOURCE
@@ -96,7 +96,7 @@
 
 	$GETTEXT "Installing schemas"; echo
 	GCONF_CONFIG_SOURCE=$SOURCE  $GCONFTOOL \
-	--makefile-install-rule $SYSCONFDIR/gconf/schemas/ekiga.schemas
+	--makefile-install-rule $SYSCONFDIR/gconf/schemas/@PACKAGE_NAME  schemas
     fi
 }
 
@@ -120,7 +120,7 @@
         fixgconfperm;
         ;;
   *)
-        $GETTEXT "Usage:  ekiga-config-tool OPTION"; echo
+        $GETTEXT "Usage:  @PACKAGE_NAME -config-tool OPTION"; echo
 	$GETTEXT "Fixes problems with the Ekiga settings"; echo; echo
 	$GETTEXT "  --clean                remove all user settings"; echo
 	$GETTEXT "  --install-schemas      install schemas with default settings (run as root)"; echo