Mercurial > pidgin3 / changeset

--- a/libpurple/buddylist.c	Tue Sep 10 04:04:17 2019 -0400
+++ b/libpurple/buddylist.c	Fri Sep 13 01:27:15 2019 +0000
@@ -2071,6 +2071,15 @@
 {
 	PurpleBuddyListClass *klass = NULL;
 
+	/* XXX: There's a chicken and egg problem with the accounts api, where
+	 * it'll call this function before purple_blist_init is called, this will
+	 * cause the following g_return_if_fail to fail, and muck up the logs.  We
+	 * need to find a better fix for this, but this gets rid of it for now.
+	 */
+	if(G_UNLIKELY(list == NULL && purplebuddylist == NULL)) {
+		return;
+	}
+
 	g_return_if_fail(PURPLE_IS_BUDDY_LIST(list));
 
 	klass = PURPLE_BUDDY_LIST_GET_CLASS(list);

--- a/pidgin/gtkconv.c	Tue Sep 10 04:04:17 2019 -0400
+++ b/pidgin/gtkconv.c	Fri Sep 13 01:27:15 2019 +0000
@@ -1806,6 +1806,7 @@
 static gboolean
 refocus_entry_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
+	GtkWidget *view = NULL;
 	PidginConversation *gtkconv = data;
 
 	/* If we have a valid key for the conversation display, then exit */
@@ -1837,8 +1838,9 @@
 		return FALSE;
 	}
 
-	gtk_widget_grab_focus(gtkconv->entry);
-	gtk_widget_event(gtkconv->entry, (GdkEvent *)event);
+	view = talkatu_editor_get_view(TALKATU_EDITOR(gtkconv->editor));
+	gtk_widget_grab_focus(view);
+	gtk_widget_event(view, (GdkEvent *)event);
 
 	return TRUE;
 }
@@ -4538,7 +4540,7 @@
 
 	g_signal_connect_swapped(G_OBJECT(pane), "focus",
 	                         G_CALLBACK(gtk_widget_grab_focus),
-	                         gtkconv->entry);
+	                         gtkconv->editor);
 
 	if (hidden)
 		pidgin_conv_window_add_gtkconv(hidden_convwin, gtkconv);

--- a/pidgin/pidginmessage.c	Tue Sep 10 04:04:17 2019 -0400
+++ b/pidgin/pidginmessage.c	Fri Sep 13 01:27:15 2019 +0000
@@ -53,7 +53,7 @@
 
 		g_object_freeze_notify(G_OBJECT(msg));
 		g_object_notify_by_pspec(G_OBJECT(msg), properties[PROP_MESSAGE]);
-		g_object_notify_by_pspec(G_OBJECT(msg), properties[PROP_TIMESTAMP]);
+		g_object_notify(G_OBJECT(msg), "timestamp");
 		g_object_thaw_notify(G_OBJECT(msg));
 	}
 }