[Galago-commits] r2640 - in trunk/libgalago: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-03-29 22:16:00 -0800 (Wed, 29 Mar 2006)
New Revision: 2640

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-dbus.c
   trunk/libgalago/libgalago/galago-dbus.h
Log:
Remove galago_dbus_normalize_name(). It's been moved to galago-daemon.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-03-30 06:14:28 UTC (rev 2639)
+++ trunk/libgalago/ChangeLog	2006-03-30 06:16:00 UTC (rev 2640)
@@ -1,3 +1,10 @@
+Wed Mar 29 22:15:25 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-dbus.c:
+	* libgalago/galago-dbus.h:
+	  - Remove galago_dbus_normalize_name(). It's been moved to
+	    galago-daemon.
+
 Wed Mar 29 01:54:47 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-context.c:

Modified: trunk/libgalago/libgalago/galago-dbus.c
===================================================================
--- trunk/libgalago/libgalago/galago-dbus.c	2006-03-30 06:14:28 UTC (rev 2639)
+++ trunk/libgalago/libgalago/galago-dbus.c	2006-03-30 06:16:00 UTC (rev 2640)
@@ -679,38 +679,3 @@
 				  g_type_name(G_OBJECT_CLASS_TYPE(klass)));
 	}
 }
-
-#define IS_VALID_DBUS_NAME_CHAR(c) \
-	(((c) >= '0' && (c) <= '9') || \
-	 ((c) >= 'A' && (c) <= 'Z') || \
-	 ((c) >= 'a' && (c) <= 'z'))
-
-const char *
-galago_dbus_normalize_name(const char *name)
-{
-	static char buffer[BUFSIZ];
-	const char *c;
-	char *d;
-
-	g_return_val_if_fail(name != NULL, NULL);
-
-	for (c = name, d = buffer; *c != '\0'; c++)
-	{
-		if (!IS_VALID_DBUS_NAME_CHAR(*c))
-		{
-			char escaped_c[9];
-			g_snprintf(escaped_c, sizeof(escaped_c), "_0x%x_", *c);
-
-			strncpy(d, escaped_c, BUFSIZ - (d - buffer));
-			d += strlen(escaped_c);
-		}
-		else
-		{
-			*d++ = *c;
-		}
-	}
-
-	*d = '\0';
-
-	return buffer;
-}

Modified: trunk/libgalago/libgalago/galago-dbus.h
===================================================================
--- trunk/libgalago/libgalago/galago-dbus.h	2006-03-30 06:14:28 UTC (rev 2639)
+++ trunk/libgalago/libgalago/galago-dbus.h	2006-03-30 06:16:00 UTC (rev 2640)
@@ -208,16 +208,6 @@
  */
 void galago_dbus_object_push_full(GalagoObject *object);
 
-/**
- * Normalizes the passed name for purposes of using it in D-BUS paths
- * and commands.
- *
- * @param name The name to normalize.
- *
- * @return A pointer to a static buffer containing the normalized name.
- */
-const char *galago_dbus_normalize_name(const char *name);
-
 /*@}*/
 
 G_END_DECLS