From 68b6d219bf9db45bb15ff3952333677a801d0232 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Sun, 29 Oct 2017 15:18:24 -0300 Subject: [PATCH] update with new autovala fixes --- meson.build | 3 --- pamac.avprj | 7 ++----- po/pamac.pot | 2 +- src/pamac-tray/CMakeLists.txt | 3 --- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index 3903bdd..ce8d726 100644 --- a/meson.build +++ b/meson.build @@ -60,9 +60,6 @@ pamac_transaction_gresource_xml_generator = generator(find_program('glib-compile pamac_transaction_gresource_xml_file_c = pamac_transaction_gresource_xml_generator.process(['data/pamac.transaction.gresource.xml']) -if KDE_TRAY -else -endif meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),get_option('datadir'),'pamac'),join_paths(meson.current_source_dir(),'data/local','','*')) meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),get_option('datadir'),'doc'),join_paths(meson.current_source_dir(),'doc','','*')) diff --git a/pamac.avprj b/pamac.avprj index 4eba252..c6a07b7 100644 --- a/pamac.avprj +++ b/pamac.avprj @@ -193,6 +193,8 @@ vala_check_package: libsoup-2.4 *translate: vala src/pamac-system-daemon/system_daemon.vala *translate: vala src/pamac-tray/alpm_config.vala *translate: vala src/pamac-tray/pamac_config.vala +*translate: vala src/pamac-tray/tray-appindicator.vala +*translate: vala src/pamac-tray/tray-gtk.vala *translate: vala src/pamac-tray/tray.vala *translate: vala src/pamac-user-daemon/alpm_config.vala *translate: vala src/pamac-user-daemon/user_daemon.vala @@ -201,11 +203,6 @@ vala_check_package: libsoup-2.4 *translate: vala src/progress_box.vala *translate: vala src/transaction.vala *translate: vala src/transaction_sum_dialog.vala -if KDE_TRAY -translate: vala src/pamac-tray/tray-appindicator.vala -else -translate: vala src/pamac-tray/tray-gtk.vala -end *data: data/local diff --git a/po/pamac.pot b/po/pamac.pot index 059b795..59274b7 100644 --- a/po/pamac.pot +++ b/po/pamac.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Pamac\n" "Report-Msgid-Bugs-To: cromer@cromnix.org\n" -"POT-Creation-Date: 2017-10-29 14:28-0300\n" +"POT-Creation-Date: 2017-10-29 15:17-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/pamac-tray/CMakeLists.txt b/src/pamac-tray/CMakeLists.txt index 2f4678d..5f0f925 100644 --- a/src/pamac-tray/CMakeLists.txt +++ b/src/pamac-tray/CMakeLists.txt @@ -111,6 +111,3 @@ if(HAVE_VALADOC) ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac ) endif() -if (KDE_TRAY) - else () -endif ()