diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2009-04-03 20:44:19 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-04-03 20:44:19 +0800 |
| commit | 8d8573f27e08399bb34266cbdba5e7766af85df6 (patch) | |
| tree | c7a90a9509942ac328ea56287c9cc20636655fa4 | |
| parent | b3916f8eec92003c931f87791fa6d1f0c9f37310 (diff) | |
| download | gsoc2013-empathy-8d8573f27e08399bb34266cbdba5e7766af85df6.tar gsoc2013-empathy-8d8573f27e08399bb34266cbdba5e7766af85df6.tar.gz gsoc2013-empathy-8d8573f27e08399bb34266cbdba5e7766af85df6.tar.bz2 gsoc2013-empathy-8d8573f27e08399bb34266cbdba5e7766af85df6.tar.lz gsoc2013-empathy-8d8573f27e08399bb34266cbdba5e7766af85df6.tar.xz gsoc2013-empathy-8d8573f27e08399bb34266cbdba5e7766af85df6.tar.zst gsoc2013-empathy-8d8573f27e08399bb34266cbdba5e7766af85df6.zip | |
Remove unnecessary string dup. Fixes bug #577829
From: Xavier Claessens <xclaesse@gmail.com>
svn path=/branches/gnome-2-26/; revision=2753
| -rw-r--r-- | libempathy-gtk/empathy-smiley-manager.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c index 9f7dd73c8..96b50206a 100644 --- a/libempathy-gtk/empathy-smiley-manager.c +++ b/libempathy-gtk/empathy-smiley-manager.c @@ -79,8 +79,9 @@ smiley_manager_tree_free (SmileyManagerTree *tree) g_slice_free (SmileyManagerTree, tree); } +/* Note: This function takes the ownership of str */ static EmpathySmiley * -smiley_new (GdkPixbuf *pixbuf, const gchar *str) +smiley_new (GdkPixbuf *pixbuf, gchar *str) { EmpathySmiley *smiley; @@ -88,7 +89,7 @@ smiley_new (GdkPixbuf *pixbuf, const gchar *str) if (pixbuf) { smiley->pixbuf = g_object_ref (pixbuf); } - smiley->str = g_strdup (str); + smiley->str = str; return smiley; } @@ -229,7 +230,8 @@ smiley_manager_add_valist (EmpathySmileyManager *manager, smiley_manager_tree_insert (priv->tree, smiley, str); } - priv->smileys = g_slist_prepend (priv->smileys, smiley_new (smiley, first_str)); + priv->smileys = g_slist_prepend (priv->smileys, + smiley_new (smiley, g_strdup (first_str))); } void |