summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas James Alexander Thurman <tthurman@src.gnome.org>2006-11-05 22:32:01 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2006-11-05 22:32:01 +0000
commit8f09a1206993f41d29f160ca9d9665f79d68213a (patch)
tree4226d16e80277c526164e018e1c1c725de44ca8d
parentc68c26b7f868c60749d9068ed9e1d33b31d3d769 (diff)
downloadmetacity-8f09a1206993f41d29f160ca9d9665f79d68213a.tar.gz
use g_strdup to allocate a string, not strdup. Fixes #363354.
* src/ui.c: use g_strdup to allocate a string, not strdup. Fixes #363354.
-rw-r--r--ChangeLog5
-rw-r--r--src/ui.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 356cf16c..254ce3c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-05 Kjartan Maraas <kmaraas@gnome.org>
+
+ * src/ui.c: use g_strdup to allocate a string, not strdup. Fixes
+ #363354.
+
2006-11-05 Justin Mason <jm@jmason.org>
* src/keybindings.c: implement handle_move_to_{side|corner}_* to
diff --git a/src/ui.c b/src/ui.c
index dbbe698d..fc6c7641 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -825,7 +825,7 @@ meta_ui_accelerator_name (unsigned int keysym,
if (keysym == 0 && mask == 0)
{
- return strdup ("disabled");
+ return g_strdup ("disabled");
}
if (mask & META_VIRTUAL_SHIFT_MASK)