Changeset 5968 for branches/newosd

Timestamp:

12/21/07 05:02:43 (11 months ago)

Author:

eugene

Message:

It's way more sane to use std::string here...

Files:

• branches/newosd/src/iface.cpp (modified) (2 diffs)

branches/newosd/src/iface.cpp

@@ -1 +1 @@
 #include "iface.h"
+
+#include <string>
 
 #include <licq_icqd.h>
@@ -62 +64 @@
     return false;
 
-  char* alias = strdup(u->GetAlias());
+  string str = u->GetAlias();
   gUserManager.DropUser(u);
-  alias = static_cast<char*>(realloc(alias, strlen(alias) + 3));
-  strcat(alias, ": ");
+  str += ": ";
 
-  pango_layout_set_text(trd.lay, alias, -1);
+  pango_layout_set_text(trd.lay, str.c_str(), -1);
   pango_layout_get_size(trd.lay, &tag_width, NULL);
   pango_layout_set_indent(trd.lay, -tag_width);
 
-  char* x = "received\nthe\nsignal";
-  alias = static_cast<char*>(realloc(alias, strlen(alias) + strlen(x) + 1));
-  strcat(alias, x);
+  str += "received\nthe\nsignal";
 
-  pango_layout_set_text_aosd(trd.lay, alias);
-  free(alias);
+  pango_layout_set_text_aosd(trd.lay, const_cast<char*>(str.c_str()));
   pango_layout_get_size_aosd(trd.lay, &width, &height, &trd.lbearing);