[asterisk-commits] oej: branch oej/multiparking r52951 - in /team/oej/multiparking: ./ res/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Jan 30 12:24:59 2007
New Revision: 52951

URL: http://svn.digium.com/view/asterisk?view=rev&rev=52951
Log:
Reset automerge

Modified:
    team/oej/multiparking/Makefile
    team/oej/multiparking/res/res_features.c

Modified: team/oej/multiparking/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/Makefile?view=diff&rev=52951&r1=52950&r2=52951
==============================================================================
--- team/oej/multiparking/Makefile (original)
+++ team/oej/multiparking/Makefile Tue Jan 30 12:24:59 2007
@@ -392,6 +392,9 @@
 
 menuselect.makeopts menuselect.makedeps: menuselect/menuselect makeopts.xml
 	menuselect/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts
+
+menuselect.makedeps: menuselect/menuselect makeopts.xml
+	@menuselect/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@
 
 #ifneq ($(wildcard tags),)
 ctags: tags

Modified: team/oej/multiparking/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/res/res_features.c?view=diff&rev=52951&r1=52950&r2=52951
==============================================================================
--- team/oej/multiparking/res/res_features.c (original)
+++ team/oej/multiparking/res/res_features.c Tue Jan 30 12:24:59 2007
@@ -81,6 +81,7 @@
 static int parkaddhints = 0;                               /*!< Add parking hints automatically */
 static int parkingtime = DEFAULT_PARK_TIME;                /*!< No more than 45 seconds parked before you do something with them */
 static char pickup_ext[AST_MAX_EXTENSION];                 /*!< Call pickup extension */
+static int parkaddhints = 0;                               /*!< Add parking hints automatically */
 
 /* XXX This is used in many modules, so for now it's the same for all parking lots */
 static char parking_ext[AST_MAX_EXTENSION] = "700";	/*!< Extension you type to park the call */
@@ -353,6 +354,7 @@
 	int i, x = -1, parking_range;
 	struct ast_context *con;
 	const char *parkinglotname;
+	const char *parkingexten;
 	
 	parkinglotname = findparkinglotname(peer);
 
@@ -436,7 +438,6 @@
 	pu->priority = chan->macropriority ? chan->macropriority : chan->priority;
 	pu->next = parkinglot->occupiedlots;
 	parkinglot->occupiedlots = pu;
-
 
 	/* If parking a channel directly, don't quiet yet get parking running on it */
 	if (peer == chan) 
@@ -1572,6 +1573,7 @@
 
 		ast_mutex_lock(&parking_lock);
 		pl = NULL;
+
 		/* We need to do this for every parking lot */
 		AST_LIST_TRAVERSE(&parkinglots, curlot, list) {
 			pu = curlot->occupiedlots;
@@ -2185,8 +2187,6 @@
 	return res;
 }
 
-<<<<<<< .working
-<<<<<<< .working
 /*! \brief Allocate parking lot structure */
 static struct ast_parkinglot *create_parkinglot(char *name)
 {
@@ -2379,8 +2379,6 @@
 					ast_log(LOG_WARNING, "No default parking lot!\n");
 			} else if (!strcasecmp(var->name, "findslot")) {
 				default_parkinglot->parkfindnext = (!strcasecmp(var->value, "next"));
-			} else if (!strcasecmp(var->name, "parkinghints")) {
-				parkaddhints = ast_true(var->value);
 			} else if (!strcasecmp(var->name, "parkinghints")) {
 				parkaddhints = ast_true(var->value);
 			} else if (!strcasecmp(var->name, "adsipark")) {