[vlc-devel] commit: Separate variable for modal and non modal errors ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sun Jul  5 00:43:00 2009 +0300| [5eccfc4085e72f3db6b76d7a5e61d3211410732d] | committer: Rémi Denis-Courmont 

Separate variable for modal and non modal errors
(cherry picked from commit afacc88aab72550887cbe868e7d7f17b1d3baabd)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5eccfc4085e72f3db6b76d7a5e61d3211410732d
---

 include/vlc_dialog.h   |    1 -
 src/interface/dialog.c |    5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/vlc_dialog.h b/include/vlc_dialog.h
index 0270cb8..4b99ce7 100644
--- a/include/vlc_dialog.h
+++ b/include/vlc_dialog.h
@@ -35,7 +35,6 @@ typedef struct dialog_fatal_t
 {
     const char *title;
     const char *message;
-    bool modal;
 } dialog_fatal_t;
 
 VLC_EXPORT( void, dialog_VFatal, (vlc_object_t *, bool, const char *, const char *, va_list) );
diff --git a/src/interface/dialog.c b/src/interface/dialog.c
index 22ac785..5050040 100644
--- a/src/interface/dialog.c
+++ b/src/interface/dialog.c
@@ -119,8 +119,9 @@ void dialog_VFatal (vlc_object_t *obj, bool modal, const char *title,
 
     if (vasprintf (&text, fmt, ap) != -1)
     {
-        dialog_fatal_t dialog = { title, text, modal, };
-        var_SetAddress (provider, "dialog-fatal", &dialog);
+        dialog_fatal_t dialog = { title, text, };
+        var_SetAddress (provider,
+                        modal ? "dialog-critical" : "dialog-error", &dialog);
         free (text);
     }
     vlc_object_release (provider);