[gnome-panel/wip/muktupavels/default-layout: 7/9] layout: rename panel-default-layout.layout to default.layout



commit 4c3250af0381241634ac46639f29ed5ee1598232
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Dec 16 14:58:21 2019 +0200

    layout: rename panel-default-layout.layout to default.layout

 data/Makefile.am                                     | 2 +-
 data/{panel-default-layout.layout => default.layout} | 0
 gnome-panel/panel-layout.c                           | 6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 704bd7479..5d8d1ae7a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -24,7 +24,7 @@ gsettings_SCHEMAS = \
 @GSETTINGS_RULES@
 
 default_layoutdir   = $(datadir)/gnome-panel/layouts
-default_layout_DATA = panel-default-layout.layout
+default_layout_DATA = default.layout
 
 EXTRA_DIST = \
        $(gsettings_SCHEMAS) \
diff --git a/data/panel-default-layout.layout b/data/default.layout
similarity index 100%
rename from data/panel-default-layout.layout
rename to data/default.layout
diff --git a/gnome-panel/panel-layout.c b/gnome-panel/panel-layout.c
index d85771735..3de5a4e24 100644
--- a/gnome-panel/panel-layout.c
+++ b/gnome-panel/panel-layout.c
@@ -45,7 +45,7 @@ static GSettings *layout_settings = NULL;
 
 #define PANEL_LAYOUT_ERROR panel_layout_error_quark ()
 
-#define PANEL_LAYOUT_DEFAULT_LAYOUT_FILE "panel-default-layout.layout"
+#define DEFAULT_LAYOUT_FILE "default.layout"
 #define PANEL_LAYOUT_INSTANCE_CONFIG_SUBPATH "@instance-config/"
 
 static void panel_layout_load_toplevel    (const char *toplevel_id);
@@ -1083,7 +1083,7 @@ panel_layout_get_default_layout_file (void)
         user_file = g_build_filename (g_get_user_config_dir (),
                                       "gnome-panel",
                                       "layouts",
-                                      PANEL_LAYOUT_DEFAULT_LAYOUT_FILE,
+                                      DEFAULT_LAYOUT_FILE,
                                       NULL);
 
         if (g_file_test (user_file, G_FILE_TEST_IS_REGULAR))
@@ -1092,7 +1092,7 @@ panel_layout_get_default_layout_file (void)
         g_free (user_file);
 
         return g_build_filename (LAYOUTSDIR,
-                                 PANEL_LAYOUT_DEFAULT_LAYOUT_FILE,
+                                 DEFAULT_LAYOUT_FILE,
                                  NULL);
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]