Commit d30b2346 authored by Tobias Bernard's avatar Tobias Bernard

Merge branch 'master' of github.com:frac-tion/teleport

parents 9c228fa6 1d1f15e4
......@@ -97,8 +97,14 @@ teleport_window_init (TeleportWindow *win)
gtk_menu_button_set_popover(GTK_MENU_BUTTON (priv->gears), menu);
gtk_label_set_text (GTK_LABEL (priv->this_device_name_label),
g_settings_get_string (priv->settings, "device-name"));
g_settings_bind (priv->settings, "device-name",
priv->this_device_name_label, "label",
G_SETTINGS_BIND_DEFAULT);
/*gtk_label_set_text (GTK_LABEL (priv->this_device_name_label),
g_settings_get_string (priv->settings, "device-name"));
*/
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (downloadDir),
g_settings_get_string(priv->settings,
......
......@@ -3,7 +3,7 @@
<!-- interface-requires gtk+ 3.8 -->
<template class="TeleportWindow" parent="GtkApplicationWindow">
<property name="title" translatable="yes">Teleport</property>
<property name="default_width">700</property>
<property name="default_width">650</property>
<property name="default_height">500</property>
<child>
<object class="GtkAdjustment" id="adjustment1">
......@@ -133,7 +133,7 @@
</style>
<child>
<object class="GtkMenuButton" id="this-device-settings-button">
<property name="visible">True</property>
<property name="visible">False</property>
<property name="can_focus">True</property>
<property name="use-popover">True</property>
<property name="height_request">35</property>
......
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