diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/message-stack.cpp | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/message-stack.cpp')
| -rw-r--r-- | src/message-stack.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/message-stack.cpp b/src/message-stack.cpp index d2101009e..bc89520b7 100644 --- a/src/message-stack.cpp +++ b/src/message-stack.cpp @@ -10,7 +10,7 @@ */ #include <string.h> -#include <glib/gstrfuncs.h> +#include <glib.h> #include <cstring> #include <string> #include "message-stack.h" @@ -62,6 +62,12 @@ void MessageStack::cancel(MessageId id) { } } +MessageId MessageStack::flash(MessageType type, Glib::ustring const &message) +{ + MessageId id = flash( type, message.c_str() ); + return id; +} + MessageId MessageStack::flash(MessageType type, gchar const *message) { switch (type) { case INFORMATION_MESSAGE: // stay rather long so as to seem permanent, but eventually disappear |