summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--libwnck/window.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b210ed5..a2c2fa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-02 Padraig O'Briain <padraigobriain@sun.com>
+
+ * libwnck/window.c (update_actions): Add check that atom name is
+ not NULL. Fixes bug #127189.
+
2003-12-10 Mark McLoughlin <mark@skynet.ie>
* configure.in: Version 2.5.1.
diff --git a/libwnck/window.c b/libwnck/window.c
index bbf19a9..f5139e7 100644
--- a/libwnck/window.c
+++ b/libwnck/window.c
@@ -1773,7 +1773,10 @@ update_actions (WnckWindow *window)
else if (atoms[i] == _wnck_atom_get ("_NET_WM_ACTION_CLOSE"))
window->priv->actions |= WNCK_WINDOW_ACTION_CLOSE;
else
- g_warning ("Unhandled action type %s", _wnck_atom_name (atoms [i]));
+ {
+ const char *name = _wnck_atom_name (atoms [i]);
+ g_warning ("Unhandled action type %s", name ? name: "(nil)");
+ }
i++;
}