diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2018-07-31 01:23:28 +0300 |
|---|---|---|
| committer | Antenore Gatta <antenore@simbiosi.org> | 2018-07-31 01:23:28 +0300 |
| commit | 1f510250dfb0fc754839a71a241172f124fdd3d8 (patch) | |
| tree | d3588965a8bdf3e726e23dbc85e3d5dcb1e71655 | |
| parent | 6b002528799961c34e51596001f6ca683671dd4a (diff) | |
| parent | 16ecb49f5eb6434256342cfa676a4e2c7c3ea9fb (diff) | |
Merge branch 'master' of gitlab.com:Remmina/Remmina
| -rw-r--r-- | data/desktop/remmina-gnome-desktop.1 | 0 | ||||
| -rw-r--r-- | plugins/rdp/rdp_plugin.c | 6 | ||||
| -rw-r--r-- | src/remmina_connection_window.c | 13 |
3 files changed, 13 insertions, 6 deletions
diff --git a/data/desktop/remmina-gnome-desktop.1 b/data/desktop/remmina-gnome-desktop.1 new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/data/desktop/remmina-gnome-desktop.1 diff --git a/plugins/rdp/rdp_plugin.c b/plugins/rdp/rdp_plugin.c index 5a88a2a54..ce3b879a1 100644 --- a/plugins/rdp/rdp_plugin.c +++ b/plugins/rdp/rdp_plugin.c @@ -286,6 +286,9 @@ BOOL rf_end_paint(rdpContext* context) gdi = context->gdi; rfi = (rfContext*)context; + if (gdi->primary->hdc->hwnd->invalid->null) + return TRUE; + x = gdi->primary->hdc->hwnd->invalid->x; y = gdi->primary->hdc->hwnd->invalid->y; w = gdi->primary->hdc->hwnd->invalid->w; @@ -300,6 +303,9 @@ BOOL rf_end_paint(rdpContext* context) remmina_rdp_event_queue_ui_async(rfi->protocol_widget, ui); + gdi->primary->hdc->hwnd->invalid->null = TRUE; + gdi->primary->hdc->hwnd->ninvalid = 0; + return TRUE; } diff --git a/src/remmina_connection_window.c b/src/remmina_connection_window.c index 4bfb83b82..d2582707b 100644 --- a/src/remmina_connection_window.c +++ b/src/remmina_connection_window.c @@ -1897,7 +1897,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); gtk_widget_show(GTK_WIDGET(toolitem)); priv->toolitem_fullscreen = toolitem; - if (kioskmode && kioskmode == TRUE) { + if (kioskmode) { gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(toolitem), FALSE); } else { gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(toolitem), mode != SCROLLED_WINDOW_MODE); @@ -1948,9 +1948,6 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m toolitem = gtk_separator_tool_item_new(); gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); gtk_widget_show(GTK_WIDGET(toolitem)); - if (!kioskmode && kioskmode == FALSE) { - gtk_widget_set_sensitive(GTK_WIDGET(toolitem), FALSE); - } /* Dynamic Resolution Update */ toolitem = gtk_toggle_tool_button_new(); @@ -2042,7 +2039,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); gtk_widget_show(GTK_WIDGET(toolitem)); g_signal_connect(G_OBJECT(toolitem), "clicked", G_CALLBACK(remmina_connection_holder_toolbar_minimize), cnnhld); - if (!kioskmode && kioskmode == FALSE) { + if (kioskmode) { gtk_widget_set_sensitive(GTK_WIDGET(toolitem), FALSE); } @@ -2104,7 +2101,11 @@ static void remmina_connection_holder_update_toolbar(RemminaConnectionHolder* cn remmina_connection_holder_update_toolbar_autofit_button(cnnhld); toolitem = priv->toolitem_switch_page; - bval = (gtk_notebook_get_n_pages(GTK_NOTEBOOK(priv->notebook)) > 1); + if (kioskmode) { + bval = FALSE; + } else { + bval = (gtk_notebook_get_n_pages(GTK_NOTEBOOK(priv->notebook)) > 1); + } gtk_widget_set_sensitive(GTK_WIDGET(toolitem), bval); scalemode = get_current_allowed_scale_mode(cnnobj, &dynres_avail, &scale_avail); |