From 2fb3485481b707a3b2c38574a571f6c4d486219a Mon Sep 17 00:00:00 2001 From: Patrik Flykt Date: Wed, 27 Mar 2013 13:53:55 +0200 Subject: client: Add calls to save and redraw input prompt --- client/commands.c | 6 +++++- client/dbus_helpers.c | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'client') diff --git a/client/commands.c b/client/commands.c index 6e124f9d..6e2680bb 100644 --- a/client/commands.c +++ b/client/commands.c @@ -38,9 +38,9 @@ #include "technology.h" #include "data_manager.h" -#include "commands.h" #include "dbus_helpers.h" #include "input.h" +#include "commands.h" #define MANDATORY_ARGS 3 @@ -404,6 +404,8 @@ static DBusHandlerResult monitor_changed(DBusConnection *connection, if (path != NULL && *path != '\0') path++; + __connmanctl_save_rl(); + if (dbus_message_is_signal(message, "net.connman.Manager", "ServicesChanged") == TRUE) { @@ -432,6 +434,8 @@ static DBusHandlerResult monitor_changed(DBusConnection *connection, __connmanctl_dbus_print(&iter, "", " = ", " = "); fprintf(stdout, "\n"); + __connmanctl_redraw_rl(); + return DBUS_HANDLER_RESULT_HANDLED; } diff --git a/client/dbus_helpers.c b/client/dbus_helpers.c index 816da73a..ccdf695d 100644 --- a/client/dbus_helpers.c +++ b/client/dbus_helpers.c @@ -24,6 +24,7 @@ #include #include +#include "input.h" #include "dbus_helpers.h" #define TIMEOUT 60000 @@ -129,6 +130,8 @@ static void dbus_method_reply(DBusPendingCall *call, void *user_data) DBusMessage *reply; DBusMessageIter iter; + __connmanctl_save_rl(); + reply = dbus_pending_call_steal_reply(call); if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) { DBusError err; @@ -146,6 +149,10 @@ static void dbus_method_reply(DBusPendingCall *call, void *user_data) callback->cb(&iter, NULL, callback->user_data); end: + __connmanctl_redraw_rl(); + if (__connmanctl_is_interactive() == false) + __connmanctl_quit(); + g_free(callback); dbus_message_unref(reply); } -- cgit v1.2.3