From b8b206c6e84757c6d4d36cec619a1e7c37d1eb5f Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 10 Feb 2021 13:06:05 +0100 Subject: Move source files to src --- tools/Makefile.am | 2 +- tools/indicator-loader.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/tools/Makefile.am b/tools/Makefile.am index e871921..7d25b5c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,7 +23,7 @@ ayatana_indicator_loader_CFLAGS = \ ayatana_indicator_loader_LDADD = \ $(LIBINDICATOR_LIBS) \ $(LIBINDICATOR_IDO_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) # We duplicate these here because Automake won't let us use $(VER) on the left hand side. diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index 5b236db..a0db1b4 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -17,7 +17,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License version 3.0 for more details. - * + * * You should have received a copy of the GNU General Public * License along with this library. If not, see * . @@ -25,9 +25,9 @@ #include #include -#include +#include "src//indicator-object.h" #if GTK_CHECK_VERSION (3,0,0) - #include + #include "src/indicator-ng.h" #endif static GHashTable * entry_to_menu_item = NULL; @@ -159,7 +159,7 @@ entry_added (IndicatorObject * io, gtk_widget_show (menu_item); } -static void +static void entry_removed (__attribute__((unused)) IndicatorObject * io, IndicatorObjectEntry * entry, __attribute__((unused)) gpointer user_data) -- cgit v1.2.3 From 1cba9230eeb711fb00b3a2d53f1e51f99e493542 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 10 Feb 2021 13:15:05 +0100 Subject: Whitespace fix --- tools/indicator-loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index a0db1b4..ad4fdf4 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -25,7 +25,7 @@ #include #include -#include "src//indicator-object.h" +#include "src/indicator-object.h" #if GTK_CHECK_VERSION (3,0,0) #include "src/indicator-ng.h" #endif -- cgit v1.2.3 From 1fa174f54c9604499f059489e544cfc59c825f27 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 11 Feb 2021 15:22:22 +0100 Subject: Add CMakeLists.txt files + tests/test-loader.c: fix library paths + Fix include paths tests/test-loader.c: fix library paths --- tools/CMakeLists.txt | 8 ++++++++ tools/indicator-loader.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 tools/CMakeLists.txt (limited to 'tools') diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt new file mode 100644 index 0000000..4120f31 --- /dev/null +++ b/tools/CMakeLists.txt @@ -0,0 +1,8 @@ +# ayatana-indicator-loader3 + +set_source_files_properties(indicator-loader.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) +add_executable("ayatana-indicator-loader3" indicator-loader.c) +target_include_directories("ayatana-indicator-loader3" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) +target_include_directories("ayatana-indicator-loader3" PUBLIC "${CMAKE_SOURCE_DIR}/src") +target_link_libraries("ayatana-indicator-loader3" ${PROJECT_DEPS_LIBRARIES} "-L${CMAKE_BINARY_DIR}/src" -layatana-indicator3) +add_dependencies("ayatana-indicator-loader3" "ayatana-indicator3") diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index ad4fdf4..50b5143 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -25,9 +25,9 @@ #include #include -#include "src/indicator-object.h" +#include "indicator-object.h" #if GTK_CHECK_VERSION (3,0,0) - #include "src/indicator-ng.h" + #include "indicator-ng.h" #endif static GHashTable * entry_to_menu_item = NULL; -- cgit v1.2.3 From c277aa68455b232c37a4c52b39e948a6ab0b0e11 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 10 Feb 2021 13:29:38 +0100 Subject: Append us to copyright headers --- tools/indicator-loader.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tools') diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index 50b5143..159b17b 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -3,11 +3,13 @@ * and during development of them. * * Copyright 2009 Canonical Ltd. + * Copyright 2021 AyatanaIndicators * * Authors: * Ted Gould * Lars Uebernickel * Charles Kerr + * Robert Tari * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License -- cgit v1.2.3