Commit b79d4f13 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

gsettings: fix always-show-tabs leftover

parent 255986ee
......@@ -147,9 +147,7 @@ vinagre_notebook_show_hide_tabs (VinagreNotebook *nb)
fs = vinagre_window_is_fullscreen (nb->priv->window);
n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (nb));
g_object_get (vinagre_prefs_get_default (),
"always-show-tabs", &always,
NULL);
always = g_settings_get_boolean (vinagre_prefs_get_default_gsettings (), "always-show-tabs");
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nb),
((n > 1) || (always)) && !fs);
......@@ -415,8 +413,9 @@ vinagre_notebook_init (VinagreNotebook *nb)
"switch-page",
G_CALLBACK (vinagre_notebook_page_switched),
NULL);
g_signal_connect_swapped (vinagre_prefs_get_default (),
"notify::always-show-tabs",
g_signal_connect_swapped (vinagre_prefs_get_default_gsettings (),
"changed::always-show-tabs",
G_CALLBACK (vinagre_notebook_show_hide_tabs),
nb);
}
......
......@@ -238,8 +238,8 @@ vinagre_prefs_dialog_show (VinagreWindow *window)
dialog->show_accels = GTK_WIDGET (gtk_builder_get_object (dialog->xml, "show_accels_check"));
pref = vinagre_prefs_get_default ();
g_settings_bind (pref->priv->gsettings, "always-show-tabs", dialog->show_tabs, "active", G_SETTINGS_BIND_DEFAULT);
g_settings_bind (pref->priv->gsettings, "show-accels", dialog->show_accels, "active", G_SETTINGS_BIND_DEFAULT);
g_settings_bind (pref->priv->gsettings, VM_ALWAYS_SHOW_TABS, dialog->show_tabs, "active", G_SETTINGS_BIND_DEFAULT);
g_settings_bind (pref->priv->gsettings, VM_SHOW_ACCELS, dialog->show_accels, "active", G_SETTINGS_BIND_DEFAULT);
g_signal_connect (dialog->dialog,
"response",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment