projects
/
systembsd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include polkit.h in all interfaces, edit makefile accordingly
[systembsd.git]
/
src
/
interfaces
/
logind
/
logind.c
diff --git
a/src/interfaces/logind/logind.c
b/src/interfaces/logind/logind.c
index da9e24b58f22d3009aaf5188da9630616da6cafd..9ccde2f42ceed1da92326ad22b96e6cba4946a5a 100644
(file)
--- 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 <glib/gprintf.h>
#include <glib-unix.h>
+#include <polkit/polkit.h>
#include "logind-gen.h"
#include "logind.h"
#include "logind-gen.h"
#include "logind.h"
@@
-48,20
+49,20
@@
on_handle_set_hostname(Login1Manager *hn1_passed_interf,
/*const gchar *
our_get_hostname() {
/*const gchar *
our_get_hostname() {
-
gchar *hostname_buf, *ret;
-
size_t hostname_divider;
+ gchar *hostname_buf, *ret;
+ size_t hostname_divider;
-
hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-
ret = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-
g_ptr_array_add(logind_freeable, hostname_buf);
-
g_ptr_array_add(logind_freeable, ret);
+ hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+ ret = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+ g_ptr_array_add(logind_freeable, hostname_buf);
+ g_ptr_array_add(logind_freeable, ret);
-
if(gethostname(hostname_buf, MAXHOSTNAMELEN))
-
return "";
+ if(gethostname(hostname_buf, MAXHOSTNAMELEN))
+ return "";
-
hostname_divider = strcspn(hostname_buf, ".");
+ hostname_divider = strcspn(hostname_buf, ".");
-
return strncpy(ret, hostname_buf, hostname_divider);
+ return strncpy(ret, hostname_buf, hostname_divider);
}*/
/* --- end method/property/dbus signal code, begin bus/name handlers --- */
}*/
/* --- end method/property/dbus signal code, begin bus/name handlers --- */
@@
-70,7
+71,7
@@
static void logind_on_bus_acquired(GDBusConnection *conn,
const gchar *name,
gpointer user_data) {
const gchar *name,
gpointer user_data) {
- g_print("got bus/name, exporting %s's interface...\n", name);
+ g_print
f
("got bus/name, exporting %s's interface...\n", name);
logind_interf = login1_manager_skeleton_new();
logind_interf = login1_manager_skeleton_new();
@@
-96,7
+97,7
@@
static void logind_on_bus_acquired(GDBusConnection *conn,
}
static void logind_on_name_acquired(GDBusConnection *conn,
}
static void logind_on_name_acquired(GDBusConnection *conn,
-
const gchar *name,
+ const gchar *name,
gpointer user_data) {
g_printf("success!\n");
gpointer user_data) {
g_printf("success!\n");
@@
-152,10
+153,12
@@
void set_signal_handlers() {
int main() {
int main() {
- logind_loop = g_main_loop_new(NULL, TRUE);
- logind_freeable = g_ptr_array_new();
+ set_signal_handlers();
- bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
+ logind_loop = g_main_loop_new(NULL, TRUE);
+ logind_freeable = g_ptr_array_new();
+
+ bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
"org.freedesktop.login1_manager",
G_BUS_NAME_OWNER_FLAGS_NONE,
logind_on_bus_acquired,
"org.freedesktop.login1_manager",
G_BUS_NAME_OWNER_FLAGS_NONE,
logind_on_bus_acquired,
@@
-164,12
+167,16
@@
int main() {
NULL,
NULL);
NULL,
NULL);
- g_main_loop_run(logind_loop);
- g_main_loop_unref(logind_loop);
+ g_main_loop_run(logind_loop);
+ /* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
+ g_main_loop_unref(logind_loop);
+
+ /* guaranteed unownable */
+ g_bus_unown_name(bus_descriptor);
- g_bus_unown_name(bus_descriptor);
+ /* at this point no operations can occur with our data, it is safe to free it + its container */
+ g_ptr_array_free(logind_freeable, TRUE);
- logind_mem_clean();
-
return 0;
+ return 0;
}
}