diff options
| author | Eion Robb <eion@robbmob.com> | 2017-05-28 14:30:19 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-28 14:30:19 +1200 |
| commit | 5988e14f1ad6d5f4fd00119ef1b116b7d0d5d540 (patch) | |
| tree | 0ae5997555650635ac794cbfce2bc68193ee9d37 /matrix-api.h | |
| parent | a0e49f377112a01c00ca848a83bc7951816ae56a (diff) | |
| parent | 4cc8da9456f2169fe48849f53374b21baa7236b9 (diff) | |
| download | purple-matrix-5988e14f1ad6d5f4fd00119ef1b116b7d0d5d540.tar.gz | |
Merge branch 'master' into typing-notifications3
Diffstat (limited to 'matrix-api.h')
| -rw-r--r-- | matrix-api.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/matrix-api.h b/matrix-api.h index 59f6b27..22091d8 100644 --- a/matrix-api.h +++ b/matrix-api.h @@ -134,6 +134,7 @@ void matrix_api_cancel(MatrixApiRequestData *request); MatrixApiRequestData *matrix_api_password_login(MatrixConnectionData *conn, const gchar *username, const gchar *password, + const gchar *device_id, MatrixApiCallback callback, gpointer user_data); |