From 859f2de6c17f7963889d1e3305d5d1d250a8c62e Mon Sep 17 00:00:00 2001 From: guinux Date: Sat, 3 Oct 2015 12:33:33 +0200 Subject: [PATCH] do not refresh is refresh_period is 0 --- src/Makefile | 4 +++- src/refresh.vala | 28 ++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/Makefile b/src/Makefile index 4120211..d0ea1d5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -40,9 +40,11 @@ binaries: pamac-refresh pamac-daemon pamac-tray pamac-updater pamac-manager clean: rm -f *.c pamac-refresh pamac-daemon pamac-tray pamac-updater pamac-manager pamac-install -pamac-refresh: refresh.vala +pamac-refresh: pamac_config.vala refresh.vala valac -o pamac-refresh \ + -X -w \ --pkg=gio-2.0 \ + pamac_config.vala \ refresh.vala pamac-tray: ../vapi/libalpm.vapi ../util/alpm-util.c common.vala alpm_config.vala pamac_config.vala tray.vala diff --git a/src/refresh.vala b/src/refresh.vala index 0329046..b3997ce 100644 --- a/src/refresh.vala +++ b/src/refresh.vala @@ -1,7 +1,7 @@ /* * pamac-vala * - * Copyright (C) 2014 Guillaume Benoit + * Copyright (C) 2014-2015 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ bool check_pamac_running () { } void on_refresh_finished () { - if (check_pamac_running () == false) { + if (!check_pamac_running ()) { try { pamac_daemon.quit (); } catch (IOError e) { @@ -79,16 +79,20 @@ void on_refresh_finished () { } int main () { - if (check_pamac_running () == false) { - try { - pamac_daemon = Bus.get_proxy_sync (BusType.SYSTEM, "org.manjaro.pamac", - "/org/manjaro/pamac"); - pamac_daemon.refresh_finished.connect (on_refresh_finished); - pamac_daemon.start_refresh (0); - loop = new MainLoop (); - loop.run (); - } catch (IOError e) { - stderr.printf ("IOError: %s\n", e.message); + var pamac_config = new Pamac.Config ("/etc/pamac.conf"); + // if refresh period is 0, just exit + if (pamac_config.refresh_period != 0) { + if (!check_pamac_running ()) { + try { + pamac_daemon = Bus.get_proxy_sync (BusType.SYSTEM, "org.manjaro.pamac", + "/org/manjaro/pamac"); + pamac_daemon.refresh_finished.connect (on_refresh_finished); + pamac_daemon.start_refresh (0); + loop = new MainLoop (); + loop.run (); + } catch (IOError e) { + stderr.printf ("IOError: %s\n", e.message); + } } } return 0;