GNOME.org
 

[gnome-flashback] notifications: move D-Bus interface files to libdbus

commit c57deb295bdd06e9f047c69378915985933599d5
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Dec 17 14:37:08 2019 +0200

    notifications: move D-Bus interface files to libdbus

 dbus/Makefile.am                                   | 36 +++++++++++
 .../org.freedesktop.Application.xml                |  1 +
 .../org.freedesktop.DBus.xml                       |  1 +
 .../org.freedesktop.Notifications.xml              |  1 +
 .../org.gtk.Notifications.xml                      |  1 +
 gnome-flashback/libnotifications/Makefile.am       | 70 ++--------------------
 gnome-flashback/libnotifications/nd-daemon.c       |  4 +-
 7 files changed, 46 insertions(+), 68 deletions(-)
---
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 6d80624..424b6f9 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -45,12 +45,36 @@ gf-dm-seat-gen.c: org.freedesktop.DisplayManager.Seat.xml
                --generate-c-code gf-dm-seat-gen \
                $(srcdir)/org.freedesktop.DisplayManager.Seat.xml
 
+gf-fd-application-gen.h:
+gf-fd-application-gen.c: org.freedesktop.Application.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-fd-application-gen \
+               $(srcdir)/org.freedesktop.Application.xml
+
+gf-fd-dbus-gen.h:
+gf-fd-dbus-gen.c: org.freedesktop.DBus.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-fd-dbus-gen \
+               $(srcdir)/org.freedesktop.DBus.xml
+
+gf-fd-notifications-gen.h:
+gf-fd-notifications-gen.c: org.freedesktop.Notifications.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-fd-notifications-gen \
+               $(srcdir)/org.freedesktop.Notifications.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-gtk-notifications-gen.h:
+gf-gtk-notifications-gen.c: org.gtk.Notifications.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-gtk-notifications-gen \
+               $(srcdir)/org.gtk.Notifications.xml
+
 gf-login-manager-gen.h:
 gf-login-manager-gen.c: org.freedesktop.login1.Manager.xml
        $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
@@ -124,8 +148,16 @@ BUILT_SOURCES = \
        gf-accounts-user-gen.h \
        gf-dm-seat-gen.c \
        gf-dm-seat-gen.h \
+       gf-fd-application-gen.c \
+       gf-fd-application-gen.h \
+       gf-fd-dbus-gen.c \
+       gf-fd-dbus-gen.h \
+       gf-fd-notifications-gen.c \
+       gf-fd-notifications-gen.h \
        gf-file-manager-gen.c \
        gf-file-manager-gen.h \
+       gf-gtk-notifications-gen.c \
+       gf-gtk-notifications-gen.h \
        gf-login-manager-gen.c \
        gf-login-manager-gen.h \
        gf-login-seat-gen.c \
@@ -153,11 +185,14 @@ BUILT_SOURCES = \
 EXTRA_DIST = \
        org.freedesktop.Accounts.xml \
        org.freedesktop.Accounts.User.xml \
+       org.freedesktop.Application.xml \
+       org.freedesktop.DBus.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.freedesktop.Notifications.xml \
        org.freedesktop.UPower.Device.xml \
        org.gnome.Nautilus.FileOperations.xml \
        org.gnome.ScreenSaver.xml \
@@ -165,6 +200,7 @@ EXTRA_DIST = \
        org.gnome.Shell.Screencast.xml \
        org.gnome.Shell.Screenshot.xml \
        org.gnome.Shell.xml \
+       org.gtk.Notifications.xml \
        org.kde.StatusNotifierWatcher.xml \
        $(NULL)
 
diff --git a/gnome-flashback/libnotifications/org.freedesktop.Application.xml 
b/dbus/org.freedesktop.Application.xml
similarity index 87%
rename from gnome-flashback/libnotifications/org.freedesktop.Application.xml
rename to dbus/org.freedesktop.Application.xml
index e903fdb..0901047 100644
--- a/gnome-flashback/libnotifications/org.freedesktop.Application.xml
+++ b/dbus/org.freedesktop.Application.xml
@@ -3,6 +3,7 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
 <node>
   <interface name="org.freedesktop.Application">
+    <annotation name="org.gtk.GDBus.C.Name" value="FdApplicationGen" />
 
     <method name="Activate">
       <arg type="a{sv}" direction="in" />
diff --git a/gnome-flashback/libnotifications/org.freedesktop.DBus.xml b/dbus/org.freedesktop.DBus.xml
similarity index 85%
rename from gnome-flashback/libnotifications/org.freedesktop.DBus.xml
rename to dbus/org.freedesktop.DBus.xml
index b806297..a9cb50f 100644
--- a/gnome-flashback/libnotifications/org.freedesktop.DBus.xml
+++ b/dbus/org.freedesktop.DBus.xml
@@ -3,6 +3,7 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
 <node>
   <interface name="org.freedesktop.DBus">
+    <annotation name="org.gtk.GDBus.C.Name" value="FdDBusGen" />
 
     <method name="GetConnectionUnixProcessID">
       <arg type="s" direction="in" />
diff --git a/gnome-flashback/libnotifications/org.freedesktop.Notifications.xml 
b/dbus/org.freedesktop.Notifications.xml
similarity index 95%
rename from gnome-flashback/libnotifications/org.freedesktop.Notifications.xml
rename to dbus/org.freedesktop.Notifications.xml
index 624731d..fe92cf8 100644
--- a/gnome-flashback/libnotifications/org.freedesktop.Notifications.xml
+++ b/dbus/org.freedesktop.Notifications.xml
@@ -3,6 +3,7 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
 <node>
   <interface name="org.freedesktop.Notifications">
+    <annotation name="org.gtk.GDBus.C.Name" value="FdNotificationsGen" />
 
     <method name="CloseNotification">
       <arg type="u" name="id" direction="in" />
diff --git a/gnome-flashback/libnotifications/org.gtk.Notifications.xml b/dbus/org.gtk.Notifications.xml
similarity index 88%
rename from gnome-flashback/libnotifications/org.gtk.Notifications.xml
rename to dbus/org.gtk.Notifications.xml
index 98149ca..dac63cc 100644
--- a/gnome-flashback/libnotifications/org.gtk.Notifications.xml
+++ b/dbus/org.gtk.Notifications.xml
@@ -3,6 +3,7 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
 <node>
   <interface name="org.gtk.Notifications">
+    <annotation name="org.gtk.GDBus.C.Name" value="GtkNotificationsGen" />
 
     <method name="AddNotification">
       <arg type="s" direction="in" />
diff --git a/gnome-flashback/libnotifications/Makefile.am b/gnome-flashback/libnotifications/Makefile.am
index 662ac3b..c279864 100644
--- a/gnome-flashback/libnotifications/Makefile.am
+++ b/gnome-flashback/libnotifications/Makefile.am
@@ -7,9 +7,9 @@ noinst_LTLIBRARIES = \
 libnotifications_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"notifications\" \
        -DG_LOG_USE_STRUCTURED=1 \
-       -I$(srcdir)/../../gnome-flashback \
-       -I$(top_builddir)/gnome-flashback \
-       -I$(top_builddir)/gnome-flashback/libnotifications \
+       -I$(top_srcdir)/gnome-flashback \
+       -I$(top_srcdir) \
+       $(AM_CPPFLAGS) \
        $(NULL)
 
 libnotifications_la_CFLAGS = \
@@ -33,7 +33,6 @@ libnotifications_la_SOURCES = \
        nd-queue.h \
        nd-stack.c \
        nd-stack.h \
-       $(BUILT_SOURCES) \
        $(NULL)
 
 libnotifications_la_LDFLAGS = \
@@ -42,70 +41,9 @@ libnotifications_la_LDFLAGS = \
        $(NULL)
 
 libnotifications_la_LIBADD = \
+       $(top_builddir)/dbus/libdbus.la \
        $(top_builddir)/gnome-flashback/libcommon/libcommon.la \
        $(NOTIFICATIONS_LIBS) \
        $(NULL)
 
-gf-fd-application-gen.h:
-gf-fd-application-gen.c: org.freedesktop.Application.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) \
-               --interface-prefix org.freedesktop.Application \
-               --generate-c-code gf-fd-application-gen \
-               --c-namespace Gf \
-               --annotate "org.freedesktop.Application" \
-                          "org.gtk.GDBus.C.Name" FdApplicationGen \
-               $(srcdir)/org.freedesktop.Application.xml
-
-gf-fd-dbus-gen.h:
-gf-fd-dbus-gen.c: org.freedesktop.DBus.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) \
-               --interface-prefix org.freedesktop.DBus \
-               --generate-c-code gf-fd-dbus-gen \
-               --c-namespace Gf \
-               --annotate "org.freedesktop.DBus" \
-                          "org.gtk.GDBus.C.Name" FdDBusGen \
-               $(srcdir)/org.freedesktop.DBus.xml
-
-gf-fd-notifications-gen.h:
-gf-fd-notifications-gen.c: org.freedesktop.Notifications.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) \
-               --interface-prefix org.freedesktop.Notifications \
-               --generate-c-code gf-fd-notifications-gen \
-               --c-namespace Gf \
-               --annotate "org.freedesktop.Notifications" \
-                          "org.gtk.GDBus.C.Name" FdNotificationsGen \
-               $(srcdir)/org.freedesktop.Notifications.xml
-
-gf-gtk-notifications-gen.h:
-gf-gtk-notifications-gen.c: org.gtk.Notifications.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) \
-               --interface-prefix org.gtk.Notifications \
-               --generate-c-code gf-gtk-notifications-gen \
-               --c-namespace Gf \
-               --annotate "org.gtk.Notifications" \
-                          "org.gtk.GDBus.C.Name" GtkNotificationsGen \
-               $(srcdir)/org.gtk.Notifications.xml
-
-BUILT_SOURCES = \
-       gf-fd-application-gen.c \
-       gf-fd-application-gen.h \
-       gf-fd-dbus-gen.c \
-       gf-fd-dbus-gen.h \
-       gf-fd-notifications-gen.c \
-       gf-fd-notifications-gen.h \
-       gf-gtk-notifications-gen.c \
-       gf-gtk-notifications-gen.h \
-       $(NULL)
-
-EXTRA_DIST = \
-       org.freedesktop.Application.xml \
-       org.freedesktop.DBus.xml \
-       org.freedesktop.Notifications.xml \
-       org.gtk.Notifications.xml \
-       $(NULL)
-
-CLEANFILES = \
-       $(BUILT_SOURCES) \
-       $(NULL)
-
 -include $(top_srcdir)/git.mk
diff --git a/gnome-flashback/libnotifications/nd-daemon.c b/gnome-flashback/libnotifications/nd-daemon.c
index 59caeea..1342745 100644
--- a/gnome-flashback/libnotifications/nd-daemon.c
+++ b/gnome-flashback/libnotifications/nd-daemon.c
@@ -19,12 +19,12 @@
  */
 
 #include "config.h"
+#include "nd-daemon.h"
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "nd-daemon.h"
-#include "gf-fd-notifications-gen.h"
+#include "dbus/gf-fd-notifications-gen.h"
 #include "nd-notification.h"
 #include "nd-queue.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]