[gnome-panel/wip/muktupavels/default-layout: 6/9] layout: use layouts dir for layout files
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel/wip/muktupavels/default-layout: 6/9] layout: use layouts dir for layout files
- Date: Mon, 16 Dec 2019 15:36:25 +0000 (UTC)
commit 41b95b361049d1a6ba17c34b47d472f0dd2fe8d9
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Mon Dec 16 14:55:18 2019 +0200
layout: use layouts dir for layout files
data/Makefile.am | 2 +-
data/pkgconfig/libgnome-panel.pc.in | 1 +
gnome-panel/Makefile.am | 2 +-
gnome-panel/panel-layout.c | 9 ++++++---
4 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 7648a829e..704bd7479 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -23,7 +23,7 @@ gsettings_SCHEMAS = \
@GSETTINGS_RULES@
-default_layoutdir = $(datadir)/gnome-panel
+default_layoutdir = $(datadir)/gnome-panel/layouts
default_layout_DATA = panel-default-layout.layout
EXTRA_DIST = \
diff --git a/data/pkgconfig/libgnome-panel.pc.in b/data/pkgconfig/libgnome-panel.pc.in
index 812542b24..569c72a03 100644
--- a/data/pkgconfig/libgnome-panel.pc.in
+++ b/data/pkgconfig/libgnome-panel.pc.in
@@ -2,6 +2,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+layoutsdir=@datadir@/gnome-panel/layouts
modulesdir=@libdir@/gnome-panel/modules
Name: libgnome-panel
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 4377c0c8b..aaf807474 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -94,8 +94,8 @@ gnome_panel_CPPFLAGS = \
gnome_panel_CFLAGS = \
-DGMENU_I_KNOW_THIS_IS_UNSTABLE \
-DGNOME_DESKTOP_USE_UNSTABLE_API \
+ -DLAYOUTSDIR=\""$(datadir)/gnome-panel/layouts"\" \
-DMODULESDIR=\""$(libdir)/gnome-panel/modules"\" \
- -DPANELDATADIR=\""$(datadir)/gnome-panel"\" \
-DGNOMELOCALEDIR=\""$(localedir)"\" \
-I$(srcdir) \
-I$(top_builddir)/gnome-panel \
diff --git a/gnome-panel/panel-layout.c b/gnome-panel/panel-layout.c
index 20798dc7a..d85771735 100644
--- a/gnome-panel/panel-layout.c
+++ b/gnome-panel/panel-layout.c
@@ -38,7 +38,6 @@
#include "panel-object-loader.h"
#include "panel-schemas.h"
#include "panel-toplevel.h"
-#include "panel-util.h"
#include "panel-layout.h"
@@ -1081,14 +1080,18 @@ panel_layout_get_default_layout_file (void)
{
char *user_file;
- user_file = panel_util_get_from_personal_path (PANEL_LAYOUT_DEFAULT_LAYOUT_FILE);
+ user_file = g_build_filename (g_get_user_config_dir (),
+ "gnome-panel",
+ "layouts",
+ PANEL_LAYOUT_DEFAULT_LAYOUT_FILE,
+ NULL);
if (g_file_test (user_file, G_FILE_TEST_IS_REGULAR))
return user_file;
g_free (user_file);
- return g_build_filename (PANELDATADIR,
+ return g_build_filename (LAYOUTSDIR,
PANEL_LAYOUT_DEFAULT_LAYOUT_FILE,
NULL);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]