diff options
| -rw-r--r-- | plugins/rdp/rdp_plugin.c | 3 | ||||
| -rw-r--r-- | plugins/vnc/vnc_plugin.c | 5 | ||||
| -rw-r--r-- | src/remmina_file_editor.c | 9 |
3 files changed, 7 insertions, 10 deletions
diff --git a/plugins/rdp/rdp_plugin.c b/plugins/rdp/rdp_plugin.c index 0a310f767..4d18132e9 100644 --- a/plugins/rdp/rdp_plugin.c +++ b/plugins/rdp/rdp_plugin.c @@ -1400,9 +1400,10 @@ static gboolean remmina_rdp_main(RemminaProtocolWidget *gp) } - if (!freerdp_assistance_populate_settings_from_assistance_file(file, rfi->settings)) + if (!freerdp_assistance_populate_settings_from_assistance_file(file, rfi->settings)){ REMMINA_PLUGIN_DEBUG("Could not populate settings from assistance file"); return FALSE; + } } diff --git a/plugins/vnc/vnc_plugin.c b/plugins/vnc/vnc_plugin.c index 7749c80c2..633a2a921 100644 --- a/plugins/vnc/vnc_plugin.c +++ b/plugins/vnc/vnc_plugin.c @@ -1915,7 +1915,6 @@ static gboolean remmina_plugin_vnc_on_size_allocate(GtkWidget *widget, GtkAlloca sprintf(str, "DEBUG: %d x %d", alloc->width, alloc->height); TRACE_CALL(str); if (gpdata->client){ - rfbClient *cl; SendExtDesktopSize(gpdata->client, alloc->width, alloc->height); } } @@ -1980,9 +1979,9 @@ static void remmina_plugin_vnc_init(RemminaProtocolWidget *gp) if (aspect_ratio > 0){ GtkWidget* aspectframe = gtk_aspect_frame_new(NULL, 0, 0, aspect_ratio, FALSE); - gtk_frame_set_shadow_type(aspectframe, GTK_SHADOW_NONE); + gtk_frame_set_shadow_type(GTK_FRAME(aspectframe), GTK_SHADOW_NONE); gtk_widget_show(aspectframe); - gtk_container_add(aspectframe, gpdata->drawing_area); + gtk_container_add(GTK_CONTAINER(aspectframe), gpdata->drawing_area); gtk_container_add(GTK_CONTAINER(gp), aspectframe); } else{ diff --git a/src/remmina_file_editor.c b/src/remmina_file_editor.c index 719b092e2..ccd8e984a 100644 --- a/src/remmina_file_editor.c +++ b/src/remmina_file_editor.c @@ -376,7 +376,6 @@ static void remmina_file_editor_assistance_enabled_check_on_toggled(GtkToggleBut RemminaFileEditor *gfe) { TRACE_CALL(__func__); - RemminaFileEditorPriv *priv = gfe->priv; gboolean enabled = TRUE; if (gfe->priv->assistance_toggle) { @@ -650,16 +649,14 @@ static void remmina_file_editor_create_assistance(RemminaFileEditor *gfe, const { TRACE_CALL(__func__); GtkWidget *widget; - int assistance_mode; - assistance_mode = remmina_file_get_int(gfe->priv->remmina_file, "assistance_mode", 0); widget = gtk_toggle_button_new_with_label(_("Assistance Mode")); gtk_widget_set_halign(widget, GTK_ALIGN_START); gtk_widget_show(widget); gtk_grid_attach(GTK_GRID(grid), widget, 0, row, 1, 1); - gtk_toggle_button_set_active(widget, remmina_file_get_int(gfe->priv->remmina_file, "assistance_mode", 0)); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), remmina_file_get_int(gfe->priv->remmina_file, "assistance_mode", 0)); gfe->priv->assistance_toggle = widget; g_signal_connect(widget, "toggled", G_CALLBACK(remmina_file_editor_assistance_enabled_check_on_toggled), gfe); @@ -1764,8 +1761,8 @@ static GError *remmina_file_editor_update(RemminaFileEditor * gfe, if (priv->assistance_toggle){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->assistance_toggle))) { - remmina_file_set_string(priv->remmina_file, "assistance_file", gtk_entry_get_text(priv->assistance_file)); - remmina_file_set_string(priv->remmina_file, "assistance_pass", gtk_entry_get_text(priv->assistance_password)); + remmina_file_set_string(priv->remmina_file, "assistance_file", gtk_entry_get_text(GTK_ENTRY(priv->assistance_file))); + remmina_file_set_string(priv->remmina_file, "assistance_pass", gtk_entry_get_text(GTK_ENTRY(priv->assistance_password))); remmina_file_set_int(priv->remmina_file, "assistance_mode", 1); }else{ remmina_file_set_int(priv->remmina_file, "assistance_mode", 0); |