diff options
Diffstat (limited to 'hardinfo2')
| -rw-r--r-- | hardinfo2/benchmark.c | 15 | ||||
| -rw-r--r-- | hardinfo2/menu.c | 2 | ||||
| -rw-r--r-- | hardinfo2/syncmanager.c | 27 | ||||
| -rw-r--r-- | hardinfo2/uidefs.xml | 5 |
4 files changed, 30 insertions, 19 deletions
diff --git a/hardinfo2/benchmark.c b/hardinfo2/benchmark.c index d16c1388..a4501e43 100644 --- a/hardinfo2/benchmark.c +++ b/hardinfo2/benchmark.c @@ -294,13 +294,20 @@ hi_module_init(void) { static SyncEntry se[] = { { - .fancy_name = "Benchmark results", - .name = "BenchmarkResults", - .save_to = "benchmark.conf", + .fancy_name = "Send Benchmark results", + .name = "SendBenchmarkResults", + .save_to = NULL, .get_data = get_benchmark_results + }, + { + .fancy_name = "Receive Benchmark results", + .name = "RecvBenchmarkResults", + .save_to = "benchmark.conf", + .get_data = NULL } }; - sync_manager_add_entry(se); + sync_manager_add_entry(&se[0]); + sync_manager_add_entry(&se[1]); } diff --git a/hardinfo2/menu.c b/hardinfo2/menu.c index 2b18034f..6bae39ff 100644 --- a/hardinfo2/menu.c +++ b/hardinfo2/menu.c @@ -42,7 +42,7 @@ static GtkActionEntry entries[] = G_CALLBACK(cb_generate_report) }, { "SyncManagerAction", HI_STOCK_SYNC_MENU, - "_Open SyncManager...", NULL, + "_Network Updater...", NULL, NULL, G_CALLBACK(cb_sync_manager) }, diff --git a/hardinfo2/syncmanager.c b/hardinfo2/syncmanager.c index 3df935bc..74b70c78 100644 --- a/hardinfo2/syncmanager.c +++ b/hardinfo2/syncmanager.c @@ -68,9 +68,7 @@ static GQuark err_quark; #define LABEL_SYNC_DEFAULT "<big><b>Synchronize with Central Database</b></big>\n" \ "The following information may be synchronized " \ - "with the HardInfo central database. <i>No information " \ - "that ultimately identify this computer will be " \ - "sent.</i>" + "with the HardInfo central database." #define LABEL_SYNC_SYNCING "<big><b>Synchronizing</b></big>\n" \ "This may take some time." @@ -269,7 +267,7 @@ static gboolean _action_check_api_version(SyncDialog *sd, gpointer user_data) return sna->error ? FALSE : TRUE; } -static void _action_send_data_got_response(SoupMessage *msg, gpointer user_data) +static void _action_call_function_got_response(SoupMessage *msg, gpointer user_data) { SyncNetAction *sna = (SyncNetAction *) user_data; gchar *string; @@ -293,24 +291,29 @@ static void _action_send_data_got_response(SoupMessage *msg, gpointer user_data) g_main_quit(loop); } -static gboolean _action_send_data(SyncDialog *sd, gpointer user_data) +static gboolean _action_call_function(SyncDialog *sd, gpointer user_data) { SyncNetAction *sna = (SyncNetAction *) user_data; if (sna->entry) { - gchar *str_data = sna->entry->get_data(); + gchar *str_data = NULL; + + if (sna->entry->get_data) + str_data = sna->entry->get_data(); - if (!_soup_xmlrpc_call_with_parameters("sync.sendData", sna, - _action_send_data_got_response, + if (!_soup_xmlrpc_call_with_parameters("sync.callFunction", sna, + _action_call_function_got_response, VERSION, ARCH, sna->entry->name, str_data, NULL)) { - g_free(str_data); + if (str_data) + g_free(str_data); return FALSE; } - g_free(str_data); + if (str_data) + g_free(str_data); } return sna->error ? FALSE : TRUE; @@ -347,7 +350,7 @@ static SyncNetAction *sync_manager_get_selected_actions(gint *n) SyncEntry *e = (SyncEntry *) entry->data; if (e->selected) { - SyncNetAction sna = { e->fancy_name, _action_send_data, e }; + SyncNetAction sna = { e->fancy_name, _action_call_function, e }; actions[i++] = sna; } @@ -581,7 +584,7 @@ static SyncDialog *sync_dialog_new(void) sd->sna = sync_dialog_netarea_new(); dialog = gtk_dialog_new(); - gtk_window_set_title(GTK_WINDOW(dialog), "SyncManager"); + gtk_window_set_title(GTK_WINDOW(dialog), "Network Updater"); gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); gtk_window_set_default_size(GTK_WINDOW(dialog), 420, 260); gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER_ON_PARENT); diff --git a/hardinfo2/uidefs.xml b/hardinfo2/uidefs.xml index f5cb1376..4ff878e2 100644 --- a/hardinfo2/uidefs.xml +++ b/hardinfo2/uidefs.xml @@ -1,12 +1,13 @@ <ui> <menubar> <menu name="InformationMenu" action="InformationMenuAction"> + <menuitem name="Report" action="ReportAction" /> + <separator/> <menuitem name="Copy" action="CopyAction" /> <menuitem name="SaveGraph" action="SaveGraphAction" /> <separator/> <menuitem name="SyncManager" action="SyncManagerAction" /> - <menuitem name="Report" action="ReportAction" /> - <separator name="LastSep"/> + <separator/> <menuitem name="Quit" action="QuitAction" /> </menu> <menu name="ViewMenu" action="ViewMenuAction"> |