|
@@ -33,7 +33,7 @@ struct _IridiumWindow
|
|
|
{
|
|
{
|
|
|
GtkApplicationWindow parent_instance;
|
|
GtkApplicationWindow parent_instance;
|
|
|
|
|
|
|
|
- GSettings *settings;
|
|
|
|
|
|
|
+ GSettings *preferences;
|
|
|
|
|
|
|
|
GtkHeaderBar *header_bar;
|
|
GtkHeaderBar *header_bar;
|
|
|
GtkListBox *tag_list;
|
|
GtkListBox *tag_list;
|
|
@@ -287,8 +287,8 @@ on_show (IridiumWindow *self, gpointer user_data)
|
|
|
gchar *password = NULL;
|
|
gchar *password = NULL;
|
|
|
gboolean valid = TRUE;
|
|
gboolean valid = TRUE;
|
|
|
|
|
|
|
|
- server = g_settings_get_string (self->settings, "server");
|
|
|
|
|
- email = g_settings_get_string (self->settings, "email");
|
|
|
|
|
|
|
+ server = g_settings_get_string (self->preferences, "server");
|
|
|
|
|
+ email = g_settings_get_string (self->preferences, "email");
|
|
|
|
|
|
|
|
if (strlen (server) > 0 && strlen (email) > 0) {
|
|
if (strlen (server) > 0 && strlen (email) > 0) {
|
|
|
password = secret_password_lookup_sync (STANDARD_FILE_SCHEMA, NULL, NULL,
|
|
password = secret_password_lookup_sync (STANDARD_FILE_SCHEMA, NULL, NULL,
|
|
@@ -310,8 +310,8 @@ on_show (IridiumWindow *self, gpointer user_data)
|
|
|
secret_password_store_sync (STANDARD_FILE_SCHEMA, NULL,
|
|
secret_password_store_sync (STANDARD_FILE_SCHEMA, NULL,
|
|
|
"Iridium", password, NULL, NULL,
|
|
"Iridium", password, NULL, NULL,
|
|
|
"email", email, "server", server, NULL);
|
|
"email", email, "server", server, NULL);
|
|
|
- g_settings_set_string (self->settings, "server", server);
|
|
|
|
|
- g_settings_set_string (self->settings, "email", email);
|
|
|
|
|
|
|
+ g_settings_set_string (self->preferences, "server", server);
|
|
|
|
|
+ g_settings_set_string (self->preferences, "email", email);
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
valid = FALSE;
|
|
valid = FALSE;
|
|
@@ -348,7 +348,7 @@ iridium_window_dispose (GObject *object)
|
|
|
g_clear_object (&self->content_binding);
|
|
g_clear_object (&self->content_binding);
|
|
|
g_clear_object (&self->markdown);
|
|
g_clear_object (&self->markdown);
|
|
|
g_clear_object (&self->client);
|
|
g_clear_object (&self->client);
|
|
|
- g_clear_object (&self->settings);
|
|
|
|
|
|
|
+ g_clear_object (&self->preferences);
|
|
|
G_OBJECT_CLASS (iridium_window_parent_class)->dispose (object);
|
|
G_OBJECT_CLASS (iridium_window_parent_class)->dispose (object);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -400,7 +400,7 @@ iridium_window_init (IridiumWindow *self)
|
|
|
|
|
|
|
|
gtk_widget_init_template (GTK_WIDGET (self));
|
|
gtk_widget_init_template (GTK_WIDGET (self));
|
|
|
|
|
|
|
|
- self->settings = g_settings_new ("net.bloerg.Iridium");
|
|
|
|
|
|
|
+ self->preferences = g_settings_new ("net.bloerg.iridium.preferences");
|
|
|
self->title_binding = NULL;
|
|
self->title_binding = NULL;
|
|
|
self->content_binding = NULL;
|
|
self->content_binding = NULL;
|
|
|
self->markdown = iridium_markdown_new ();
|
|
self->markdown = iridium_markdown_new ();
|