[solang] PACKAGE_DATA_DIR should be $(pkgdatadir) and use G_DIR_SEPARATOR_S
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [solang] PACKAGE_DATA_DIR should be $(pkgdatadir) and use G_DIR_SEPARATOR_S
- Date: Sat, 20 Mar 2010 23:44:04 +0000 (UTC)
commit 1ecd982cffe48e3ee824032abc10d230e8a0a40d
Author: Debarshi Ray <rishi gnu org>
Date: Sat Mar 20 22:11:59 2010 +0200
PACKAGE_DATA_DIR should be $(pkgdatadir) and use G_DIR_SEPARATOR_S
src/application/application.cpp | 30 +++++++++++++++---------------
src/application/main-window.cpp | 2 --
src/application/main.cpp | 4 ++--
src/attribute/date-manager.cpp | 2 +-
src/attribute/modification-date.cpp | 4 +++-
src/attribute/property-manager.cpp | 2 +-
src/attribute/search-basket.cpp | 2 +-
src/attribute/search-manager.cpp | 2 +-
src/attribute/tag-manager.cpp | 27 ++++++++++++++++-----------
src/attribute/tag.cpp | 4 +++-
src/build-flags.mk | 3 ++-
src/common/exif-data-key.cpp | 4 +++-
src/editor/editor.cpp | 2 +-
src/importer/camera-source.cpp | 25 +++++++++++++------------
src/importer/flickr-source.cpp | 7 ++++---
src/importer/importer.cpp | 4 ++--
src/renderer/browser-renderer.cpp | 27 ++++++++++++++-------------
src/renderer/enlarged-renderer.cpp | 20 ++++++++++----------
src/renderer/slideshow-renderer.cpp | 2 +-
src/renderer/slideshow-window.cpp | 2 +-
src/renderer/thumbnail-view.cpp | 2 +-
21 files changed, 95 insertions(+), 82 deletions(-)
---
diff --git a/src/application/application.cpp b/src/application/application.cpp
index ac506e0..b2eb372 100644
--- a/src/application/application.cpp
+++ b/src/application/application.cpp
@@ -369,33 +369,33 @@ Application::add_icons() throw()
Gtk::IconSource icon_source;
Gtk::IconSet icon_set_slideshow_play;
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/slideshow-play-16.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "slideshow-play-16.png");
icon_source.set_size(Gtk::IconSize(16));
icon_set_slideshow_play.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/slideshow-play-22.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "slideshow-play-22.png");
icon_source.set_size(Gtk::IconSize(22));
icon_set_slideshow_play.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/slideshow-play-24.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "slideshow-play-24.png");
icon_source.set_size(Gtk::IconSize(24));
icon_set_slideshow_play.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/slideshow-play-32.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "slideshow-play-32.png");
icon_source.set_size(Gtk::IconSize(32));
icon_set_slideshow_play.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/slideshow-play-48.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "slideshow-play-48.png");
icon_source.set_size(Gtk::IconSize(48));
icon_set_slideshow_play.add_source(icon_source);
diff --git a/src/application/main-window.cpp b/src/application/main-window.cpp
index 9402270..251dd8c 100644
--- a/src/application/main-window.cpp
+++ b/src/application/main-window.cpp
@@ -182,12 +182,10 @@ const std::string MainWindow::copyingFile_
const std::string MainWindow::layoutFile_
= PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
- PACKAGE_TARNAME G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-layout.xml";
const std::string MainWindow::uiFile_
= PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
- PACKAGE_TARNAME G_DIR_SEPARATOR_S
"ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME".ui";
diff --git a/src/application/main.cpp b/src/application/main.cpp
index 47af29d..111f0f0 100644
--- a/src/application/main.cpp
+++ b/src/application/main.cpp
@@ -51,8 +51,8 @@ main(int argc, char *argv[])
Gtk::Main kit(argc, argv, true);
const Solang::IconThemePtr icon_theme = Gtk::IconTheme::get_default();
- icon_theme->append_search_path(
- PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "icons");
+ icon_theme->append_search_path(DATA_DIR G_DIR_SEPARATOR_S
+ "icons");
Solang::Application application(argc, argv);
diff --git a/src/attribute/date-manager.cpp b/src/attribute/date-manager.cpp
index 5d47739..8e5ad81 100644
--- a/src/attribute/date-manager.cpp
+++ b/src/attribute/date-manager.cpp
@@ -35,7 +35,7 @@ namespace Solang
{
static const std::string uiFile
- = PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/ui/"
+ = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-property-manager.ui";
DateManager::DateManager() throw() :
diff --git a/src/attribute/modification-date.cpp b/src/attribute/modification-date.cpp
index 4cc5383..1a028c0 100644
--- a/src/attribute/modification-date.cpp
+++ b/src/attribute/modification-date.cpp
@@ -77,7 +77,9 @@ Glib::ustring
ModificationDate::get_criteria_icon_path() const throw()
{
//TBD::CORRECT
- return PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/pixmaps/tag-16.png";
+ return PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "tag-16.png";
}
} // namespace Solang
diff --git a/src/attribute/property-manager.cpp b/src/attribute/property-manager.cpp
index 0e57fc9..046aa79 100644
--- a/src/attribute/property-manager.cpp
+++ b/src/attribute/property-manager.cpp
@@ -34,7 +34,7 @@ namespace Solang
{
static const std::string uiFile
- = PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/ui/"
+ = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-property-manager.ui";
PropertyManager::PropertyManager() throw() :
diff --git a/src/attribute/search-basket.cpp b/src/attribute/search-basket.cpp
index 4f13494..b6c0fe0 100644
--- a/src/attribute/search-basket.cpp
+++ b/src/attribute/search-basket.cpp
@@ -26,7 +26,7 @@ namespace Solang
{
const std::string SearchBasket::uiFile_
- = PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/ui/"
+ = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-search-basket.ui";
SearchBasket::SearchBasket(const TreeModelPtr & model) throw() :
diff --git a/src/attribute/search-manager.cpp b/src/attribute/search-manager.cpp
index 58d0d28..126a4af 100644
--- a/src/attribute/search-manager.cpp
+++ b/src/attribute/search-manager.cpp
@@ -38,7 +38,7 @@ namespace Solang
{
const std::string SearchManager::uiFile_
- = PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/ui/"
+ = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-search-manager.ui";
SearchManager::SearchManager() throw() :
diff --git a/src/attribute/tag-manager.cpp b/src/attribute/tag-manager.cpp
index 180dfd9..2e5f79c 100644
--- a/src/attribute/tag-manager.cpp
+++ b/src/attribute/tag-manager.cpp
@@ -38,7 +38,7 @@ namespace Solang
{
static const std::string uiFile
- = PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/ui/"
+ = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-tag-manager.ui";
TagManager::TagManager() throw() :
@@ -62,30 +62,35 @@ TagManager::TagManager() throw() :
Gtk::IconSource icon_source;
Gtk::IconSet icon_set_tag;
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/pixmaps/tag-16.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "tag-16.png");
icon_source.set_size(Gtk::IconSize(16));
icon_set_tag.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/pixmaps/tag-22.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "tag-22.png");
icon_source.set_size(Gtk::IconSize(22));
icon_set_tag.add_source(icon_source);
Gtk::IconSet icon_set_tag_new;
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/pixmaps/tag-new-16.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "tag-new-16.png");
icon_source.set_size(Gtk::IconSize(16));
icon_set_tag_new.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/pixmaps/tag-new-22.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "tag-new-22.png");
icon_source.set_size(Gtk::IconSize(22));
icon_set_tag_new.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/pixmaps/tag-new-24.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "tag-new-24.png");
icon_source.set_size(Gtk::IconSize(24));
icon_set_tag_new.add_source(icon_source);
diff --git a/src/attribute/tag.cpp b/src/attribute/tag.cpp
index 1bc56d8..780620f 100644
--- a/src/attribute/tag.cpp
+++ b/src/attribute/tag.cpp
@@ -175,7 +175,9 @@ Tag::get_criteria_description() const throw()
Glib::ustring
Tag::get_criteria_icon_path() const throw()
{
- return PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/pixmaps/tag-16.png";
+ return PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "tag-16.png";
}
const std::string &
diff --git a/src/build-flags.mk b/src/build-flags.mk
index 6d8945e..3bf3aa6 100644
--- a/src/build-flags.mk
+++ b/src/build-flags.mk
@@ -8,9 +8,10 @@ SOLANG_CFLAGS = \
-I$(top_srcdir)/src/renderer
AM_CPPFLAGS = \
+ -DDATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\" \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \
-DPACKAGE_DOC_DIR=\""$(docdir)"\" \
$(SOLANG_CFLAGS) \
$(BABL_CFLAGS) \
diff --git a/src/common/exif-data-key.cpp b/src/common/exif-data-key.cpp
index 5fc3580..74fa53f 100644
--- a/src/common/exif-data-key.cpp
+++ b/src/common/exif-data-key.cpp
@@ -36,7 +36,9 @@ Glib::ustring
ExifDataKey::get_criteria_icon_path() const throw()
{
//TBD::CORRECT
- return PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/pixmaps/tag-16.png";
+ return PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "tag-16.png";
}
}
diff --git a/src/editor/editor.cpp b/src/editor/editor.cpp
index 610d0de..d583c23 100644
--- a/src/editor/editor.cpp
+++ b/src/editor/editor.cpp
@@ -94,7 +94,7 @@ OperationFactory<T>::create() throw()
}
const std::string Editor::uiFile_
- = PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/ui/"
+ = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-editor.ui";
Editor::Editor() throw() :
diff --git a/src/importer/camera-source.cpp b/src/importer/camera-source.cpp
index 04a2623..6d3ea7b 100644
--- a/src/importer/camera-source.cpp
+++ b/src/importer/camera-source.cpp
@@ -1,5 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
/*
+ * Copyright (C) 2010 Debarshi Ray <rishi gnu org>
* Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
*
* Solang is free software: you can redistribute it and/or modify it
@@ -50,27 +51,27 @@ CameraSource::CameraSource() throw()
Gtk::IconSource icon_source;
Gtk::IconSet icon_set_camera_photo;
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/camera-photo-16.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "camera-photo-16.png");
icon_source.set_size(Gtk::IconSize(16));
icon_set_camera_photo.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/camera-photo-22.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "camera-photo-22.png");
icon_source.set_size(Gtk::IconSize(22));
icon_set_camera_photo.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/camera-photo-24.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "camera-photo-24.png");
icon_source.set_size(Gtk::IconSize(24));
icon_set_camera_photo.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/camera-photo-32.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "camera-photo-32.png");
icon_source.set_size(Gtk::IconSize(32));
icon_set_camera_photo.add_source(icon_source);
diff --git a/src/importer/flickr-source.cpp b/src/importer/flickr-source.cpp
index 82bbc1d..ddc3d6d 100644
--- a/src/importer/flickr-source.cpp
+++ b/src/importer/flickr-source.cpp
@@ -1,6 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
/*
- * Copyright (C) 2009 Debarshi Ray <rishi gnu org>
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
*
* Solang is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -359,8 +359,9 @@ FlickrSource::FlickrSource() throw() :
Gtk::IconSource icon_source;
Gtk::IconSet icon_set_flickr;
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/pixmaps/flickr.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "flickr.png");
icon_source.set_size(Gtk::IconSize(24));
icon_set_flickr.add_source(icon_source);
diff --git a/src/importer/importer.cpp b/src/importer/importer.cpp
index 9014f27..5d3a1f4 100644
--- a/src/importer/importer.cpp
+++ b/src/importer/importer.cpp
@@ -1,6 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
/*
- * Copyright (C) 2009 Debarshi Ray <rishi gnu org>
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
* Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
*
* Solang is free software: you can redistribute it and/or modify it
@@ -38,7 +38,7 @@ namespace Solang
{
static const std::string uiFile
- = PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/ui/"
+ = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-importer.ui";
Importer::Importer(const IPhotoSourcePtr & photo_source, bool standard)
diff --git a/src/renderer/browser-renderer.cpp b/src/renderer/browser-renderer.cpp
index f3790ae..ad2b3a3 100644
--- a/src/renderer/browser-renderer.cpp
+++ b/src/renderer/browser-renderer.cpp
@@ -58,10 +58,10 @@ static const double ratioHeight
/ static_cast<double>(initialZoomValue);
static const std::string uiFile
- = PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/ui/"
+ = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-browser-renderer.ui";
static const std::string uiFileThumbnail
- = PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/ui/"
+ = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-browser-renderer-thumbnail.ui";
BrowserRenderer::BrowserRenderer() throw() :
@@ -98,26 +98,27 @@ BrowserRenderer::BrowserRenderer() throw() :
Gtk::IconSource icon_source;
Gtk::IconSet icon_set_mode_browse;
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/mode-browse-16.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "mode-browse-16.png");
icon_source.set_size(Gtk::IconSize(16));
icon_set_mode_browse.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/mode-browse-22.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "mode-browse-22.png");
icon_source.set_size(Gtk::IconSize(22));
icon_set_mode_browse.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/pixmaps/tag-new-24.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "tag-new-24.png");
icon_source.set_size(Gtk::IconSize(24));
icon_set_mode_browse.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/mode-browse-32.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "mode-browse-32.png");
icon_source.set_size(Gtk::IconSize(32));
icon_set_mode_browse.add_source(icon_source);
diff --git a/src/renderer/enlarged-renderer.cpp b/src/renderer/enlarged-renderer.cpp
index 60230bb..d14b85d 100644
--- a/src/renderer/enlarged-renderer.cpp
+++ b/src/renderer/enlarged-renderer.cpp
@@ -40,7 +40,7 @@ namespace Solang
{
static const std::string uiFile
- = PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/ui/"
+ = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-enlarged-renderer.ui";
static void
@@ -82,21 +82,21 @@ EnlargedRenderer::EnlargedRenderer() throw() :
Gtk::IconSource icon_source;
Gtk::IconSet icon_set_mode_image_edit;
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/mode-image-edit-16.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "mode-image-edit-16.png");
icon_source.set_size(Gtk::IconSize(16));
icon_set_mode_image_edit.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/mode-image-edit-22.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "mode-image-edit-22.png");
icon_source.set_size(Gtk::IconSize(22));
icon_set_mode_image_edit.add_source(icon_source);
- icon_source.set_filename(
- PACKAGE_DATA_DIR"/"PACKAGE_TARNAME
- "/pixmaps/mode-image-edit-24.png");
+ icon_source.set_filename(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
+ "pixmaps" G_DIR_SEPARATOR_S
+ "mode-image-edit-24.png");
icon_source.set_size(Gtk::IconSize(24));
icon_set_mode_image_edit.add_source(icon_source);
diff --git a/src/renderer/slideshow-renderer.cpp b/src/renderer/slideshow-renderer.cpp
index 6b04785..89ae6c4 100644
--- a/src/renderer/slideshow-renderer.cpp
+++ b/src/renderer/slideshow-renderer.cpp
@@ -38,7 +38,7 @@ namespace Solang
static const guint interval = 4; // s
static const std::string uiFile
- = PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/ui/"
+ = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-slideshow-renderer.ui";
SlideshowRenderer::SlideshowRenderer() throw() :
diff --git a/src/renderer/slideshow-window.cpp b/src/renderer/slideshow-window.cpp
index f2ea915..cec9616 100644
--- a/src/renderer/slideshow-window.cpp
+++ b/src/renderer/slideshow-window.cpp
@@ -32,7 +32,7 @@ namespace Solang
static const guint toolBarInterval = 2; // s
static const std::string uiFile
- = PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/ui/"
+ = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-slideshow.ui";
static void
diff --git a/src/renderer/thumbnail-view.cpp b/src/renderer/thumbnail-view.cpp
index ed2146f..d85330d 100644
--- a/src/renderer/thumbnail-view.cpp
+++ b/src/renderer/thumbnail-view.cpp
@@ -31,7 +31,7 @@ namespace Solang
{
static const std::string uiFile
- = PACKAGE_DATA_DIR"/"PACKAGE_TARNAME"/ui/"
+ = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ui" G_DIR_SEPARATOR_S
PACKAGE_TARNAME"-thumbnail-popup.ui";
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
