diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2012-09-04 18:43:14 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2012-09-04 18:43:14 +0200 |
| commit | 085c2885ff7f1acaf7a5238f85732d361ad55fc9 (patch) | |
| tree | 5797765012419b438f5e7ff5312fe186884a8dcc /common | |
| parent | 37d3eef5489d4c0d4ed227008a0494a9f14743e3 (diff) | |
gmountsource: Always use NULL-terminated arrays
GDBus calls require NULL-terminated string arrays, let's use them
internally instead of array + n_elements couple.
Also fix all users of g_mount_source_ask_question() and
g_mount_source_show_processes().
This is a regression after gdbus port actually, the old code used
to deal with string arrays differently.
Related commit: 99d06e499f999459f1fc973c870415a004722d54
https://bugzilla.gnome.org/show_bug.cgi?id=683118
Diffstat (limited to 'common')
| -rw-r--r-- | common/gmountsource.c | 8 | ||||
| -rw-r--r-- | common/gmountsource.h | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/common/gmountsource.c b/common/gmountsource.c index a2492377..e7f7d732 100644 --- a/common/gmountsource.c +++ b/common/gmountsource.c @@ -563,7 +563,6 @@ gboolean g_mount_source_ask_question (GMountSource *source, const char *message, const char **choices, - gint n_choices, gboolean *aborted_out, gint *choice_out) { @@ -579,7 +578,6 @@ g_mount_source_ask_question (GMountSource *source, g_mount_source_ask_question_async (source, message, choices, - n_choices, ask_reply_sync, &data); @@ -609,7 +607,6 @@ void g_mount_source_ask_question_async (GMountSource *source, const char *message_string, const char **choices, - gint n_choices, GAsyncReadyCallback callback, gpointer user_data) { @@ -702,7 +699,6 @@ op_ask_question (GMountOperation *op, g_mount_source_ask_question_async (mount_source, message, choices, - g_strv_length ((gchar **) choices), op_ask_question_reply, g_object_ref (op)); g_signal_stop_emission_by_name (op, "ask_question"); @@ -769,7 +765,6 @@ g_mount_source_show_processes_async (GMountSource *source, const char *message_string, GArray *processes, const char **choices, - gint n_choices, GAsyncReadyCallback callback, gpointer user_data) { @@ -833,7 +828,6 @@ g_mount_source_show_processes (GMountSource *source, const char *message, GArray *processes, const char **choices, - gint n_choices, gboolean *aborted_out, gint *choice_out) { @@ -850,7 +844,6 @@ g_mount_source_show_processes (GMountSource *source, message, processes, choices, - n_choices, ask_reply_sync, &data); @@ -920,7 +913,6 @@ op_show_processes (GMountOperation *op, message, processes, choices, - g_strv_length ((gchar **) choices), op_show_processes_reply, g_object_ref (op)); g_signal_stop_emission_by_name (op, "show_processes"); diff --git a/common/gmountsource.h b/common/gmountsource.h index 58f7f7fe..7febdaa2 100644 --- a/common/gmountsource.h +++ b/common/gmountsource.h @@ -88,14 +88,12 @@ gboolean g_mount_source_ask_password_finish (GMountSource gboolean g_mount_source_ask_question (GMountSource *mount_source, const char *message, const char **choices, - gint n_choices, gboolean *aborted, gint *choice_out); void g_mount_source_ask_question_async (GMountSource *mount_source, const char *message, const char **choices, - gint n_choices, GAsyncReadyCallback callback, gpointer user_data); @@ -108,7 +106,6 @@ gboolean g_mount_source_show_processes (GMountSource const char *message, GArray *processes, const char **choices, - gint n_choices, gboolean *aborted, gint *choice_out); @@ -116,7 +113,6 @@ void g_mount_source_show_processes_async (GMountSource const char *message, GArray *processes, const char **choices, - gint n_choices, GAsyncReadyCallback callback, gpointer user_data); |