Re: Empathy: code freeze requests

[Guillaume Desmottes <gdesmott gnome org>]

Le lundi 22 mars 2010 à 10:29 +0100, Frederic Crozat a écrit :
> Le 22/03/2010 09:55, Guillaume Desmottes a écrit :
> > Le vendredi 19 mars 2010 à 09:17 +0100, Frederic Peters a écrit :
> >> Guillaume Desmottes wrote:
> >>
> >>> This is a very important patch for us to get in because both MeeGo and
> >>> gnome-shell relies heavily on this feature and we'd really like to
> >>> provide a 2.30 release working well for them.
> >>
> >> Ok, it will be important to be able to test gnome shell without
> >> requiring a 2.31 empathy, 1 from me.
> >
> > Thanks Frédéric. Any other opinion?
> 
> Approval 2 / 2, even if I find disturbing to see huge stuff like this 
> landing so late in the process.

Thanks; merged.

> > I have another small branch fixing a crash; thoughts?
> > See
> > http://git.collabora.co.uk/?p=user/cassidy/empathy;a=shortlog;h=refs/heads/paste-crash-612363 and https://bugzilla.gnome.org/show_bug.cgi?id=612943
> >
> > It's pretty harmless as you can see.
> 
> Could you please try to follow 
> http://live.gnome.org/ReleasePlanning/RequestingFreezeBreaks ? Patches 
> should be attached for each freeze break request and each request should 
> be handled as a separate mail.
> 
> Approval 1 / 2, even if half of the changes are cosmetic :(

Sorry, I linked the wrong bug :\
https://bugzilla.gnome.org/show_bug.cgi?id=612363 (but the branch is
right though).

Attaching the diff.


	G.


-- 
Guillaume Desmottes <gdesmott gnome org>
Jabber <cassidy jabber belnet be>
GPG 1024D/711E31B1 | 1B5A 1BA8 11AA F0F1 2169  E28A AC55 8671 711E 31B1

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 4db9e45..36b4136 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -1244,13 +1244,10 @@ static void
 chat_input_text_buffer_changed_cb (GtkTextBuffer *buffer,
                                    EmpathyChat    *chat)
 {
-	EmpathyChatPriv *priv;
 	GtkTextIter     start, end;
 	gchar          *str;
 	gboolean        spell_checker = FALSE;
 
-	priv = GET_PRIV (chat);
-
 	if (gtk_text_buffer_get_char_count (buffer) == 0) {
 		chat_composing_stop (chat);
 	} else {
@@ -2255,9 +2252,9 @@ chat_create_ui (EmpathyChat *chat)
 			  G_CALLBACK (chat_input_populate_popup_cb),
 			  chat);
 	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (chat->input_text_view));
-	g_signal_connect (buffer, "changed",
+	empathy_signal_connect_weak  (buffer, "changed",
 			  G_CALLBACK (chat_input_text_buffer_changed_cb),
-			  chat);
+			  G_OBJECT (chat));
 	gtk_text_buffer_create_tag (buffer, "misspelled",
 				    "underline", PANGO_UNDERLINE_ERROR,
 				    NULL);