diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2018-04-30 23:14:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 23:14:58 +0300 |
| commit | 2bcaebdbe4fcb1cae7b742f2af905c158a29a06a (patch) | |
| tree | 10542007774ef55a436c22c83b68e0f445a6a4cc | |
| parent | 19d843b796573f06ab82ce36c31538e004c67207 (diff) | |
| parent | aba9098660852cde5370198e1f620143aa16839d (diff) | |
Merge pull request #1592 from larchunix/deprecation-fixes
GTK deprecation fixes
| -rw-r--r-- | flatpak/Dockerfile | 2 | ||||
| -rw-r--r-- | remmina/src/remmina_pref_dialog.c | 6 | ||||
| -rw-r--r-- | remmina/src/remmina_protocol_widget.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/flatpak/Dockerfile b/flatpak/Dockerfile index 46cb6595c..25fcb47ad 100644 --- a/flatpak/Dockerfile +++ b/flatpak/Dockerfile @@ -1,5 +1,5 @@ FROM fedora:latest -RUN dnf install -yq flatpak flatpak-builder xz +RUN dnf install -yq flatpak flatpak-builder git xz RUN adduser -U -m user USER user WORKDIR /home/user diff --git a/remmina/src/remmina_pref_dialog.c b/remmina/src/remmina_pref_dialog.c index f0e144232..e5678c86e 100644 --- a/remmina/src/remmina_pref_dialog.c +++ b/remmina/src/remmina_pref_dialog.c @@ -240,7 +240,7 @@ void remmina_pref_on_dialog_destroy(GtkWidget *widget, gpointer user_data) if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_terminal_font_system))) { remmina_pref.vte_font = NULL; }else { - remmina_pref.vte_font = g_strdup(gtk_font_button_get_font_name(remmina_pref_dialog->fontbutton_terminal_font)); + remmina_pref.vte_font = g_strdup(gtk_font_chooser_get_font(GTK_FONT_CHOOSER(remmina_pref_dialog->fontbutton_terminal_font))); } remmina_pref.vte_allow_bold_text = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_terminal_bold)); gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_foreground), &color); @@ -410,9 +410,9 @@ static void remmina_pref_dialog_init(void) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_terminal_font_system), TRUE); } if (remmina_pref.vte_font && remmina_pref.vte_font[0]) { - gtk_font_button_set_font_name(remmina_pref_dialog->fontbutton_terminal_font, remmina_pref.vte_font); + gtk_font_chooser_set_font(GTK_FONT_CHOOSER(remmina_pref_dialog->fontbutton_terminal_font), remmina_pref.vte_font); }else { - gtk_font_button_set_font_name(remmina_pref_dialog->fontbutton_terminal_font, "Monospace 12"); + gtk_font_chooser_set_font(GTK_FONT_CHOOSER(remmina_pref_dialog->fontbutton_terminal_font), "Monospace 12"); gtk_widget_set_sensitive(GTK_WIDGET(remmina_pref_dialog->fontbutton_terminal_font), FALSE); } gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_terminal_bold), remmina_pref.vte_allow_bold_text); diff --git a/remmina/src/remmina_protocol_widget.c b/remmina/src/remmina_protocol_widget.c index d332a0dcc..5f7e2dc54 100644 --- a/remmina/src/remmina_protocol_widget.c +++ b/remmina/src/remmina_protocol_widget.c @@ -361,7 +361,7 @@ void remmina_protocol_widget_send_keystrokes(RemminaProtocolWidget* gp, GtkMenuI gchar *keystrokes = g_object_get_data(G_OBJECT(widget), "keystrokes"); guint *keyvals; gint i; - GdkKeymap *keymap = gdk_keymap_get_default(); + GdkKeymap *keymap = gdk_keymap_get_for_display(gdk_display_get_default()); gchar *iter = keystrokes; gunichar character; guint keyval; @@ -1231,8 +1231,8 @@ void remmina_protocol_widget_send_keys_signals(GtkWidget *widget, const guint *k TRACE_CALL(__func__); int i; GdkEventKey event; - GdkKeymap *keymap = gdk_keymap_get_default(); gboolean result; + GdkKeymap *keymap = gdk_keymap_get_for_display(gdk_display_get_default()); event.window = gtk_widget_get_window(widget); event.send_event = TRUE; |