This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gokdrive.
commit ea12da35186001da945bd2df14fbee3fb6c0952f
Author: Mihai Moldovan <io...@ionic.de>
Date: Tue Sep 12 13:22:55 2023 +0200
x2gokdriveremote.c: more typo fixes.
---
debian/changelog | 4 +++
x2gokdriveremote.c | 102 ++++++++++++++++++++++++++---------------------------
2 files changed, 55 insertions(+), 51 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6bde8cc..cfbf21e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ x2gokdrive (0.0.0.2-0x2go1) UNRELEASED; urgency=medium
+ Unapply patches from patches.xorg/<version>/ directory before
re-applying.
Also remove quilt's .pc/ patch tracking directory before applying
patches.
+ [ Mihai Moldovan ]
+ * New upstream version (0.0.0.2):
+ - x2gokdriveremote.c: more typo fixes.
+
-- X2Go Release Manager <git-ad...@x2go.org> Fri, 09 Jun 2023 20:34:58 +0200
x2gokdrive (0.0.0.1-0x2go1) unstable; urgency=medium
diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c
index ace8ddf..fdbf662 100644
--- a/x2gokdriveremote.c
+++ b/x2gokdriveremote.c
@@ -118,7 +118,7 @@ void restartTimerOnInit(void)
{
if(remoteInitialized)
{
- EPHYR_DBG("check timer");
+ EPHYR_DBG("checking timer");
if(remoteVars.checkConnectionTimer)
{
EPHYR_DBG("restarting timer");
@@ -675,7 +675,7 @@ int send_deleted_cursors(void)
{
*((uint32_t*)list+i)=remoteVars.first_deleted_cursor->serialNumber;
-// EPHYR_DBG("delete cursord %d",first_deleted_cursor->serialNumber);
+// EPHYR_DBG("deleting cursor %d",first_deleted_cursor->serialNumber);
elem=remoteVars.first_deleted_cursor;
remoteVars.first_deleted_cursor=elem->next;
free(elem);
@@ -684,7 +684,7 @@ int send_deleted_cursors(void)
remoteVars.last_deleted_cursor=0l;
-// EPHYR_DBG("Sending list from %d elements", deletedcursor_list_size);
+// EPHYR_DBG("Sending list of %d elements", deletedcursor_list_size);
ln=remote_write_socket(remoteVars.clientsock_tcp,buffer,56);
while(sent<length)
{
@@ -914,7 +914,7 @@ int32_t checkScrollUp(struct cache_elem* source, struct
cache_elem* dest)
}
if(width<2)
{
-// EPHYR_DBG("DST too small(w), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
+// EPHYR_DBG("DST too small (w), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
return -1;
}
@@ -924,7 +924,7 @@ int32_t checkScrollUp(struct cache_elem* source, struct
cache_elem* dest)
}
if(height<2)
{
-// EPHYR_DBG("DST too small(h), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
+// EPHYR_DBG("DST too small (h), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
return -1;
}
@@ -937,7 +937,7 @@ int32_t checkScrollUp(struct cache_elem* source, struct
cache_elem* dest)
continue;
if(shift)
{
-// EPHYR_DBG("Shift %d, Cursor is matched!\n",shift);
+// EPHYR_DBG("Shift %d, cursor matched!\n",shift);
return shift;
}
}
@@ -964,7 +964,7 @@ int32_t checkScrollDown(struct cache_elem* source, struct
cache_elem* dest)
}
if(width<2)
{
-// EPHYR_DBG("DST too small(w), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
+// EPHYR_DBG("DST too small (w), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
return 1;
}
@@ -974,7 +974,7 @@ int32_t checkScrollDown(struct cache_elem* source, struct
cache_elem* dest)
}
if(height<2)
{
-// EPHYR_DBG("DST too small(h), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
+// EPHYR_DBG("DST too small (h), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
return 1;
}
@@ -983,7 +983,7 @@ int32_t checkScrollDown(struct cache_elem* source, struct
cache_elem* dest)
if(!checkShiftedRegion( source, dest, x, y, width, height, 0,shift))
continue;
if(shift)
-// EPHYR_DBG("Shift %d, Cursor is matched!\n",shift);
+// EPHYR_DBG("Shift %d, cursor matched!\n",shift);
return shift;
}
return 1;
@@ -1007,7 +1007,7 @@ int32_t checkScrollRight(struct cache_elem* source,
struct cache_elem* dest)
}
if(height<2)
{
-// EPHYR_DBG("DST too small(d), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
+// EPHYR_DBG("DST too small (d), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
return -1;
}
@@ -1017,7 +1017,7 @@ int32_t checkScrollRight(struct cache_elem* source,
struct cache_elem* dest)
}
if(width<2)
{
-// EPHYR_DBG("DST too small(w), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
+// EPHYR_DBG("DST too small (w), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
return -1;
}
@@ -1030,7 +1030,7 @@ int32_t checkScrollRight(struct cache_elem* source,
struct cache_elem* dest)
continue;
if(shift)
{
-// EPHYR_DBG("Shift %d, Cursor is matched!\n",shift);
+// EPHYR_DBG("Shift %d, cursor matched!\n",shift);
return shift;
}
}
@@ -1055,7 +1055,7 @@ int32_t checkScrollLeft(struct cache_elem* source, struct
cache_elem* dest)
}
if(height<2)
{
-// EPHYR_DBG("DST too small(d), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
+// EPHYR_DBG("DST too small (d), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
return 1;
}
@@ -1065,7 +1065,7 @@ int32_t checkScrollLeft(struct cache_elem* source, struct
cache_elem* dest)
}
if(width<2)
{
-// EPHYR_DBG("DST too small(w), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
+// EPHYR_DBG("DST too small (w), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
return 1;
}
@@ -1077,7 +1077,7 @@ int32_t checkScrollLeft(struct cache_elem* source, struct
cache_elem* dest)
continue;
if(shift)
{
-// EPHYR_DBG("Shift %d, Cursor is matched!\n",shift);
+// EPHYR_DBG("Shift %d, cursor matched!\n",shift);
return shift;
}
}
@@ -1249,7 +1249,7 @@ BOOL checkEquality(struct cache_elem* src, struct
cache_elem* dst,
}
}
- loop_exit_2:;
+ loop_exit_2:
// EPHYR_DBG("top_right %dx%d",right_x,top_y);
@@ -1293,7 +1293,7 @@ BOOL checkEquality(struct cache_elem* src, struct
cache_elem* dst,
}
}
- loop_exit_3:;
+ loop_exit_3:
common_rect->size.width=right_x-left_x+1;
common_rect->size.height=down_y-top_y+1;
@@ -1335,7 +1335,7 @@ BOOL checkMovedContent(struct cache_elem* source, struct
cache_elem* dest, int32
}
if(height<2)
{
-// EPHYR_DBG("DST too small(d), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
+// EPHYR_DBG("DST too small (d), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
return FALSE;
}
@@ -1345,7 +1345,7 @@ BOOL checkMovedContent(struct cache_elem* source, struct
cache_elem* dest, int32
}
if(width<2)
{
-// EPHYR_DBG("DST too small(w), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
+// EPHYR_DBG("DST too small (w), keep checking %d %d %d %d",
source->width, source->height, dest->width, dest->height);
return FALSE;
}
@@ -1809,7 +1809,7 @@ void *send_frame_thread (void *threadid)
}
break;
default:
- EPHYR_DBG("Error is occurred in pthread_cond_timedwait");
+ EPHYR_DBG("Error has occurred in pthread_cond_timedwait");
ms_to_wait=100*1000; //reset timer
break;
}
@@ -2823,7 +2823,7 @@ void client_win_change(char* buff)
pSib=remote_find_window_on_screen_by_id(newSibId,
remoteVars.ephyrScreen->pScreen->root);
if(!pSib)
{
- EPHYR_DBG("New Sibling with ID 0x%X not found on current screen,
Putting below all siblings",newSibId);
+ EPHYR_DBG("New Sibling with ID 0x%X not found on current screen,
putting below all siblings",newSibId);
}
}
w = pWin->drawable.width;
@@ -2865,7 +2865,7 @@ void client_win_change(char* buff)
rw=remote_find_window(pWin);
if(!rw)
{
- EPHYR_DBG("Error!!!! window %p not found in list of ext windows",pWin);
+ EPHYR_DBG("Error!!!! Window %p not found in list of ext windows",pWin);
pthread_mutex_unlock(&remoteVars.sendqueue_mutex);
return;
}
@@ -2914,7 +2914,7 @@ void client_win_change(char* buff)
}
if(restack)
{
-// EPHYR_DBG("Client request to move : %p on top of %p",pWin, pSib);
+// EPHYR_DBG("Client request to move: %p on top of %p",pWin, pSib);
ReflectStackChange(pWin, pSib, VTOther);
}
if(rw->hasFocus!=focus)
@@ -3024,7 +3024,7 @@ void serverAcceptNotify(int fd, int ready_sock, void
*data)
remoteVars.clientsock_tcp = accept ( remoteVars.serversock_tcp, (struct
sockaddr *) &remoteVars.tcp_address, &remoteVars.tcp_addrlen);
if (remoteVars.clientsock_tcp <= 0)
{
- EPHYR_DBG( "ACCEPT ERROR OR CANCELD!\n");
+ EPHYR_DBG( "ACCEPT ERROR OR CANCELLED!\n");
return;
}
EPHYR_DBG ("Connection from (%s)...\n", inet_ntoa
(remoteVars.tcp_address.sin_addr));
@@ -3112,7 +3112,7 @@ void serverAcceptNotify(int fd, int ready_sock, void
*data)
ret = pthread_create(&remoteVars.send_thread_id, NULL, send_frame_thread,
(void *)remoteVars.send_thread_id);
if (ret)
{
- EPHYR_DBG("ERROR; return code from pthread_create() is %d\n", ret);
+ EPHYR_DBG("ERROR; return code of pthread_create() is %d\n", ret);
terminateServer(-1);
}
}
@@ -3145,7 +3145,7 @@ open_udp_socket(void)
while (1)
{
- EPHYR_DBG("Trying to listen UDP port %d", remoteVars.udpPort);
+ EPHYR_DBG("Trying to listen on UDP port %d", remoteVars.udpPort);
remoteVars.udp_address.sin_port = htons (remoteVars.udpPort);
if (bind ( remoteVars.sock_udp,
(struct sockaddr *) &remoteVars.udp_address,
@@ -3212,7 +3212,7 @@ open_udp_socket(void)
}
else
{
- EPHYR_DBG("No incoming UDP connection in 5 seconds");
+ EPHYR_DBG("No incoming UDP connection in 3 seconds");
}
//no connection is established, closing udp socket and sending notification
close_udp_socket();
@@ -3239,7 +3239,7 @@ void open_socket(void)
{
remoteVars.listenPort=DEFAULT_PORT;
}
- EPHYR_DBG("Listen on port %d", remoteVars.listenPort);
+ EPHYR_DBG("Listening on port %d", remoteVars.listenPort);
remoteVars.tcp_address.sin_port = htons (remoteVars.listenPort);
if (bind ( remoteVars.serversock_tcp,
(struct sockaddr *) &remoteVars.tcp_address,
@@ -3254,7 +3254,7 @@ void open_socket(void)
#if XORG_VERSION_CURRENT >= 11900000
EPHYR_DBG("Set notify FD for server sock: %d",remoteVars.serversock_tcp);
- EPHYR_DBG ("waiting for Client connection\n");
+ EPHYR_DBG ("waiting for client connection\n");
SetNotifyFd(remoteVars.serversock_tcp, serverAcceptNotify, X_NOTIFY_READ,
NULL);
#endif // XORG_VERSION_CURRENT
@@ -3295,7 +3295,7 @@ void terminateServer(int exitStatus)
{
free(remoteVars.main_img);
free(remoteVars.second_buffer);
- EPHYR_DBG("free screen regions");
+ EPHYR_DBG("freeing screen regions");
free(remoteVars.screen_regions);
}
@@ -3309,7 +3309,7 @@ void terminateServer(int exitStatus)
free(remoteVars.selstruct.inSelection[1].data);
}
setAgentState(TERMINATED);
- EPHYR_DBG("exit program with status %d", exitStatus);
+ EPHYR_DBG("exiting program with status %d", exitStatus);
GiveUp(SIGTERM);
}
@@ -3317,7 +3317,7 @@ void terminateServer(int exitStatus)
static
void processConfigFileSetting(char* key, char* value)
{
-// EPHYR_DBG("process setting %s %s", key, value);
+// EPHYR_DBG("processing setting \"%s\" with value \"%s\"", key, value);
if(!strcmp(key, "state"))
{
strncpy(remoteVars.stateFile, value, 255);
@@ -3332,17 +3332,17 @@ void processConfigFileSetting(char* key, char* value)
if(strncmp(value+strlen(value)-5,"png",3) ==0)
{
remoteVars.compression=PNG;
- EPHYR_DBG("Using PNG Compression");
+ EPHYR_DBG("Using PNG compression");
}
else
{
remoteVars.compression=JPEG;
- EPHYR_DBG("Using JPEG Compression");
+ EPHYR_DBG("Using JPEG compression");
}
remoteVars.initialJpegQuality=(quality-'0')*10+9;
if(remoteVars.initialJpegQuality > JPG_QUALITY)
{
- //x2goclient can set by default quality 90, but it doesn't
really makes sence, Maybe we could think about overreiding it in the future
+ //x2goclient can set by default quality 90, but it doesn't
really make sense. Maybe we could think about overriding it in the future
EPHYR_DBG("JPEG quality %d is requested, x2gokdrive will
override it to %d",remoteVars.initialJpegQuality, JPG_QUALITY);
remoteVars.initialJpegQuality=JPG_QUALITY;
}
@@ -3369,7 +3369,7 @@ void processConfigFileSetting(char* key, char* value)
else if(!strcmp(key, "listen_udp"))
{
sscanf(value, "%d",&remoteVars.udpPort);
- EPHYR_DBG("listen %d", remoteVars.udpPort);
+ EPHYR_DBG("listen_udp %d", remoteVars.udpPort);
}
else if(!strcmp(key, "clipboard"))
{
@@ -3489,7 +3489,7 @@ remote_init(void)
remoteVars.optionsFile[j++]=displayVar[i++];
}
remoteVars.optionsFile[j]='\0';
- EPHYR_DBG("read options from %s",remoteVars.optionsFile);
+ EPHYR_DBG("reading options from %s",remoteVars.optionsFile);
readOptionsFromFile();
}
}
@@ -3896,7 +3896,7 @@ void initFrameRegions(struct cache_elem* frame)
pthread_mutex_lock(&remoteVars.sendqueue_mutex);
if(best_match && frame->source != best_match)
{
-// EPHYR_DBG("Have best mutch but not common region");
+// EPHYR_DBG("Have best match but no common region");
best_match->busy-=1;
}
@@ -4247,7 +4247,7 @@ void remote_check_window(WindowPtr win)
}
else if( at[0] ==MakeAtom("_NET_WM_WINDOW_TYPE_DND",
strlen("_NET_WM_WINDOW_TYPE_DND"),FALSE))
{
- //drag window has the similair properties as utility
window
+ //drag windows have similar properties to utility
windows
// EPHYR_DBG("Drag Window, WINDOW Type: %s, my ID
0x%X",NameForAtom( at[0] ), win->drawable.id);
winType=WINDOW_TYPE_UTILITY;
}
@@ -4385,7 +4385,7 @@ void remote_check_window(WindowPtr win)
}
if(rwin->visibility!=win->visibility)
{
-// EPHYR_DBG("Visibilty changed for 0x%X from %d to %d", rwin->id,
rwin->visibility, win->visibility);
+// EPHYR_DBG("Visibility changed for 0x%X from %d to %d",
rwin->id, rwin->visibility, win->visibility);
rwin->state=CHANGED;
}
if(rwin->hasFocus!=hasFocus)
@@ -4688,8 +4688,8 @@ remote_paint_rect(KdScreenInfo *screen,
dirtyy_min=dy+height;
/*
- * OK, here we assuming that XSERVERBPP is 4. If not, we'll have
troubles
- * but it should work faster like this
+ * OK, here we are assuming that XSERVERBPP is 4. If not, we'll have
+ * trouble but it should work faster like this
*/
pthread_mutex_lock(&remoteVars.mainimg_mutex);
@@ -4770,14 +4770,14 @@ remote_paint_rect(KdScreenInfo *screen,
if(width<=4 || height<=4)
{
- //rectangle is to small, don't try to split it
+ //rectangle is too small, don't try to split it
noRegions=TRUE;
}
/* check if we can transfer dirty pixels in the smaller region instead
of sending all rectangle
* we are starting from the center of the region and going to it edges
to better process
* the regions where dirty pixels are only on the edges, like windows,
which are only changing
- * the color of frame, but the content is remaing same
+ * the color of frame, but the content is remaining the same
*/
if(!noRegions)
@@ -5038,7 +5038,7 @@ remote_screen_init(KdScreenInfo *screen,
}
else
{
- EPHYR_DBG("REINSTALL CALLBACKS");
+ EPHYR_DBG("REINSTALLING CALLBACKS");
install_selection_callbacks();
}
@@ -5054,13 +5054,13 @@ remote_screen_init(KdScreenInfo *screen,
free(remoteVars.main_img);
free(remoteVars.screen_regions);
- EPHYR_DBG("FREE DBF");
+ EPHYR_DBG("FREEING DBF");
free(remoteVars.second_buffer);
- EPHYR_DBG("DONE FREE DBF");
+ EPHYR_DBG("DONE FREEING DBF");
}
- EPHYR_DBG("TRYING TO ALLOC MAIN_IMG %d", width*height*XSERVERBPP);
+ EPHYR_DBG("TRYING TO ALLOC MAIN_IMG %d", width*height*XSERVERBPP);
remoteVars.main_img=malloc(width*height*XSERVERBPP);
- EPHYR_DBG("TRYING TO ALLOC DOUBLE BUF %d", width*height*XSERVERBPP);
+ EPHYR_DBG("TRYING TO ALLOC DOUBLE BUF %d", width*height*XSERVERBPP);
remoteVars.second_buffer=malloc(width*height*XSERVERBPP);
remoteVars.reg_horiz=width/SCREEN_REG_WIDTH;
@@ -5272,7 +5272,7 @@ checkClientAlive(OsTimerPtr timer, CARD32 time_card,
void* args)
if(time_diff>=CLIENTALIVE_TIMEOUT/1000)
{
- EPHYR_DBG("no data from client since %d seconds, diconnecting...",
(int)time_diff);
+ EPHYR_DBG("no data from client since %d seconds, disconnecting...",
(int)time_diff);
disconnect_client();
return 0;
}
@@ -5328,7 +5328,7 @@ resend_frame(uint32_t crc)
unsigned char* packet;
uint32_t size;
struct cache_elem* frame=find_cache_element(crc);
- EPHYR_DBG("Client asks to resend frame from cash with crc %x",crc);
+ EPHYR_DBG("Client asks to resend frame from cache with crc %x",crc);
if(remoteVars.send_frames_over_udp)
return;
pthread_mutex_lock(&remoteVars.sendqueue_mutex);
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/x2gokdrive.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
