Changeset a844239

Timestamp:

May 18, 2011, 3:48:45 PM (14 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

64c829a (diff), 7865479 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 7865479440dd042766ecbbc1119b45e5eb7cd6a6 into 64c829aed5e966415464e38f393083d736e281e8

Files:

• functions.c (modified) (1 diff)
• logging.c (modified) (1 diff)
• text.c (modified) (1 diff)

functions.c

@@ -2521 +2521 @@
 
   filtname = g_strdup_printf("conversation-%s", ccs);
-  owl_text_tr(filtname, ' ', '-');
+  g_strdelimit(filtname, " ", '-');
 
   if (owl_global_get_filter(&g, filtname)) {

logging.c

@@ -151 +151 @@
   } else if (owl_message_is_type_jabber(m)) {
     to = g_strdup_printf("jabber:%s", owl_message_get_recipient(m));
-    owl_text_tr(to, '/', '_');
+    g_strdelimit(to, "/", '_');
   } else if (owl_message_is_type_aim(m)) {
     char *temp2;

text.c

@@ -275 +275 @@
   g_strfreev(split);
   return out;
-}
-
-/* replace all instances of character a in buff with the character
- * b.  buff must be null terminated.
- */
-void owl_text_tr(char *buff, char a, char b)
-{
-  int i;
-
-  owl_function_debugmsg("In: %s", buff);
-  for (i=0; buff[i]!='\0'; i++) {
-    if (buff[i]==a) buff[i]=b;
-  }
-  owl_function_debugmsg("Out: %s", buff);
 }