devs/cproof

merge/upstream-full #105

Manually merged

jabber.developer merged 407 commits from merge/upstream-full into master

2026-05-26 17:54:34 +00:00

303 changed files with 10889 additions and 9770 deletions

Showing only changes of commit c0f8f1a0f1 - Show all commits

									
										1

src/xmpp/jid.c
									
												View File
												
					@@ -79,7 +79,6 @@ jid_create(const gchar* const str)

					gboolean

					gboolean

					jid_is_valid(const gchar* const str)

					jid_is_valid(const gchar* const str)

					{

					{

					<<<<<<< HEAD

					    if (str == NULL) {

					    if (str == NULL) {

					        return FALSE;

					        return FALSE;

					    }

					    }