comparison libpurple/core.c @ 25894:a6e3cb32cdd2

Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us closes #7790 committer: Gary Kramlich <[e-mail]>

25893:991796129108

		if (!purple_dbus_is_owner())
		{
			const char *user_dir = purple_user_dir();
			char *dbus_owner_user_dir = purple_dbus_owner_user_dir();

			if (NULL == user_dir && NULL != dbus_owner_user_dir)
				is_single_instance = TRUE;
			else if (NULL != user_dir && NULL == dbus_owner_user_dir)
				is_single_instance = TRUE;
			else if (NULL == user_dir && NULL == dbus_owner_user_dir)
				is_single_instance = FALSE;
			else
				is_single_instance = strcmp(dbus_owner_user_dir, user_dir);

			g_free(dbus_owner_user_dir);
		}
	}
#endif /* HAVE_DBUS */

#ifndef _WIN32
		/* Deal with symlinks... */
		if (g_file_test(name, G_FILE_TEST_IS_SYMLINK))
		{
			/* We're only going to duplicate a logs symlink. */
			if (!strcmp(entry, "logs"))
			{
				char *link;
#if GLIB_CHECK_VERSION(2,4,0)
				GError *err = NULL;

				link = g_strdup(buf);
#endif

				logs_dir = g_build_filename(user_dir, "logs", NULL);

				if (!strcmp(link, "../.purple/logs") || !strcmp(link, logs_dir))
				{
					/* If the symlink points to the new directory, we're
					 * likely just trying again after a failed migration,
					 * so there's no need to fail here. */
					g_free(link);

#endif

		/* Deal with directories... */
		if (g_file_test(name, G_FILE_TEST_IS_DIR))
		{
			if (!strcmp(entry, "icons"))
			{
				/* This is a special case for the Album plugin, which
				 * stores data in the icons folder.  We're not copying
				 * the icons directory over because previous bugs
				 * meant that it filled up with junk for many users.

					g_free(icons_name);
				}

				g_dir_close(icons_dir);
			}
			else if (!strcmp(entry, "plugins"))
			{
				/* Do nothing, because we broke plugin compatibility.
				 * This means that the plugins directory gets left behind. */
			}
			else

25894:a6e3cb32cdd2

		if (!purple_dbus_is_owner())
		{
			const char *user_dir = purple_user_dir();
			char *dbus_owner_user_dir = purple_dbus_owner_user_dir();

			is_single_instance = !purple_strequal(dbus_owner_user_dir, user_dir);
			g_free(dbus_owner_user_dir);
		}
	}
#endif /* HAVE_DBUS */

#ifndef _WIN32
		/* Deal with symlinks... */
		if (g_file_test(name, G_FILE_TEST_IS_SYMLINK))
		{
			/* We're only going to duplicate a logs symlink. */
			if (purple_strequal(entry, "logs"))
			{
				char *link;
#if GLIB_CHECK_VERSION(2,4,0)
				GError *err = NULL;

				link = g_strdup(buf);
#endif

				logs_dir = g_build_filename(user_dir, "logs", NULL);

				if (purple_strequal(link, "../.purple/logs") ||
				    purple_strequal(link, logs_dir))
				{
					/* If the symlink points to the new directory, we're
					 * likely just trying again after a failed migration,
					 * so there's no need to fail here. */
					g_free(link);

#endif

		/* Deal with directories... */
		if (g_file_test(name, G_FILE_TEST_IS_DIR))
		{
			if (purple_strequal(entry, "icons"))
			{
				/* This is a special case for the Album plugin, which
				 * stores data in the icons folder.  We're not copying
				 * the icons directory over because previous bugs
				 * meant that it filled up with junk for many users.

					g_free(icons_name);
				}

				g_dir_close(icons_dir);
			}
			else if (purple_strequal(entry, "plugins"))
			{
				/* Do nothing, because we broke plugin compatibility.
				 * This means that the plugins directory gets left behind. */
			}
			else