|
|
commit 5f1fc91746cfe4d287c46413a20d2fc90da8e86c
Author: Dan Winship <danw@xxxxxxxxx> Date: Sun Aug 7 11:52:42 2011 -0400 gnutls: fix a crash with a NULL GError GTlsClientConnectionGnutls's g_tls_connection_handshake() implementation would crash if you passed NULL for the GError** argument. tls/gnutls/gtlsclientconnection-gnutls.c | 7 +++++-- tls/gnutls/gtlsconnection-gnutls.c | 2 +- tls/gnutls/gtlsconnection-gnutls.h | 1 + tls/gnutls/gtlsserverconnection-gnutls.c | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) --- diff --git a/tls/gnutls/gtlsclientconnection-gnutls.c b/tls/gnutls/gtlsclientconnection-gnutls.c index b6fc2fb..aec001c 100644 --- a/tls/gnutls/gtlsclientconnection-gnutls.c +++ b/tls/gnutls/gtlsclientconnection-gnutls.c @@ -56,6 +56,7 @@ static gboolean g_tls_client_connection_gnutls_verify_peer (GTlsConnectionG GTlsCertificate *peer_certificate, GTlsCertificateFlags *errors); static void g_tls_client_connection_gnutls_finish_handshake (GTlsConnectionGnutls *conn, + gboolean success, GError **inout_error); static void g_tls_client_connection_gnutls_client_connection_interface_init (GTlsClientConnectionInterface *iface); @@ -363,11 +364,13 @@ g_tls_client_connection_gnutls_verify_peer (GTlsConnectionGnutls *conn_gnutls, static void g_tls_client_connection_gnutls_finish_handshake (GTlsConnectionGnutls *conn, + gboolean success, GError **inout_error) { GTlsClientConnectionGnutls *gnutls = G_TLS_CLIENT_CONNECTION_GNUTLS (conn); - if (g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) && + if (inout_error && + g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) && gnutls->priv->cert_requested) { g_clear_error (inout_error); @@ -379,7 +382,7 @@ g_tls_client_connection_gnutls_finish_handshake (GTlsConnectionGnutls *conn, { gnutls_datum session_data; - if (!*inout_error && + if (success && gnutls_session_get_data2 (g_tls_connection_gnutls_get_session (conn), &session_data) == 0) { diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c index da3f76e..71c8a2f 100644 --- a/tls/gnutls/gtlsconnection-gnutls.c +++ b/tls/gnutls/gtlsconnection-gnutls.c @@ -917,7 +917,7 @@ handshake_internal (GTlsConnectionGnutls *gnutls, } } - G_TLS_CONNECTION_GNUTLS_GET_CLASS (gnutls)->finish_handshake (gnutls, error); + G_TLS_CONNECTION_GNUTLS_GET_CLASS (gnutls)->finish_handshake (gnutls, ret == 0, error); if (ret == 0) { diff --git a/tls/gnutls/gtlsconnection-gnutls.h b/tls/gnutls/gtlsconnection-gnutls.h index fff49af..dd061c4 100644 --- a/tls/gnutls/gtlsconnection-gnutls.h +++ b/tls/gnutls/gtlsconnection-gnutls.h @@ -38,6 +38,7 @@ struct _GTlsConnectionGnutlsClass GTlsCertificate *peer_certificate, GTlsCertificateFlags *errors); void (*finish_handshake) (GTlsConnectionGnutls *gnutls, + gboolean success, GError **inout_error); }; diff --git a/tls/gnutls/gtlsserverconnection-gnutls.c b/tls/gnutls/gtlsserverconnection-gnutls.c index b9565ae..2b688f0 100644 --- a/tls/gnutls/gtlsserverconnection-gnutls.c +++ b/tls/gnutls/gtlsserverconnection-gnutls.c @@ -49,6 +49,7 @@ static gboolean g_tls_server_connection_gnutls_verify_peer (GTlsConnectionG GTlsCertificate *peer_certificate, GTlsCertificateFlags *errors); static void g_tls_server_connection_gnutls_finish_handshake (GTlsConnectionGnutls *conn, + gboolean success, GError **inout_error); static void g_tls_server_connection_gnutls_server_connection_interface_init (GTlsServerConnectionInterface *iface); @@ -204,6 +205,7 @@ g_tls_server_connection_gnutls_verify_peer (GTlsConnectionGnutls *gnutls, static void g_tls_server_connection_gnutls_finish_handshake (GTlsConnectionGnutls *gnutls, + gboolean success, GError **inout_error) { } _______________________________________________ commits-list mailing list (read only) http://mail.gnome.org/mailman/listinfo/commits-list Want to limit the commits to a few modules? Go to above URL, log in to edit your options and select the modules ('topics') you want.
vvv Thread at a glance:
Previous Message by Date:[pinpoint] make the fault transition be "fade"commit e5b25449f4e7dd18aa0eae7eb3c180786de8c8d9 Author: Ãyvind KolÃs <pippin@xxxxxxxx> Date: Sun Aug 7 16:14:16 2011 +0100 make the fault transition be "fade" The transition that was in the original pinpoint, with the presentation running down the right hand side and text flying in and out from there was getting old, and anyways has had a regression with clutter changing the distance to the far clipping plane. Fades are simple and nice - and like black will continue being fashionable. pinpoint.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/pinpoint.c b/pinpoint.c index 29fef95..8f69f82 100644 --- a/pinpoint.c +++ b/pinpoint.c @@ -75,7 +75,7 @@ static PinPointPoint pin_default_point = { .shading_color = "black", .shading_opacity = 0.66, - .transition = NULL, + .transition = "fade", .command = NULL, _______________________________________________ commits-list mailing list (read only) http://mail.gnome.org/mailman/listinfo/commits-list Want to limit the commits to a few modules? Go to above URL, log in to edit your options and select the modules ('topics') you want. Next Message by Date:[gcompris/gcomprismusic] Mute feature addedcommit 42c11705c52ae035caa7d6d48225501ae8bf5be3 Author: Karthik Subramanian <itskarthik.s@xxxxxxxxx> Date: Sun Aug 7 21:39:49 2011 +0530 Mute feature added .../resources/singalong/audio-volume-muted.png | Bin 0 -> 26942 bytes src/singalong-activity/singalong.py | 27 +++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) --- diff --git a/src/singalong-activity/resources/singalong/audio-volume-muted.png b/src/singalong-activity/resources/singalong/audio-volume-muted.png new file mode 100644 index 0000000..a999a41 Binary files /dev/null and b/src/singalong-activity/resources/singalong/audio-volume-muted.png differ diff --git a/src/singalong-activity/singalong.py b/src/singalong-activity/singalong.py index 29ea0bc..8ef3e12 100644 --- a/src/singalong-activity/singalong.py +++ b/src/singalong-activity/singalong.py @@ -78,7 +78,7 @@ class Gcompris_singalong: self.mapping = { 'C' : 310, 'D' : 340 , 'E' : 370, 'F' : 400, 'G' : 430, 'A' : 460, 'C3': 490 } self.currentsong = "twinkle" - + self.mute = False self.notecount = 0 self.count = 0 self.delay = 30 @@ -102,7 +102,18 @@ class Gcompris_singalong: height = 60, pixbuf = gcompris.utils.load_pixmap("singalong/ball.svg") ) - + self.mute_button = goocanvas.Image( + parent = self.rootitem, + x = 600, + y = 320, + width = 50, + height = 50, + pixbuf = gcompris.utils.load_pixmap("singalong/audio-volume-muted.png") + ) + + gcompris.utils.item_focus_init(self.mute_button, None) + self.mute_button.connect("button-press-event", self.mute_and_play) + self.play_button = goocanvas.Image( parent = self.rootitem, x = 600, @@ -154,6 +165,8 @@ class Gcompris_singalong: self.lyrics_dataset = self.read_data() self.populate_songs() + + self.songtitle.props.text = self.songs[self.gcomprisBoard.level - 1].title self.play_song() @@ -161,6 +174,12 @@ class Gcompris_singalong: self.count = 0 self.status_timer = self.delay self.play_song() + + def mute_and_play(self, item, event, attr): + if self.mute == False: + self.mute = True + else: + self.mute = False def read_data(self): '''Load the activity data''' @@ -234,7 +253,9 @@ class Gcompris_singalong: self.ball.props.x = int(self.mapping[note]) self.songlyrics.props.text = self.songs[self.gcomprisBoard.level - 1].lyrics[self.count] self.ball.props.visibility = goocanvas.ITEM_VISIBLE - gcompris.sound.play_ogg('singalong/'+note+'.wav') + if self.mute == False: + gcompris.sound.play_ogg('singalong/'+note+'.wav') + # print self.status_timer _______________________________________________ commits-list mailing list (read only) http://mail.gnome.org/mailman/listinfo/commits-list Want to limit the commits to a few modules? Go to above URL, log in to edit your options and select the modules ('topics') you want. Previous Message by Thread:[pinpoint] make the fault transition be "fade"commit e5b25449f4e7dd18aa0eae7eb3c180786de8c8d9 Author: Ãyvind KolÃs <pippin@xxxxxxxx> Date: Sun Aug 7 16:14:16 2011 +0100 make the fault transition be "fade" The transition that was in the original pinpoint, with the presentation running down the right hand side and text flying in and out from there was getting old, and anyways has had a regression with clutter changing the distance to the far clipping plane. Fades are simple and nice - and like black will continue being fashionable. pinpoint.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/pinpoint.c b/pinpoint.c index 29fef95..8f69f82 100644 --- a/pinpoint.c +++ b/pinpoint.c @@ -75,7 +75,7 @@ static PinPointPoint pin_default_point = { .shading_color = "black", .shading_opacity = 0.66, - .transition = NULL, + .transition = "fade", .command = NULL, _______________________________________________ commits-list mailing list (read only) http://mail.gnome.org/mailman/listinfo/commits-list Want to limit the commits to a few modules? Go to above URL, log in to edit your options and select the modules ('topics') you want. Next Message by Thread:[gcompris/gcomprismusic] Mute feature addedcommit 42c11705c52ae035caa7d6d48225501ae8bf5be3 Author: Karthik Subramanian <itskarthik.s@xxxxxxxxx> Date: Sun Aug 7 21:39:49 2011 +0530 Mute feature added .../resources/singalong/audio-volume-muted.png | Bin 0 -> 26942 bytes src/singalong-activity/singalong.py | 27 +++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) --- diff --git a/src/singalong-activity/resources/singalong/audio-volume-muted.png b/src/singalong-activity/resources/singalong/audio-volume-muted.png new file mode 100644 index 0000000..a999a41 Binary files /dev/null and b/src/singalong-activity/resources/singalong/audio-volume-muted.png differ diff --git a/src/singalong-activity/singalong.py b/src/singalong-activity/singalong.py index 29ea0bc..8ef3e12 100644 --- a/src/singalong-activity/singalong.py +++ b/src/singalong-activity/singalong.py @@ -78,7 +78,7 @@ class Gcompris_singalong: self.mapping = { 'C' : 310, 'D' : 340 , 'E' : 370, 'F' : 400, 'G' : 430, 'A' : 460, 'C3': 490 } self.currentsong = "twinkle" - + self.mute = False self.notecount = 0 self.count = 0 self.delay = 30 @@ -102,7 +102,18 @@ class Gcompris_singalong: height = 60, pixbuf = gcompris.utils.load_pixmap("singalong/ball.svg") ) - + self.mute_button = goocanvas.Image( + parent = self.rootitem, + x = 600, + y = 320, + width = 50, + height = 50, + pixbuf = gcompris.utils.load_pixmap("singalong/audio-volume-muted.png") + ) + + gcompris.utils.item_focus_init(self.mute_button, None) + self.mute_button.connect("button-press-event", self.mute_and_play) + self.play_button = goocanvas.Image( parent = self.rootitem, x = 600, @@ -154,6 +165,8 @@ class Gcompris_singalong: self.lyrics_dataset = self.read_data() self.populate_songs() + + self.songtitle.props.text = self.songs[self.gcomprisBoard.level - 1].title self.play_song() @@ -161,6 +174,12 @@ class Gcompris_singalong: self.count = 0 self.status_timer = self.delay self.play_song() + + def mute_and_play(self, item, event, attr): + if self.mute == False: + self.mute = True + else: + self.mute = False def read_data(self): '''Load the activity data''' @@ -234,7 +253,9 @@ class Gcompris_singalong: self.ball.props.x = int(self.mapping[note]) self.songlyrics.props.text = self.songs[self.gcomprisBoard.level - 1].lyrics[self.count] self.ball.props.visibility = goocanvas.ITEM_VISIBLE - gcompris.sound.play_ogg('singalong/'+note+'.wav') + if self.mute == False: + gcompris.sound.play_ogg('singalong/'+note+'.wav') + # print self.status_timer _______________________________________________ commits-list mailing list (read only) http://mail.gnome.org/mailman/listinfo/commits-list Want to limit the commits to a few modules? Go to above URL, log in to edit your options and select the modules ('topics') you want.
|
|
