GNOME.org
 

[gnome-flashback/wip/muktupavels/test: 3/15] screensaver: move D-Bus interface files to libdbus

commit 2bf246932c3a71ff4c7715f218aecf357998ad5a
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Dec 17 13:32:17 2019 +0200

    screensaver: move D-Bus interface files to libdbus

 dbus/Makefile.am                                   | 72 +++++++++++++++++++++
 .../org.freedesktop.Accounts.User.xml              |  0
 .../org.freedesktop.Accounts.xml                   |  0
 .../org.freedesktop.DisplayManager.Seat.xml        |  0
 .../org.freedesktop.login1.Manager.xml             |  0
 .../org.freedesktop.login1.Seat.xml                |  0
 .../org.freedesktop.login1.Session.xml             |  0
 .../org.gnome.ScreenSaver.xml                      |  0
 .../org.gnome.SessionManager.Presence.xml          |  0
 gnome-flashback/libscreensaver/Makefile.am         | 73 +---------------------
 gnome-flashback/libscreensaver/gf-listener.c       |  6 +-
 gnome-flashback/libscreensaver/gf-user-image.c     |  4 +-
 gnome-flashback/libscreensaver/gf-watcher.c        |  2 +-
 13 files changed, 79 insertions(+), 78 deletions(-)
---
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index e074bf7..8f3b587 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -27,28 +27,100 @@ libdbus_la_LIBADD = \
        $(DBUS_LIBS) \
        $(NULL)
 
+gf-accounts-gen.h:
+gf-accounts-gen.c: org.freedesktop.Accounts.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-accounts-gen \
+               $(srcdir)/org.freedesktop.Accounts.xml
+
+gf-accounts-user-gen.h:
+gf-accounts-user-gen.c: org.freedesktop.Accounts.User.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-accounts-user-gen \
+               $(srcdir)/org.freedesktop.Accounts.User.xml
+
+gf-dm-seat-gen.h:
+gf-dm-seat-gen.c: org.freedesktop.DisplayManager.Seat.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-dm-seat-gen \
+               $(srcdir)/org.freedesktop.DisplayManager.Seat.xml
+
 gf-file-manager-gen.h:
 gf-file-manager-gen.c: org.freedesktop.FileManager1.xml
        $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
                --generate-c-code gf-file-manager-gen \
                $(srcdir)/org.freedesktop.FileManager1.xml
 
+gf-login-manager-gen.h:
+gf-login-manager-gen.c: org.freedesktop.login1.Manager.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-login-manager-gen \
+               $(srcdir)/org.freedesktop.login1.Manager.xml
+
+gf-login-seat-gen.h:
+gf-login-seat-gen.c: org.freedesktop.login1.Seat.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-login-seat-gen \
+               $(srcdir)/org.freedesktop.login1.Seat.xml
+
+gf-login-session-gen.h:
+gf-login-session-gen.c: org.freedesktop.login1.Session.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-login-session-gen \
+               $(srcdir)/org.freedesktop.login1.Session.xml
+
 gf-nautilus-gen.h:
 gf-nautilus-gen.c: org.gnome.Nautilus.FileOperations.xml
        $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
                --generate-c-code gf-nautilus-gen \
                $(srcdir)/org.gnome.Nautilus.FileOperations.xml
 
+gf-screensaver-gen.h:
+gf-screensaver-gen.c: org.gnome.ScreenSaver.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-screensaver-gen \
+               $(srcdir)/org.gnome.ScreenSaver.xml
+
+gf-sm-presence-gen.h:
+gf-sm-presence-gen.c: org.gnome.SessionManager.Presence.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-sm-presence-gen \
+               $(srcdir)/org.gnome.SessionManager.Presence.xml
+
 BUILT_SOURCES = \
+       gf-accounts-gen.c \
+       gf-accounts-gen.h \
+       gf-accounts-user-gen.c \
+       gf-accounts-user-gen.h \
+       gf-dm-seat-gen.c \
+       gf-dm-seat-gen.h \
        gf-file-manager-gen.c \
        gf-file-manager-gen.h \
+       gf-login-manager-gen.c \
+       gf-login-manager-gen.h \
+       gf-login-seat-gen.c \
+       gf-login-seat-gen.h \
+       gf-login-session-gen.c \
+       gf-login-session-gen.h \
        gf-nautilus-gen.c \
        gf-nautilus-gen.h \
+       gf-screensaver-gen.c \
+       gf-screensaver-gen.h \
+       gf-sm-presence-gen.c \
+       gf-sm-presence-gen.h \
        $(NULL)
 
 EXTRA_DIST = \
+       org.freedesktop.Accounts.xml \
+       org.freedesktop.Accounts.User.xml \
+       org.freedesktop.DisplayManager.Seat.xml \
        org.freedesktop.FileManager1.xml \
+       org.freedesktop.login1.Manager.xml \
+       org.freedesktop.login1.Seat.xml \
+       org.freedesktop.login1.Session.xml \
        org.gnome.Nautilus.FileOperations.xml \
+       org.gnome.ScreenSaver.xml \
+       org.gnome.SessionManager.Presence.xml \
        $(NULL)
 
 CLEANFILES = \
diff --git a/gnome-flashback/libscreensaver/org.freedesktop.Accounts.User.xml 
b/dbus/org.freedesktop.Accounts.User.xml
similarity index 100%
rename from gnome-flashback/libscreensaver/org.freedesktop.Accounts.User.xml
rename to dbus/org.freedesktop.Accounts.User.xml
diff --git a/gnome-flashback/libscreensaver/org.freedesktop.Accounts.xml b/dbus/org.freedesktop.Accounts.xml
similarity index 100%
rename from gnome-flashback/libscreensaver/org.freedesktop.Accounts.xml
rename to dbus/org.freedesktop.Accounts.xml
diff --git a/gnome-flashback/libscreensaver/org.freedesktop.DisplayManager.Seat.xml 
b/dbus/org.freedesktop.DisplayManager.Seat.xml
similarity index 100%
rename from gnome-flashback/libscreensaver/org.freedesktop.DisplayManager.Seat.xml
rename to dbus/org.freedesktop.DisplayManager.Seat.xml
diff --git a/gnome-flashback/libscreensaver/org.freedesktop.login1.Manager.xml 
b/dbus/org.freedesktop.login1.Manager.xml
similarity index 100%
rename from gnome-flashback/libscreensaver/org.freedesktop.login1.Manager.xml
rename to dbus/org.freedesktop.login1.Manager.xml
diff --git a/gnome-flashback/libscreensaver/org.freedesktop.login1.Seat.xml 
b/dbus/org.freedesktop.login1.Seat.xml
similarity index 100%
rename from gnome-flashback/libscreensaver/org.freedesktop.login1.Seat.xml
rename to dbus/org.freedesktop.login1.Seat.xml
diff --git a/gnome-flashback/libscreensaver/org.freedesktop.login1.Session.xml 
b/dbus/org.freedesktop.login1.Session.xml
similarity index 100%
rename from gnome-flashback/libscreensaver/org.freedesktop.login1.Session.xml
rename to dbus/org.freedesktop.login1.Session.xml
diff --git a/gnome-flashback/libscreensaver/org.gnome.ScreenSaver.xml b/dbus/org.gnome.ScreenSaver.xml
similarity index 100%
rename from gnome-flashback/libscreensaver/org.gnome.ScreenSaver.xml
rename to dbus/org.gnome.ScreenSaver.xml
diff --git a/gnome-flashback/libscreensaver/org.gnome.SessionManager.Presence.xml 
b/dbus/org.gnome.SessionManager.Presence.xml
similarity index 100%
rename from gnome-flashback/libscreensaver/org.gnome.SessionManager.Presence.xml
rename to dbus/org.gnome.SessionManager.Presence.xml
diff --git a/gnome-flashback/libscreensaver/Makefile.am b/gnome-flashback/libscreensaver/Makefile.am
index 7e8dc22..cc2391d 100644
--- a/gnome-flashback/libscreensaver/Makefile.am
+++ b/gnome-flashback/libscreensaver/Makefile.am
@@ -47,6 +47,7 @@ libscreensaver_la_LDFLAGS = \
        $(NULL)
 
 libscreensaver_la_LIBADD = \
+       $(top_builddir)/dbus/libdbus.la \
        $(SCREENSAVER_LIBS) \
        $(NULL)
 
@@ -62,86 +63,14 @@ gf-screensaver-enum-types.h: gf-screensaver-enum-types.h.in $(ENUM_TYPES)
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gf-screensaver-enum-types.h.in $(ENUM_TYPES) > \
                gf-screensaver-enum-types.h.tmp && mv gf-screensaver-enum-types.h.tmp 
gf-screensaver-enum-types.h
 
-gf-accounts-gen.h:
-gf-accounts-gen.c: org.freedesktop.Accounts.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
-               --generate-c-code gf-accounts-gen \
-               $(srcdir)/org.freedesktop.Accounts.xml
-
-gf-accounts-user-gen.h:
-gf-accounts-user-gen.c: org.freedesktop.Accounts.User.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
-               --generate-c-code gf-accounts-user-gen \
-               $(srcdir)/org.freedesktop.Accounts.User.xml
-
-gf-dm-seat-gen.h:
-gf-dm-seat-gen.c: org.freedesktop.DisplayManager.Seat.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
-               --generate-c-code gf-dm-seat-gen \
-               $(srcdir)/org.freedesktop.DisplayManager.Seat.xml
-
-gf-login-manager-gen.h:
-gf-login-manager-gen.c: org.freedesktop.login1.Manager.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
-               --generate-c-code gf-login-manager-gen \
-               $(srcdir)/org.freedesktop.login1.Manager.xml
-
-gf-login-seat-gen.h:
-gf-login-seat-gen.c: org.freedesktop.login1.Seat.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
-               --generate-c-code gf-login-seat-gen \
-               $(srcdir)/org.freedesktop.login1.Seat.xml
-
-gf-login-session-gen.h:
-gf-login-session-gen.c: org.freedesktop.login1.Session.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
-               --generate-c-code gf-login-session-gen \
-               $(srcdir)/org.freedesktop.login1.Session.xml
-
-gf-screensaver-gen.h:
-gf-screensaver-gen.c: org.gnome.ScreenSaver.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
-               --generate-c-code gf-screensaver-gen \
-               $(srcdir)/org.gnome.ScreenSaver.xml
-
-gf-sm-presence-gen.h:
-gf-sm-presence-gen.c: org.gnome.SessionManager.Presence.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
-               --generate-c-code gf-sm-presence-gen \
-               $(srcdir)/org.gnome.SessionManager.Presence.xml
-
 BUILT_SOURCES = \
-       gf-accounts-gen.c \
-       gf-accounts-gen.h \
-       gf-accounts-user-gen.c \
-       gf-accounts-user-gen.h \
-       gf-dm-seat-gen.c \
-       gf-dm-seat-gen.h \
-       gf-login-manager-gen.c \
-       gf-login-manager-gen.h \
-       gf-login-seat-gen.c \
-       gf-login-seat-gen.h \
-       gf-login-session-gen.c \
-       gf-login-session-gen.h \
        gf-screensaver-enum-types.c \
        gf-screensaver-enum-types.h \
-       gf-screensaver-gen.c \
-       gf-screensaver-gen.h \
-       gf-sm-presence-gen.c \
-       gf-sm-presence-gen.h \
        $(NULL)
 
 EXTRA_DIST = \
        gf-screensaver-enum-types.c.in \
        gf-screensaver-enum-types.h.in \
-       org.freedesktop.Accounts.xml \
-       org.freedesktop.Accounts.User.xml \
-       org.freedesktop.DisplayManager.Seat.xml \
-       org.freedesktop.login1.Manager.xml \
-       org.freedesktop.login1.Seat.xml \
-       org.freedesktop.login1.Session.xml \
-       org.gnome.ScreenSaver.xml \
-       org.gnome.SessionManager.Presence.xml \
        $(NULL)
 
 CLEANFILES = \
diff --git a/gnome-flashback/libscreensaver/gf-listener.c b/gnome-flashback/libscreensaver/gf-listener.c
index eed682f..df5698b 100644
--- a/gnome-flashback/libscreensaver/gf-listener.c
+++ b/gnome-flashback/libscreensaver/gf-listener.c
@@ -26,9 +26,9 @@
 #include <gio/gunixfdlist.h>
 #include <time.h>
 
-#include "gf-login-manager-gen.h"
-#include "gf-login-session-gen.h"
-#include "gf-screensaver-gen.h"
+#include "dbus/gf-login-manager-gen.h"
+#include "dbus/gf-login-session-gen.h"
+#include "dbus/gf-screensaver-gen.h"
 #include "gf-screensaver-utils.h"
 
 #define SCREENSAVER_DBUS_NAME "org.gnome.ScreenSaver"
diff --git a/gnome-flashback/libscreensaver/gf-user-image.c b/gnome-flashback/libscreensaver/gf-user-image.c
index d3a5365..d598650 100644
--- a/gnome-flashback/libscreensaver/gf-user-image.c
+++ b/gnome-flashback/libscreensaver/gf-user-image.c
@@ -18,8 +18,8 @@
 #include "config.h"
 #include "gf-user-image.h"
 
-#include "gf-accounts-gen.h"
-#include "gf-accounts-user-gen.h"
+#include "dbus/gf-accounts-gen.h"
+#include "dbus/gf-accounts-user-gen.h"
 
 struct _GfUserImage
 {
diff --git a/gnome-flashback/libscreensaver/gf-watcher.c b/gnome-flashback/libscreensaver/gf-watcher.c
index 09681e8..0cb3438 100644
--- a/gnome-flashback/libscreensaver/gf-watcher.c
+++ b/gnome-flashback/libscreensaver/gf-watcher.c
@@ -25,7 +25,7 @@
 
 #include <gdk/gdkx.h>
 
-#include "gf-sm-presence-gen.h"
+#include "dbus/gf-sm-presence-gen.h"
 #include "gf-watcher.h"
 
 #define SESSION_MANAGER_DBUS_NAME "org.gnome.SessionManager"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]