Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue #90 and website URL #352

Merged
merged 2 commits into from
Oct 8, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion remmina-plugins/vnc/vnc_plugin.c
Original file line number Diff line number Diff line change
Expand Up @@ -1510,7 +1510,9 @@ static gboolean remmina_plugin_vnc_on_key(GtkWidget *widget, GdkEventKey *event,
RemminaPluginVncData *gpdata;
RemminaFile *remminafile;
RemminaKeyVal *k;
guint event_keyval;
guint keyval;
int i;

gpdata = (RemminaPluginVncData*) g_object_get_data(G_OBJECT(gp), "plugin-data");
if (!gpdata->connected || !gpdata->client)
Expand All @@ -1519,8 +1521,22 @@ static gboolean remmina_plugin_vnc_on_key(GtkWidget *widget, GdkEventKey *event,
if (remmina_plugin_service->file_get_int(remminafile, "viewonly", FALSE))
return FALSE;

/* When sending key release, try first to find out a previously sent keyval
to workaround bugs like https://bugs.freedesktop.org/show_bug.cgi?id=7430 */

event_keyval = event->keyval;
if ( event->type == GDK_KEY_RELEASE ) {
for (i = 0; i < gpdata->pressed_keys->len; i++) {
k = g_ptr_array_index(gpdata->pressed_keys, i);
if ( k->keycode == event->hardware_keycode ) {
event_keyval = k->keyval;
break;
}
}
}

keyval = remmina_plugin_service->pref_keymap_get_keyval(remmina_plugin_service->file_get_string(remminafile, "keymap"),
event->keyval);
event_keyval);

remmina_plugin_vnc_event_push(gp, REMMINA_PLUGIN_VNC_EVENT_KEY, GUINT_TO_POINTER(keyval),
GINT_TO_POINTER(event->type == GDK_KEY_PRESS ? TRUE : FALSE), NULL);
Expand Down
1 change: 0 additions & 1 deletion remmina/po/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,6 @@ msgstr ""
" Gianfranco Frisani https://launchpad.net/~gfrisani\n"
" Luca Falavigna https://launchpad.net/~dktrkranz\n"
" Milo Casagrande https://launchpad.net/~milo\n"
" Vic https://launchpad.net/~llyzs\n"
" mrktt77 https://launchpad.net/~marketto"

#: remmina/src/remmina_chat_window.c:178
Expand Down
2 changes: 1 addition & 1 deletion remmina/src/remmina_about.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void remmina_about_open(GtkWindow* parent)
gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(dialog), _("The GTK+ Remote Desktop Client")), gtk_about_dialog_set_license(
GTK_ABOUT_DIALOG(dialog), license);
gtk_about_dialog_set_wrap_license(GTK_ABOUT_DIALOG(dialog), TRUE);
gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog), "https://github.com/FreeRDP/Remmina/wiki");
gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog), "http://freerdp.github.io/Remmina/");
gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(dialog), authors);
gtk_about_dialog_set_artists(GTK_ABOUT_DIALOG(dialog), artists);
gtk_about_dialog_set_translator_credits(GTK_ABOUT_DIALOG(dialog), _("translator-credits"));
Expand Down