From 52af65580054899b808f36f2a7217b55ddf9d9eb Mon Sep 17 00:00:00 2001
From: jsorg71 <jsorg71>
Date: Sun, 6 Sep 2009 01:57:05 +0000
Subject: use type when looking for a session

---
 sesman/scp_v0.c  | 2 +-
 sesman/session.c | 5 +++--
 sesman/session.h | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sesman/scp_v0.c b/sesman/scp_v0.c
index ddd5f30f..5bc97113 100644
--- a/sesman/scp_v0.c
+++ b/sesman/scp_v0.c
@@ -41,7 +41,7 @@ scp_v0_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
 
   if (data)
   {
-    s_item = session_get_bydata(s->username, s->width, s->height, s->bpp);
+    s_item = session_get_bydata(s->username, s->width, s->height, s->bpp, s->type);
     if (s_item != 0)
     {
       display = s_item->display;
diff --git a/sesman/session.c b/sesman/session.c
index d91485ae..474b28e2 100644
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -51,7 +51,7 @@ static int g_sync_result;
 
 /******************************************************************************/
 struct session_item* DEFAULT_CC
-session_get_bydata(char* name, int width, int height, int bpp)
+session_get_bydata(char* name, int width, int height, int bpp, int type)
 {
   struct session_chain* tmp;
 
@@ -65,7 +65,8 @@ session_get_bydata(char* name, int width, int height, int bpp)
     if (g_strncmp(name, tmp->item->name, 255) == 0 &&
         tmp->item->width == width &&
         tmp->item->height == height &&
-        tmp->item->bpp == bpp)
+        tmp->item->bpp == bpp &&
+        tmp->item->type == type)
     {
       /*THREAD-FIX release chain lock */
       lock_chain_release();
diff --git a/sesman/session.h b/sesman/session.h
index adc4b083..d4043146 100644
--- a/sesman/session.h
+++ b/sesman/session.h
@@ -90,9 +90,9 @@ struct session_chain
  *
  */
 struct session_item* DEFAULT_CC
-session_get_bydata(char* name, int width, int height, int bpp);
+session_get_bydata(char* name, int width, int height, int bpp, int type);
 #ifndef session_find_item
-  #define session_find_item(a, b, c, d) session_get_bydata(a, b, c, d);
+  #define session_find_item(a, b, c, d, e) session_get_bydata(a, b, c, d, e);
 #endif
 
 /**
-- 
cgit v1.2.1