D-Bus object path and interface name should be fixed, just the service

name can change.

D-Bus object path and interface name should be fixed, just the service
name can change.
Perry Werneck
1 parent b36058ee
Showing 1 changed file with 6 additions and 31 deletions Show diff stats
src/libpw3270cpp/remote.cc
@@ -443,37 +443,6 @@
 			// And last, the project info
 			name.append(intf);
  
-			/*
-			size_t	  bytes = strlen(buffer);
-			char 	* ptr	= buffer;
-			int 	  val;
-
-			sz -= 2;
-
-			// First uses the object ID
-			val = this->sequence;
-			while(bytes < sz && val > 0)
-			{
-				*(ptr++) = 'a'+(val % 25);
-				val /= 25;
-				bytes++;
-			}
-			*(ptr++) = '.';
-
-			// Then the PID
-			val = (int) getpid();
-			while(bytes < sz && val > 0)
-			{
-				*(ptr++) = 'a'+(val % 25);
-				val /= 25;
-				bytes++;
-			}
-			*(ptr++) = '.';
-
-			// And last, the project info
-			strncpy(ptr,intf,sz);
-
-			*/
 			trace("Busname=\"%s\" sequence=%d this=%p",name.c_str(),sequence,this);
  
 			return name.c_str();
@@ -665,6 +634,11 @@
 				strncat(dest,".",sz);
 				strncat(dest,ptr,sz);
  
+				// Path and interface always use the same name.
+				path = strdup("/br/com/bb/pw3270");
+				intf = strdup("br.com.bb.pw3270");
+
+				/*
 				// Build path
 				sz		= strlen(str)+strlen(prefix_path);
 				path	= (char *) malloc(sz+1);
@@ -676,6 +650,7 @@
 				intf	= (char *) malloc(sz+1);
 				strncpy(intf,prefix_dest,sz);
 				strncat(intf,str,sz);
+				*/
  
 			}
 			else
...	...	@@ -443,37 +443,6 @@
443	443	// And last, the project info
444	444	name.append(intf);
445	445
446		- /*
447		- size_t bytes = strlen(buffer);
448		- char * ptr = buffer;
449		- int val;
450		-
451		- sz -= 2;
452		-
453		- // First uses the object ID
454		- val = this->sequence;
455		- while(bytes < sz && val > 0)
456		- {
457		- *(ptr++) = 'a'+(val % 25);
458		- val /= 25;
459		- bytes++;
460		- }
461		- *(ptr++) = '.';
462		-
463		- // Then the PID
464		- val = (int) getpid();
465		- while(bytes < sz && val > 0)
466		- {
467		- *(ptr++) = 'a'+(val % 25);
468		- val /= 25;
469		- bytes++;
470		- }
471		- *(ptr++) = '.';
472		-
473		- // And last, the project info
474		- strncpy(ptr,intf,sz);
475		-
476		- */
477	446	trace("Busname=\"%s\" sequence=%d this=%p",name.c_str(),sequence,this);
478	447
479	448	return name.c_str();
...	...	@@ -665,6 +634,11 @@
665	634	strncat(dest,".",sz);
666	635	strncat(dest,ptr,sz);
667	636
	637	+ // Path and interface always use the same name.
	638	+ path = strdup("/br/com/bb/pw3270");
	639	+ intf = strdup("br.com.bb.pw3270");
	640	+
	641	+ /*
668	642	// Build path
669	643	sz = strlen(str)+strlen(prefix_path);
670	644	path = (char *) malloc(sz+1);
...	...	@@ -676,6 +650,7 @@
676	650	intf = (char *) malloc(sz+1);
677	651	strncpy(intf,prefix_dest,sz);
678	652	strncat(intf,str,sz);
	653	+ */
679	654
680	655	}
681	656	else
...	...