diff --git a/cmake/backbone b/cmake/backbone index 2c0df24..02f3a0f 160000 --- a/cmake/backbone +++ b/cmake/backbone @@ -1 +1 @@ -Subproject commit 2c0df243a1518c857ae9db48281e9d489003bf63 +Subproject commit 02f3a0f7d969534872799b45a95d3c5a6fef14c3 diff --git a/config/ws.backbone.laview.plugins.data-example.gschema.xml b/config/ws.backbone.laview.plugins.data-example.gschema.xml index 85b8124..0539034 100644 --- a/config/ws.backbone.laview.plugins.data-example.gschema.xml +++ b/config/ws.backbone.laview.plugins.data-example.gschema.xml @@ -1,5 +1,5 @@ - + "Hello, earthlings" diff --git a/po/de/laview-plugin-data-example-0.po b/po/de/laview-plugin-data-example.po similarity index 85% rename from po/de/laview-plugin-data-example-0.po rename to po/de/laview-plugin-data-example.po index a056851..935693c 100644 --- a/po/de/laview-plugin-data-example-0.po +++ b/po/de/laview-plugin-data-example.po @@ -1,11 +1,11 @@ -# German translations for laview-plugin-data-example-0 package. -# Copyright (C) 2015 THE laview-plugin-data-example-0'S COPYRIGHT HOLDER -# This file is distributed under the same license as the laview-plugin-data-example-0 package. +# German translations for laview-plugin-data-example package. +# Copyright (C) 2015 THE laview-plugin-data-example'S COPYRIGHT HOLDER +# This file is distributed under the same license as the laview-plugin-data-example package. # , 2015. # msgid "" msgstr "" -"Project-Id-Version: laview-plugin-data-example-0\n" +"Project-Id-Version: laview-plugin-data-example\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-09 15:51+0300\n" "PO-Revision-Date: 2015-11-09 15:51+0300\n" diff --git a/po/laview-plugin-data-example-0.pot b/po/laview-plugin-data-example.pot similarity index 91% rename from po/laview-plugin-data-example-0.pot rename to po/laview-plugin-data-example.pot index da25e27..3b7e6f3 100644 --- a/po/laview-plugin-data-example-0.pot +++ b/po/laview-plugin-data-example.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the laview-plugin-data-example-0 package. +# This file is distributed under the same license as the laview-plugin-data-example package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: laview-plugin-data-example-0\n" +"Project-Id-Version: laview-plugin-data-example\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-09 15:51+0300\n" +"POT-Creation-Date: 2015-11-14 08:26+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ru/laview-plugin-data-example-0.po b/po/ru/laview-plugin-data-example.po similarity index 86% rename from po/ru/laview-plugin-data-example-0.po rename to po/ru/laview-plugin-data-example.po index 99c375f..d29d275 100644 --- a/po/ru/laview-plugin-data-example-0.po +++ b/po/ru/laview-plugin-data-example.po @@ -1,11 +1,11 @@ -# Russian translations for laview-plugin-data-example-0 package. -# Copyright (C) 2015 THE laview-plugin-data-example-0'S COPYRIGHT HOLDER -# This file is distributed under the same license as the laview-plugin-data-example-0 package. +# Russian translations for laview-plugin-data-example package. +# Copyright (C) 2015 THE laview-plugin-data-example'S COPYRIGHT HOLDER +# This file is distributed under the same license as the laview-plugin-data-example package. # , 2015. # msgid "" msgstr "" -"Project-Id-Version: laview-plugin-data-example-0\n" +"Project-Id-Version: laview-plugin-data-example\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-09 15:51+0300\n" "PO-Revision-Date: 2015-11-09 15:51+0300\n" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ea43336..9369bc3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,11 +4,9 @@ SET (PluginPackages gtk+-3.0 gee-0.8 gobject-plugin-iface-0 laview-core-iface-0 SET (PluginPkgModules gtk+-3.0 gee-0.8 laview-core-0) SET (PluginCustomVapis ${CMAKE_SOURCE_DIR}/config/Config.vapi) INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/config") -SET (PluginExtraSources ${PROJECT_SOURCE_DIR}/src/library_constructor.c) SET (PluginInstall ON) -IF (WIN32) - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mwindows") - SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-all-symbols") -ENDIF (WIN32) -SET (PluginInstallPrefix "lib/laview-core-0/data-plugins") +SET (LibExtraSources ${CMAKE_CURRENT_BINARY_DIR}/library_constructor.c) +SET (LC_RELATIVE_PREFIX "../../..") +CONFIGURE_FILE ( "${CMAKE_SOURCE_DIR}/cmake/backbone/templates/library_constructor.c.in" "${LibExtraSources}") +SET (PluginInstallPrefix "lib/laview-core-0/protocol-plugins") INCLUDE (ValaPluginCommonRules) diff --git a/src/library_constructor.c b/src/library_constructor.c deleted file mode 100644 index 73d675d..0000000 --- a/src/library_constructor.c +++ /dev/null @@ -1,45 +0,0 @@ -#if defined(_WIN32) || defined(_WIN64) - #include -#elif defined(linux) || defined(UNIX) || defined(__unix__) - #define _GNU_SOURCE - #include - #include -#endif - -char SO_PATH[FILENAME_MAX]; - -#include "gettext-config.h" - -#if defined(_WIN32) || defined(_WIN64) -BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) -#elif defined(linux) || defined(UNIX) || defined(__unix__) -void __attribute__ ((constructor)) load_library (void) -#endif -{ -#if defined(_WIN32) || defined(_WIN64) - gchar dllPath[FILENAME_MAX], - *dllDir, - *localePath; - - GetModuleFileName (hInstance, dllPath, FILENAME_MAX); - dllDir = g_path_get_dirname (dllPath); - localePath = g_build_filename (dllDir, "../share/locale", NULL); - g_free (dllDir); - bindtextdomain (GETTEXT_PACKAGE, localePath); - g_free (localePath); -#elif defined(linux) || defined(UNIX) || defined(__unix__) - Dl_info dl_info; - dladdr(load_library, &dl_info); - strcpy (SO_PATH, dl_info.dli_fname); -#endif - -#if (!GLIB_CHECK_VERSION (2, 36, 0)) - g_type_init (); -#endif - -#if defined(_WIN32) || defined(_WIN64) - (void) dwReason; // avoid - (void) lpReserved; // warnings - return TRUE; -#endif -} diff --git a/ui/glade/CMakeLists.txt b/ui/glade/CMakeLists.txt index 0bfc4b0..548088d 100644 --- a/ui/glade/CMakeLists.txt +++ b/ui/glade/CMakeLists.txt @@ -1 +1,2 @@ -INSTALL (FILES data-example.glade DESTINATION "share/laview/data-plugins/data-example-${MAJOR}/ui") +SET (GladeFile ${PROJECT_LOWERCASE_NAME}) +INCLUDE (GladeCommonRules) diff --git a/ui/glade/data-example.glade b/ui/glade/laview-plugin-data-example.glade similarity index 100% rename from ui/glade/data-example.glade rename to ui/glade/laview-plugin-data-example.glade diff --git a/util/backbone b/util/backbone index bc270b7..d4e233a 160000 --- a/util/backbone +++ b/util/backbone @@ -1 +1 @@ -Subproject commit bc270b7a0fdbbaec24dbd4af307bda242bed5c2b +Subproject commit d4e233ae72412f4dfef9b7c39ae7a1b6667fb446