From: kremlin <ian@kremlin.cc>
Date: Fri, 15 Aug 2014 18:11:08 +0000 (-0500)
Subject: include polkit.h in all interfaces, edit makefile accordingly
X-Git-Tag: gsoc-final~20
X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=commitdiff_plain;h=904d744df98f63a70ec8832764bdfba1adda073a;ds=sidebyside

include polkit.h in all interfaces, edit makefile accordingly
---

diff --git a/Makefile b/Makefile
index 8ad85c6..236fd3c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ DEBUGF=-O0 -g
 LINKGN=bin/obj/hostnamed-gen.o bin/obj/localed-gen.o bin/obj/timedated-gen.o bin/obj/logind-gen.o
 LINKHN=bin/systemd-hostnamed bin/systemd-localed bin/systemd-timedated bin/systemd-logind
 
-GLIBEF=`pkg-config --cflags --libs glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0`
-GLIBOF=`pkg-config --cflags        glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0`
+GLIBEF=`pkg-config --cflags --libs glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 polkit-agent-1`
+GLIBOF=`pkg-config --cflags        glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 polkit-agent-1`
 
 SANITY=-Wno-unused-variable -Wno-unused-parameter # -Wno-comment
 
diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index d8111d8..19a196c 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -29,7 +29,7 @@
 
 #include <glib/gprintf.h>
 #include <glib-unix.h>
-/* #include <gtk/gtk.h> */
+#include <polkit/polkit.h>
 
 #include "hostnamed-gen.h"
 #include "hostnamed.h"
@@ -137,7 +137,8 @@ on_handle_set_hostname(Hostname1 *hn1_passed_interf,
             ret = TRUE;
     }
 
-    hostname1_complete_set_hostname(hn1_passed_interf, invoc);
+    if(ret)
+        hostname1_complete_set_hostname(hn1_passed_interf, invoc);
 
     if(proposed_hostname)
         g_free(proposed_hostname);
diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c
index f788441..596c2e3 100644
--- a/src/interfaces/localed/localed.c
+++ b/src/interfaces/localed/localed.c
@@ -23,6 +23,7 @@
 
 #include <glib/gprintf.h>
 #include <glib-unix.h>
+#include <polkit/polkit.h>
 
 #include "localed-gen.h"
 #include "localed.h"
diff --git a/src/interfaces/logind/logind.c b/src/interfaces/logind/logind.c
index 7d887b6..9ccde2f 100644
--- a/src/interfaces/logind/logind.c
+++ b/src/interfaces/logind/logind.c
@@ -23,6 +23,7 @@
 
 #include <glib/gprintf.h>
 #include <glib-unix.h>
+#include <polkit/polkit.h>
 
 #include "logind-gen.h"
 #include "logind.h"
diff --git a/src/interfaces/timedated/timedated.c b/src/interfaces/timedated/timedated.c
index 4dd2dba..67f7a0c 100644
--- a/src/interfaces/timedated/timedated.c
+++ b/src/interfaces/timedated/timedated.c
@@ -23,6 +23,7 @@
 
 #include <glib/gprintf.h>
 #include <glib-unix.h>
+#include <polkit/polkit.h>
 
 #include "timedated-gen.h"
 #include "timedated.h"