[Android] libvlc: fix title/text mismatch (squash)

Thomas Guillem git at videolan.org
Wed Feb 3 19:15:31 CET 2016


vlc-android | branch: dialog | Thomas Guillem <thomas at gllm.fr> | Wed Feb  3 19:13:32 2016 +0100| [a5777399099849c9a6fa43b9c5bc11d53b9d073a] | committer: Thomas Guillem

libvlc: fix title/text mismatch (squash)

> https://code.videolan.org/videolan/vlc-android/commit/a5777399099849c9a6fa43b9c5bc11d53b9d073a
---

 libvlc/jni/libvlcjni-dialog.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libvlc/jni/libvlcjni-dialog.c b/libvlc/jni/libvlcjni-dialog.c
index 8d7446d..1ace73b 100644
--- a/libvlc/jni/libvlcjni-dialog.c
+++ b/libvlc/jni/libvlcjni-dialog.c
@@ -45,15 +45,15 @@ display_cb(libvlc_dialog_id *p_id, libvlc_dialog *p_dialog, void *p_data)
     case LIBVLC_DIALOG_ERROR:
         (*env)->CallStaticVoidMethod(env, fields.Dialog.clazz,
             fields.Dialog.displayErrorFromNativeID,
-            (*env)->NewStringUTF(env, p_dialog->psz_text),
-            (*env)->NewStringUTF(env, p_dialog->psz_title));
+            (*env)->NewStringUTF(env, p_dialog->psz_title),
+            (*env)->NewStringUTF(env, p_dialog->psz_text));
         return true;
     case LIBVLC_DIALOG_LOGIN:
         jdialog = (*env)->CallStaticObjectMethod(env, fields.Dialog.clazz,
             fields.Dialog.displayLoginFromNativeID,
             (jlong)(intptr_t) p_id,
-            (*env)->NewStringUTF(env, p_dialog->psz_text),
             (*env)->NewStringUTF(env, p_dialog->psz_title),
+            (*env)->NewStringUTF(env, p_dialog->psz_text),
             (*env)->NewStringUTF(env, p_dialog->u.login.psz_default_username),
             p_dialog->u.login.b_ask_store);
         break;
@@ -64,8 +64,8 @@ display_cb(libvlc_dialog_id *p_id, libvlc_dialog *p_dialog, void *p_data)
         jdialog = (*env)->CallStaticObjectMethod(env, fields.Dialog.clazz,
             fields.Dialog.displayQuestionFromNativeID,
             (jlong)(intptr_t) p_id,
-            (*env)->NewStringUTF(env, p_dialog->psz_text),
             (*env)->NewStringUTF(env, p_dialog->psz_title),
+            (*env)->NewStringUTF(env, p_dialog->psz_text),
             p_dialog->u.question.i_type,
             (*env)->NewStringUTF(env, p_dialog->u.question.psz_cancel),
             psz_a1 ? (*env)->NewStringUTF(env, psz_a1) : NULL,
@@ -76,8 +76,8 @@ display_cb(libvlc_dialog_id *p_id, libvlc_dialog *p_dialog, void *p_data)
         jdialog = (*env)->CallStaticObjectMethod(env, fields.Dialog.clazz,
             fields.Dialog.displayProgressFromNativeID,
             (jlong)(intptr_t) p_id,
-            (*env)->NewStringUTF(env, p_dialog->psz_text),
             (*env)->NewStringUTF(env, p_dialog->psz_title),
+            (*env)->NewStringUTF(env, p_dialog->psz_text),
             p_dialog->u.progress.b_indeterminate,
             p_dialog->u.progress.f_position,
             (*env)->NewStringUTF(env, p_dialog->u.progress.psz_cancel));



More information about the Android mailing list