Mercurial > audlegacy

changeset 2941:d9a2434375f1 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.atheme.org//hg/audacious
author William Pitcock <nenolod@atheme.org>
date Fri, 29 Jun 2007 08:58:32 -0500
parents b51cc33881c2 (diff) 1cdfc508d758 (current diff)
children 1a59a0ced6a8
files
diffstat 4 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/audtool/audtool_handlers_general.c	Fri Jun 29 15:52:26 2007 +0200
+++ b/src/audtool/audtool_handlers_general.c	Fri Jun 29 08:58:32 2007 -0500
@@ -76,11 +76,11 @@
 {
 	if (argc > 1)
 	{
-		if (!strncmp(argv[1],"on",2)) {
+		if (!g_ascii_strcasecmp(argv[1], "on")) {
 			audacious_remote_main_win_toggle(dbus_proxy, TRUE);
 			return;
 		}
-		else if (!strncmp(argv[1],"off",3)) {
+		else if (!g_ascii_strcasecmp(argv[1], "off")) {
 			audacious_remote_main_win_toggle(dbus_proxy, FALSE);
 			return;
 		}
@@ -93,11 +93,11 @@
 {
 	if (argc > 1)
 	{
-		if (!strncmp(argv[1],"on",2)) {
+		if (!g_ascii_strcasecmp(argv[1], "on")) {
 			audacious_remote_pl_win_toggle(dbus_proxy, TRUE);
 			return;
 		}
-		else if (!strncmp(argv[1],"off",3)) {
+		else if (!g_ascii_strcasecmp(argv[1], "off")) {
 			audacious_remote_pl_win_toggle(dbus_proxy, FALSE);
 			return;
 		}
@@ -110,11 +110,11 @@
 {
 	if (argc > 1)
 	{
-		if (!strncmp(argv[1],"on",2)) {
+		if (!g_ascii_strcasecmp(argv[1] ,"on")) {
 			audacious_remote_eq_win_toggle(dbus_proxy, TRUE);
 			return;
 		}
-		else if (!strncmp(argv[1],"off",3)) {
+		else if (!g_ascii_strcasecmp(argv[1] ,"off")) {
 			audacious_remote_eq_win_toggle(dbus_proxy, FALSE);
 			return;
 		}
@@ -144,7 +144,7 @@
 
 	for (i = 0; handlers[i].name != NULL; i++)
 	{
-		if (!g_strcasecmp("<sep>", handlers[i].name))
+		if (!g_ascii_strcasecmp("<sep>", handlers[i].name))
 			audtool_report("%s%s:", i == 0 ? "" : "\n", handlers[i].desc);
 		else
 			audtool_report("   %-34s - %s", handlers[i].name, handlers[i].desc);
--- a/src/audtool/audtool_handlers_playlist.c	Fri Jun 29 15:52:26 2007 +0200
+++ b/src/audtool/audtool_handlers_playlist.c	Fri Jun 29 08:58:32 2007 -0500
@@ -365,7 +365,7 @@
 		return;
 	}
 	
-	if (!strcasecmp(argv[1], "track_number") || !strcasecmp(argv[1], "year") || !strcasecmp(argv[1], "length") || !strcasecmp(argv[1], "mtime"))
+	if (!g_ascii_strcasecmp(argv[1], "track_number") || !g_ascii_strcasecmp(argv[1], "year") || !g_ascii_strcasecmp(argv[1], "length") || !g_ascii_strcasecmp(argv[1], "mtime"))
 	{
 		if (*(gint *)data > 0)
 		{
--- a/src/audtool/audtool_handlers_vitals.c	Fri Jun 29 15:52:26 2007 +0200
+++ b/src/audtool/audtool_handlers_vitals.c	Fri Jun 29 08:58:32 2007 -0500
@@ -179,7 +179,7 @@
 		return;
 	}
 	
-	if (!strcasecmp(argv[1], "track_number") || !strcasecmp(argv[1], "year") || !strcasecmp(argv[1], "length") || !strcasecmp(argv[1], "mtime"))
+	if (!g_ascii_strcasecmp(argv[1], "track_number") || !g_ascii_strcasecmp(argv[1], "year") || !g_ascii_strcasecmp(argv[1], "length") || !g_ascii_strcasecmp(argv[1], "mtime"))
 	{
 		if (*(gint *)data > 0)
 		{
--- a/src/audtool/audtool_main.c	Fri Jun 29 15:52:26 2007 +0200
+++ b/src/audtool/audtool_main.c	Fri Jun 29 08:58:32 2007 -0500
@@ -152,9 +152,9 @@
 	{
 		for (i = 0; handlers[i].name != NULL; i++)
 		{
-			if ((!g_strcasecmp(handlers[i].name, argv[j]) ||
-			     !g_strcasecmp(g_strconcat("--", handlers[i].name, NULL), argv[j]))
-			    && g_strcasecmp("<sep>", handlers[i].name))
+			if ((!g_ascii_strcasecmp(handlers[i].name, argv[j]) ||
+			     !g_ascii_strcasecmp(g_strconcat("--", handlers[i].name, NULL), argv[j]))
+			    && g_ascii_strcasecmp("<sep>", handlers[i].name))
   			{
  				handlers[i].handler(handlers[i].args + 1, &argv[j]);
 				j += handlers[i].args;