bonobo-activation patch
- From: Mark McLoughlin <mark skynet ie>
- To: <gnome-components-list gnome org>
- Subject: bonobo-activation patch
- Date: Thu, 20 Sep 2001 12:26:49 +0100 (IST)
Hi,
Just a simple patch to replace strcasecmp with g_strcasecmp in
bonobo-activation.
May I commit?
Cheers,
Mark.
Index: bonobo-activation/ChangeLog
===================================================================
RCS file: /cvs/gnome/bonobo-activation/ChangeLog,v
retrieving revision 1.224
diff -u -p -r1.224 ChangeLog
--- bonobo-activation/ChangeLog 2001/09/19 18:50:21 1.224
+++ bonobo-activation/ChangeLog 2001/09/20 11:21:55
@@ -1,3 +1,9 @@
+2001-09-20 Mark McLoughlin <mark skynet ie>
+
+ * server/activation-context-query.c,
+ /server/object-directory-load.c:
+ s/strcasecmp/g_strcasecmp/g.
+
2001-09-17 Havoc Pennington <hp redhat com>
* bonobo-activation-2.0.pc.in (idldir): update
Index: bonobo-activation/server/activation-context-query.c
===================================================================
RCS file: /cvs/gnome/bonobo-activation/server/activation-context-query.c,v
retrieving revision 1.27
diff -u -p -r1.27 activation-context-query.c
--- bonobo-activation/server/activation-context-query.c 2001/08/23 00:06:36 1.27
+++ bonobo-activation/server/activation-context-query.c 2001/09/20 11:21:55
@@ -506,7 +506,7 @@ qexp_evaluate_function (Bonobo_ServerInf
func_name = e->u.function_value.func_name;
for (i = 0; qexp_func_impls[i].name; i++) {
- if (!strcasecmp (func_name, qexp_func_impls[i].name))
+ if (!g_strcasecmp (func_name, qexp_func_impls[i].name))
break;
}
@@ -841,17 +841,17 @@ qexp_evaluate_id (Bonobo_ServerInfo * si
if (si) {
retval.value_known = TRUE;
retval.type = CONST_STRING;
- if (!strcasecmp (e->u.id_value, "location_info"))
+ if (!g_strcasecmp (e->u.id_value, "location_info"))
retval.u.v_string = si->location_info;
- else if (!strcasecmp (e->u.id_value, "server_type"))
+ else if (!g_strcasecmp (e->u.id_value, "server_type"))
retval.u.v_string = si->server_type;
- else if (!strcasecmp (e->u.id_value, "iid"))
+ else if (!g_strcasecmp (e->u.id_value, "iid"))
retval.u.v_string = si->iid;
- else if (!strcasecmp (e->u.id_value, "username"))
+ else if (!g_strcasecmp (e->u.id_value, "username"))
retval.u.v_string = si->username;
- else if (!strcasecmp (e->u.id_value, "hostname"))
+ else if (!g_strcasecmp (e->u.id_value, "hostname"))
retval.u.v_string = si->hostname;
- else if (!strcasecmp (e->u.id_value, "domain"))
+ else if (!g_strcasecmp (e->u.id_value, "domain"))
retval.u.v_string = si->domain;
else {
int i;
Index: bonobo-activation/server/object-directory-load.c
===================================================================
RCS file: /cvs/gnome/bonobo-activation/server/object-directory-load.c,v
retrieving revision 1.25
diff -u -p -r1.25 object-directory-load.c
--- bonobo-activation/server/object-directory-load.c 2001/09/13 17:50:12 1.25
+++ bonobo-activation/server/object-directory-load.c 2001/09/20 11:21:55
@@ -51,8 +51,8 @@ od_entry_read_props (Bonobo_ServerInfo *
continue;
}
- if (strcasecmp (sub->name, "oaf_attribute") != 0 &&
- strcasecmp (sub->name, "oaf_property") != 0) {
+ if (g_strcasecmp (sub->name, "oaf_attribute") != 0 &&
+ g_strcasecmp (sub->name, "oaf_property") != 0) {
continue;
}
@@ -85,7 +85,7 @@ od_entry_read_props (Bonobo_ServerInfo *
curprop->name = CORBA_string_dup (valuestr);
free (valuestr);
- if (strcasecmp (type, "stringv") == 0) {
+ if (g_strcasecmp (type, "stringv") == 0) {
int j, o;
xmlNodePtr sub2;
@@ -96,7 +96,7 @@ od_entry_read_props (Bonobo_ServerInfo *
if (sub2->type != XML_ELEMENT_NODE) {
continue;
}
- if (strcasecmp (sub2->name, "item") != 0) {
+ if (g_strcasecmp (sub2->name, "item") != 0) {
continue;
}
@@ -126,14 +126,14 @@ od_entry_read_props (Bonobo_ServerInfo *
xmlFree (valuestr);
}
- } else if (strcasecmp (type, "number") == 0) {
+ } else if (g_strcasecmp (type, "number") == 0) {
valuestr = xmlGetProp (sub, "value");
curprop->v._d = Bonobo_ACTIVATION_P_NUMBER;
curprop->v._u.value_number = atof (valuestr);
xmlFree (valuestr);
- } else if (strcasecmp (type, "boolean") == 0) {
+ } else if (g_strcasecmp (type, "boolean") == 0) {
valuestr = xmlGetProp (sub, "value");
curprop->v._d = Bonobo_ACTIVATION_P_BOOLEAN;
curprop->v._u.value_boolean =
@@ -216,7 +216,7 @@ od_process_server_xml_node (xmlNodePtr n
* and even more complicated stuff to use.
*/
- if (strcasecmp (node->name, "oaf_server")) {
+ if (g_strcasecmp (node->name, "oaf_server")) {
/* FIXME: syslog the error */
return;
}
@@ -288,7 +288,7 @@ od_load_file (const char *file,
return;
}
- if (strcasecmp (document->xmlRootNode->name, "oaf_info") == 0) {
+ if (g_strcasecmp (document->xmlRootNode->name, "oaf_info") == 0) {
node = document->xmlRootNode->xmlChildrenNode;
} else {
node = document->xmlRootNode;
@@ -393,8 +393,8 @@ Bonobo_ServerInfo_load (char **directori
static gboolean
od_string_to_boolean (const char *str)
{
- if (strcasecmp (str, "true") == 0
- || strcasecmp (str, "yes") == 0
+ if (g_strcasecmp (str, "true") == 0
+ || g_strcasecmp (str, "yes") == 0
|| strcmp (str, "1") == 0) {
return TRUE;
} else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]