diff options
author | Antenore Gatta (tmow) <antenore@simbiosi.org> | 2021-12-10 01:10:00 +0300 |
---|---|---|
committer | Antenore Gatta (tmow) <antenore@simbiosi.org> | 2021-12-10 01:10:00 +0300 |
commit | 7b0b7b8686ad526d2bf2e7713c43f8aaec414484 (patch) | |
tree | cdd87926c93568387820c612acbb84ea1fd0249b | |
parent | 37964e18f4724e9132115c205be3232f012d35a1 (diff) |
Checking network status at remmina files loading
-rw-r--r-- | src/remmina_main.c | 1 | ||||
-rw-r--r-- | src/remmina_monitor.c | 22 | ||||
-rw-r--r-- | src/remmina_monitor.h | 1 |
3 files changed, 16 insertions, 8 deletions
diff --git a/src/remmina_main.c b/src/remmina_main.c index a66724b7e..8c4eca9a2 100644 --- a/src/remmina_main.c +++ b/src/remmina_main.c @@ -689,6 +689,7 @@ static void remmina_main_load_files() gtk_statusbar_pop(remminamain->statusbar_main, context_id); gtk_statusbar_push(remminamain->statusbar_main, context_id, buf); + remmina_network_monitor_status (remminamain->monitor); if (remminamain->monitor->connected){ neticon = g_strdup("network-transmit-receive-symbolic"); connection_tooltip = g_strdup(_("Network status: fully online")); diff --git a/src/remmina_monitor.c b/src/remmina_monitor.c index c6e9c8e4e..9a82a8e18 100644 --- a/src/remmina_monitor.c +++ b/src/remmina_monitor.c @@ -178,17 +178,11 @@ gchar *remmina_monitor_can_reach(RemminaFile *remminafile, RemminaMonitor *monit } -RemminaMonitor *remmina_network_monitor_new () +gboolean remmina_network_monitor_status (RemminaMonitor *rm_monitor) { TRACE_CALL(__func__); - gboolean status; - - rm_monitor = g_new0(RemminaMonitor, 1); - - rm_monitor->netmonitor = g_network_monitor_get_default (); - - status = g_network_monitor_get_connectivity (rm_monitor->netmonitor); + gboolean status = g_network_monitor_get_connectivity (rm_monitor->netmonitor); rm_monitor->server_status = g_hash_table_new_full( g_str_hash, @@ -219,5 +213,17 @@ RemminaMonitor *remmina_network_monitor_new () break; } + return status; +} + + +RemminaMonitor *remmina_network_monitor_new () +{ + TRACE_CALL(__func__); + + rm_monitor = g_new0(RemminaMonitor, 1); + + rm_monitor->netmonitor = g_network_monitor_get_default (); + return rm_monitor; } diff --git a/src/remmina_monitor.h b/src/remmina_monitor.h index 6694197af..4c8e0dc14 100644 --- a/src/remmina_monitor.h +++ b/src/remmina_monitor.h @@ -50,6 +50,7 @@ typedef struct _RemminaMonitor { G_BEGIN_DECLS +gboolean remmina_network_monitor_status (RemminaMonitor *rm_monitor); RemminaMonitor *remmina_network_monitor_new (); gchar *remmina_monitor_can_reach(RemminaFile *remminafile, RemminaMonitor *monitor); |