diff options
Diffstat (limited to 'capplet/gsp-app.c')
| -rw-r--r-- | capplet/gsp-app.c | 59 |
1 files changed, 12 insertions, 47 deletions
diff --git a/capplet/gsp-app.c b/capplet/gsp-app.c index 169701f..6c2250a 100644 --- a/capplet/gsp-app.c +++ b/capplet/gsp-app.c @@ -4,6 +4,7 @@ * Copyright (C) 2007, 2009 Vincent Untz. * Copyright (C) 2008 Lucas Rocha. * Copyright (C) 2008 William Jon McCann <[email protected]> + * Copyright (C) 2012-2021 MATE Developers * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,11 +43,10 @@ #define GSP_APP_SAVE_DELAY 2 #define GSP_ASP_SAVE_MASK_HIDDEN 0x0001 -#define GSP_ASP_SAVE_MASK_ENABLED 0x0002 -#define GSP_ASP_SAVE_MASK_NAME 0x0004 -#define GSP_ASP_SAVE_MASK_EXEC 0x0008 -#define GSP_ASP_SAVE_MASK_COMMENT 0x0010 -#define GSP_ASP_SAVE_MASK_DELAY 0x0020 +#define GSP_ASP_SAVE_MASK_NAME 0x0002 +#define GSP_ASP_SAVE_MASK_EXEC 0x0004 +#define GSP_ASP_SAVE_MASK_COMMENT 0x0008 +#define GSP_ASP_SAVE_MASK_DELAY 0x0010 #define GSP_ASP_SAVE_MASK_ALL 0xffff typedef struct { @@ -55,7 +55,6 @@ typedef struct { gboolean hidden; gboolean nodisplay; - gboolean enabled; char *name; char *exec; @@ -90,14 +89,12 @@ enum { static guint gsp_app_signals[LAST_SIGNAL] = { 0 }; - G_DEFINE_TYPE_WITH_PRIVATE (GspApp, gsp_app, G_TYPE_OBJECT) static void gsp_app_dispose (GObject *object); static void gsp_app_finalize (GObject *object); static gboolean _gsp_app_save (gpointer data); - static gboolean _gsp_str_equal (const char *a, const char *b) @@ -117,7 +114,6 @@ _gsp_str_equal (const char *a, return FALSE; } - static void gsp_app_class_init (GspAppClass *class) { @@ -343,10 +339,7 @@ _gsp_app_user_equal_system (GspApp *app, if (gsp_key_file_get_boolean (keyfile, G_KEY_FILE_DESKTOP_KEY_HIDDEN, - FALSE) != priv->hidden || - gsp_key_file_get_boolean (keyfile, - GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED, - TRUE) != priv->enabled) { + FALSE) != priv->hidden) { g_free (path); g_key_file_free (keyfile); return FALSE; @@ -472,12 +465,6 @@ _gsp_app_save (gpointer data) priv->hidden); } - if (priv->save_mask & GSP_ASP_SAVE_MASK_ENABLED) { - gsp_key_file_set_boolean (keyfile, - GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED, - priv->enabled); - } - if (priv->save_mask & GSP_ASP_SAVE_MASK_NAME) { gsp_key_file_set_locale_string (keyfile, G_KEY_FILE_DESKTOP_KEY_NAME, @@ -503,7 +490,7 @@ _gsp_app_save (gpointer data) } _gsp_ensure_user_autostart_dir (); - if (gsp_key_file_to_file (keyfile, priv->path, NULL)) { + if (g_key_file_save_to_file (keyfile, priv->path, NULL)) { priv->skip_next_monitor_event = TRUE; _gsp_app_save_done_success (app); } else { @@ -589,21 +576,9 @@ gsp_app_get_hidden (GspApp *app) return priv->hidden; } -gboolean -gsp_app_get_enabled (GspApp *app) -{ - GspAppPrivate *priv; - - g_return_val_if_fail (GSP_IS_APP (app), FALSE); - - priv = gsp_app_get_instance_private (app); - - return priv->enabled; -} - void -gsp_app_set_enabled (GspApp *app, - gboolean enabled) +gsp_app_set_hidden (GspApp *app, + gboolean hidden) { GspAppPrivate *priv; @@ -611,12 +586,12 @@ gsp_app_set_enabled (GspApp *app, priv = gsp_app_get_instance_private (app); - if (enabled == priv->enabled) { + if (hidden == priv->hidden) { return; } - priv->enabled = enabled; - priv->save_mask |= GSP_ASP_SAVE_MASK_ENABLED; + priv->hidden = hidden; + priv->save_mask |= GSP_ASP_SAVE_MASK_HIDDEN; _gsp_app_queue_save (app); _gsp_app_emit_changed (app); @@ -963,9 +938,6 @@ gsp_app_new (const char *path, priv->hidden = gsp_key_file_get_boolean (keyfile, G_KEY_FILE_DESKTOP_KEY_HIDDEN, FALSE); - priv->enabled = gsp_key_file_get_boolean (keyfile, - GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED, - TRUE); priv->nodisplay = gsp_key_file_get_boolean (keyfile, G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY, FALSE); @@ -1114,7 +1086,6 @@ gsp_app_create (const char *name, priv->basename, NULL); priv->hidden = FALSE; - priv->enabled = TRUE; priv->nodisplay = FALSE; if (!gsm_util_text_is_blank (name)) { @@ -1214,12 +1185,6 @@ gsp_app_copy_desktop_file (const char *uri) priv->save_mask |= GSP_ASP_SAVE_MASK_HIDDEN; } - if (!priv->enabled) { - changed = TRUE; - priv->enabled = TRUE; - priv->save_mask |= GSP_ASP_SAVE_MASK_ENABLED; - } - if (changed) { _gsp_app_queue_save (app); } |