load-fragment: prefer unit id over alias names when looking for fragments

[elogind.git] / unit.h

diff --git a/unit.h b/unit.h
index 3b7f6995ff7caa2e0899cb652e4ea03138e08d56..f5eac2916d712aadf4613d7173abae71239f9180 100644 (file)
--- a/unit.h
+++ b/unit.h
@@ -124,13 +124,15 @@ struct Meta {
         Set *dependencies[_UNIT_DEPENDENCY_MAX];
 
         char *description;
-        char *load_path; /* if loaded from a config file this is the primary path to it */
+        char *fragment_path; /* if loaded from a config file this is the primary path to it */
 
         /* If there is something to do with this unit, then this is
          * the job for it */
         Job *job;
 
         bool in_load_queue:1;
+        bool in_dbus_queue:1;
+        bool sent_dbus_new_signal:1;
 
         /* If we go down, pull down everything that depends on us, too */
         bool recursive_stop;
@@ -146,6 +148,9 @@ struct Meta {
 
         /* Per type list */
         LIST_FIELDS(Meta, units_per_type);
+
+        /* D-Bus queue */
+        LIST_FIELDS(Meta, dbus_queue);
 };
 
 #include "service.h"
@@ -243,6 +248,7 @@ int unit_choose_id(Unit *u, const char *name);
 int unit_set_description(Unit *u, const char *description);
 
 void unit_add_to_load_queue(Unit *u);
+void unit_add_to_dbus_queue(Unit *u);
 
 int unit_merge(Unit *u, Unit *other);
 
@@ -276,10 +282,9 @@ void unit_unwatch_timer(Unit *u, Watch *w);
 
 bool unit_job_is_applicable(Unit *u, JobType j);
 
-const char *unit_path(void);
 int set_unit_path(const char *p);
 
-char *unit_name_escape_path(const char *prefix, const char *path, const char *suffix);
+char *unit_name_escape_path(const char *path, const char *suffix);
 
 const char *unit_type_to_string(UnitType i);
 UnitType unit_type_from_string(const char *s);