diff options
| author | roger <roger@FreeBSD.org> | 2001-07-27 21:33:07 +0800 |
|---|---|---|
| committer | roger <roger@FreeBSD.org> | 2001-07-27 21:33:07 +0800 |
| commit | e42f521a5defbd4396d020b5f5f99e184d4520b8 (patch) | |
| tree | 640f30fbf466de428a44944452108565048cf422 /net | |
| parent | 3eca7fd3596c5ac4be75db2a0e8f095467dcf3ab (diff) | |
| download | freebsd-ports-gnome-e42f521a5defbd4396d020b5f5f99e184d4520b8.tar.gz freebsd-ports-gnome-e42f521a5defbd4396d020b5f5f99e184d4520b8.tar.zst freebsd-ports-gnome-e42f521a5defbd4396d020b5f5f99e184d4520b8.zip | |
fix a bug where ring_thread had not been initialised.
Diffstat (limited to 'net')
| -rw-r--r-- | net/ekiga/files/patch-af | 35 | ||||
| -rw-r--r-- | net/gnomemeeting/files/patch-af | 35 | ||||
| -rw-r--r-- | net/gnomemeeting2/files/patch-af | 35 |
3 files changed, 96 insertions, 9 deletions
diff --git a/net/ekiga/files/patch-af b/net/ekiga/files/patch-af index fc00dddf9f0f..612f4fd0c440 100644 --- a/net/ekiga/files/patch-af +++ b/net/ekiga/files/patch-af @@ -1,5 +1,34 @@ -*** src/endpoint.cpp.orig Thu Jul 26 11:45:30 2001 ---- src/endpoint.cpp Thu Jul 26 11:45:42 2001 +*** src/endpoint.cpp.orig Sun Jun 17 22:37:03 2001 +--- src/endpoint.cpp Fri Jul 27 14:27:01 2001 +*************** GMH323EndPoint::GMH323EndPoint (GM_windo +*** 83,88 **** +--- 83,90 ---- + + SetCurrentConnection (NULL); + SetCallingState (0); ++ ++ ring_thread = NULL; + } + + +*************** void GMH323EndPoint::OnConnectionEstabli +*** 525,531 **** + applet_widget_set_tooltip (APPLET_WIDGET (gw->applet), NULL); + gdk_threads_leave (); + +! pthread_cancel (ring_thread); + + calling_state = 2; + +--- 527,534 ---- + applet_widget_set_tooltip (APPLET_WIDGET (gw->applet), NULL); + gdk_threads_leave (); + +! if (ring_thread != NULL) +! pthread_cancel (ring_thread); + + calling_state = 2; + *************** BOOL GMH323EndPoint::OpenVideoDevice (H3 *** 700,706 **** codec.SetVideoDevice("/dev/video"); @@ -9,7 +38,7 @@ codec.SetBackgroundFill(opts->tr_ub); codec.SetVideoFormat(opts->video_format); ---- 700,706 ---- +--- 703,709 ---- codec.SetVideoDevice("/dev/video"); codec.SetVideoInput (0); codec.SetTxQualityLevel (opts->tr_vq); diff --git a/net/gnomemeeting/files/patch-af b/net/gnomemeeting/files/patch-af index fc00dddf9f0f..612f4fd0c440 100644 --- a/net/gnomemeeting/files/patch-af +++ b/net/gnomemeeting/files/patch-af @@ -1,5 +1,34 @@ -*** src/endpoint.cpp.orig Thu Jul 26 11:45:30 2001 ---- src/endpoint.cpp Thu Jul 26 11:45:42 2001 +*** src/endpoint.cpp.orig Sun Jun 17 22:37:03 2001 +--- src/endpoint.cpp Fri Jul 27 14:27:01 2001 +*************** GMH323EndPoint::GMH323EndPoint (GM_windo +*** 83,88 **** +--- 83,90 ---- + + SetCurrentConnection (NULL); + SetCallingState (0); ++ ++ ring_thread = NULL; + } + + +*************** void GMH323EndPoint::OnConnectionEstabli +*** 525,531 **** + applet_widget_set_tooltip (APPLET_WIDGET (gw->applet), NULL); + gdk_threads_leave (); + +! pthread_cancel (ring_thread); + + calling_state = 2; + +--- 527,534 ---- + applet_widget_set_tooltip (APPLET_WIDGET (gw->applet), NULL); + gdk_threads_leave (); + +! if (ring_thread != NULL) +! pthread_cancel (ring_thread); + + calling_state = 2; + *************** BOOL GMH323EndPoint::OpenVideoDevice (H3 *** 700,706 **** codec.SetVideoDevice("/dev/video"); @@ -9,7 +38,7 @@ codec.SetBackgroundFill(opts->tr_ub); codec.SetVideoFormat(opts->video_format); ---- 700,706 ---- +--- 703,709 ---- codec.SetVideoDevice("/dev/video"); codec.SetVideoInput (0); codec.SetTxQualityLevel (opts->tr_vq); diff --git a/net/gnomemeeting2/files/patch-af b/net/gnomemeeting2/files/patch-af index fc00dddf9f0f..612f4fd0c440 100644 --- a/net/gnomemeeting2/files/patch-af +++ b/net/gnomemeeting2/files/patch-af @@ -1,5 +1,34 @@ -*** src/endpoint.cpp.orig Thu Jul 26 11:45:30 2001 ---- src/endpoint.cpp Thu Jul 26 11:45:42 2001 +*** src/endpoint.cpp.orig Sun Jun 17 22:37:03 2001 +--- src/endpoint.cpp Fri Jul 27 14:27:01 2001 +*************** GMH323EndPoint::GMH323EndPoint (GM_windo +*** 83,88 **** +--- 83,90 ---- + + SetCurrentConnection (NULL); + SetCallingState (0); ++ ++ ring_thread = NULL; + } + + +*************** void GMH323EndPoint::OnConnectionEstabli +*** 525,531 **** + applet_widget_set_tooltip (APPLET_WIDGET (gw->applet), NULL); + gdk_threads_leave (); + +! pthread_cancel (ring_thread); + + calling_state = 2; + +--- 527,534 ---- + applet_widget_set_tooltip (APPLET_WIDGET (gw->applet), NULL); + gdk_threads_leave (); + +! if (ring_thread != NULL) +! pthread_cancel (ring_thread); + + calling_state = 2; + *************** BOOL GMH323EndPoint::OpenVideoDevice (H3 *** 700,706 **** codec.SetVideoDevice("/dev/video"); @@ -9,7 +38,7 @@ codec.SetBackgroundFill(opts->tr_ub); codec.SetVideoFormat(opts->video_format); ---- 700,706 ---- +--- 703,709 ---- codec.SetVideoDevice("/dev/video"); codec.SetVideoInput (0); codec.SetTxQualityLevel (opts->tr_vq); |