GNOME.org
 

[gnome-flashback] move end session dialog to libend-session-dialog

commit 2eff088a8351866da500df868c6f3af2e3a897a8
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Aug 29 16:12:55 2014 +0300

    move end session dialog to libend-session-dialog

 configure.ac                                       |    5 ++
 gnome-flashback/Makefile.am                        |   40 +++-------------
 gnome-flashback/flashback-application.c            |    2 +-
 gnome-flashback/libend-session-dialog/Makefile.am  |   49 ++++++++++++++++++++
 .../flashback-end-session-dialog.c                 |    0
 .../flashback-end-session-dialog.h                 |    0
 .../flashback-inhibit-dialog.c                     |    0
 .../flashback-inhibit-dialog.h                     |    0
 .../flashback-inhibit-dialog.ui                    |    0
 .../flashback.gresource.xml                        |    0
 .../org.gnome.SessionManager.EndSessionDialog.xml  |    0
 11 files changed, 62 insertions(+), 34 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9dc8522..0be6ccf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,10 @@ PKG_CHECK_MODULES(GNOME_FLASHBACK, gtk+-3.0 >= $GTK_REQUIRED)
 AC_SUBST(GNOME_FLASHBACK_CFLAGS)
 AC_SUBST(GNOME_FLASHBACK_LIBS)
 
+PKG_CHECK_MODULES(END_SESSION_DIALOG, gtk+-3.0 >= $GTK_REQUIRED)
+AC_SUBST(END_SESSION_DIALOG_CFLAGS)
+AC_SUBST(END_SESSION_DIALOG_LIBS)
+
 PKG_CHECK_MODULES(DESKTOP_BACKGROUND, gtk+-3.0 >= $GTK_REQUIRED gnome-desktop-3.0 >= 
$LIBGNOME_DESKTOP_REQUIRED)
 AC_SUBST(DESKTOP_BACKGROUND_CFLAGS)
 AC_SUBST(DESKTOP_BACKGROUND_LIBS)
@@ -46,6 +50,7 @@ AC_CONFIG_FILES([
 Makefile
 gnome-flashback/Makefile
 gnome-flashback/libdesktop-background/Makefile
+gnome-flashback/libend-session-dialog/Makefile
 po/Makefile.in
 sessions/Makefile
 ])
diff --git a/gnome-flashback/Makefile.am b/gnome-flashback/Makefile.am
index 6f30153..b072a95 100644
--- a/gnome-flashback/Makefile.am
+++ b/gnome-flashback/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = \
-       libdesktop-background
+       libdesktop-background \
+       libend-session-dialog
 
 bin_PROGRAMS = \
        gnome-flashback
@@ -12,27 +13,20 @@ AM_CPPFLAGS = \
 gnome_flashback_SOURCES = \
        dbus-display-config.c \
        dbus-display-config.h \
-       dbus-end-session-dialog.c \
-       dbus-end-session-dialog.h \
        dbus-idle-monitor.c \
        dbus-idle-monitor.h \
        flashback-application.c \
        flashback-application.h \
        flashback-display-config.c \
        flashback-display-config.h \
-       flashback-end-session-dialog.c \
-       flashback-end-session-dialog.h \
        flashback-idle-monitor.c \
        flashback-idle-monitor.h \
-       flashback-inhibit-dialog.c \
-       flashback-inhibit-dialog.h \
-       flashback-main.c \
-       flashback-resources.c \
-       flashback-resources.h
+       flashback-main.c
 
 gnome_flashback_LDADD = \
        $(GNOME_FLASHBACK_LIBS) \
-       $(top_builddir)/gnome-flashback/libdesktop-background/libdesktop-background.la
+       $(top_builddir)/gnome-flashback/libdesktop-background/libdesktop-background.la \
+       $(top_builddir)/gnome-flashback/libend-session-dialog/libend-session-dialog.la
 
 desktopdir       = $(datadir)/applications
 desktop_in_files = gnome-flashback.desktop.in
@@ -40,14 +34,6 @@ desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
 
 %.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d 
-u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
-dbus-end-session-dialog.h:
-dbus-end-session-dialog.c: org.gnome.SessionManager.EndSessionDialog.xml Makefile.am
-       $(AM_V_GEN) gdbus-codegen \
-               --interface-prefix=org.gnome.SessionManager \
-               --generate-c-code dbus-end-session-dialog \
-               --c-namespace DBus \
-               org.gnome.SessionManager.EndSessionDialog.xml
-
 dbus-display-config.h:
 dbus-display-config.c: org.gnome.Mutter.DisplayConfig.xml
        $(AM_V_GEN) gdbus-codegen \
@@ -65,20 +51,11 @@ dbus-idle-monitor.c: org.gnome.Mutter.IdleMonitor.xml
                --c-generate-object-manager \
                $(srcdir)/org.gnome.Mutter.IdleMonitor.xml
 
-flashback-resources.c: flashback.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/flashback.gresource.xml)
-       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name flashback 
$<
-flashback-resources.h: flashback.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/flashback.gresource.xml)
-       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name flashback 
$<
-
 BUILT_SOURCES = \
-       dbus-end-session-dialog.h \
-       dbus-end-session-dialog.c \
        dbus-display-config.h \
        dbus-display-config.c \
        dbus-idle-monitor.h \
-       dbus-idle-monitor.c \
-       flashback-resources.c \
-       flashback-resources.h
+       dbus-idle-monitor.c
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
@@ -94,11 +71,8 @@ gsettings_SCHEMAS       = $(gsettings_schemas_in:.xml.in=.xml)
 EXTRA_DIST = \
        $(desktop_in_files) \
        $(gsettings_schemas_in_in) \
-       org.gnome.SessionManager.EndSessionDialog.xml \
        org.gnome.Mutter.DisplayConfig.xml \
-       org.gnome.Mutter.IdleMonitor.xml \
-       flashback.gresource.xml \
-       flashback-inhibit-dialog.ui
+       org.gnome.Mutter.IdleMonitor.xml
 
 CLEANFILES = \
        $(desktop_DATA) \
diff --git a/gnome-flashback/flashback-application.c b/gnome-flashback/flashback-application.c
index da42eb8..5922c6b 100644
--- a/gnome-flashback/flashback-application.c
+++ b/gnome-flashback/flashback-application.c
@@ -21,7 +21,7 @@
 #include "flashback-application.h"
 #include "libdesktop-background/flashback-desktop-background.h"
 #include "flashback-display-config.h"
-#include "flashback-end-session-dialog.h"
+#include "libend-session-dialog/flashback-end-session-dialog.h"
 #include "flashback-idle-monitor.h"
 
 #define FLASHBACK_SCHEMA       "org.gnome.gnome-flashback"
diff --git a/gnome-flashback/libend-session-dialog/Makefile.am 
b/gnome-flashback/libend-session-dialog/Makefile.am
new file mode 100644
index 0000000..aee8382
--- /dev/null
+++ b/gnome-flashback/libend-session-dialog/Makefile.am
@@ -0,0 +1,49 @@
+noinst_LTLIBRARIES = \
+       libend-session-dialog.la
+
+AM_CPPFLAGS = \
+       $(END_SESSION_DIALOG_CFLAGS) \
+       -I$(top_builddir)/gnome-flashback/libend-session-dailog \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+
+libend_session_dialog_la_SOURCES = \
+       dbus-end-session-dialog.c \
+       dbus-end-session-dialog.h \
+       flashback-end-session-dialog.c \
+       flashback-end-session-dialog.h \
+       flashback-inhibit-dialog.c \
+       flashback-inhibit-dialog.h \
+       flashback-resources.c \
+       flashback-resources.h
+
+libend_session_dialog_la_LIBADD = \
+       $(END_SESSION_DIALOG_LIBS)
+
+dbus-end-session-dialog.h:
+dbus-end-session-dialog.c: org.gnome.SessionManager.EndSessionDialog.xml Makefile.am
+       $(AM_V_GEN) gdbus-codegen \
+               --interface-prefix=org.gnome.SessionManager \
+               --generate-c-code dbus-end-session-dialog \
+               --c-namespace DBus \
+               org.gnome.SessionManager.EndSessionDialog.xml
+
+flashback-resources.c: flashback.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/flashback.gresource.xml)
+       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name flashback 
$<
+flashback-resources.h: flashback.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/flashback.gresource.xml)
+       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name flashback 
$<
+
+BUILT_SOURCES = \
+       dbus-end-session-dialog.h \
+       dbus-end-session-dialog.c \
+       flashback-resources.c \
+       flashback-resources.h
+
+EXTRA_DIST = \
+       org.gnome.SessionManager.EndSessionDialog.xml \
+       flashback.gresource.xml \
+       flashback-inhibit-dialog.ui
+
+CLEANFILES = \
+       $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/gnome-flashback/flashback-end-session-dialog.c 
b/gnome-flashback/libend-session-dialog/flashback-end-session-dialog.c
similarity index 100%
rename from gnome-flashback/flashback-end-session-dialog.c
rename to gnome-flashback/libend-session-dialog/flashback-end-session-dialog.c
diff --git a/gnome-flashback/flashback-end-session-dialog.h 
b/gnome-flashback/libend-session-dialog/flashback-end-session-dialog.h
similarity index 100%
rename from gnome-flashback/flashback-end-session-dialog.h
rename to gnome-flashback/libend-session-dialog/flashback-end-session-dialog.h
diff --git a/gnome-flashback/flashback-inhibit-dialog.c 
b/gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.c
similarity index 100%
rename from gnome-flashback/flashback-inhibit-dialog.c
rename to gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.c
diff --git a/gnome-flashback/flashback-inhibit-dialog.h 
b/gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.h
similarity index 100%
rename from gnome-flashback/flashback-inhibit-dialog.h
rename to gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.h
diff --git a/gnome-flashback/flashback-inhibit-dialog.ui 
b/gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.ui
similarity index 100%
rename from gnome-flashback/flashback-inhibit-dialog.ui
rename to gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.ui
diff --git a/gnome-flashback/flashback.gresource.xml 
b/gnome-flashback/libend-session-dialog/flashback.gresource.xml
similarity index 100%
rename from gnome-flashback/flashback.gresource.xml
rename to gnome-flashback/libend-session-dialog/flashback.gresource.xml
diff --git a/gnome-flashback/org.gnome.SessionManager.EndSessionDialog.xml 
b/gnome-flashback/libend-session-dialog/org.gnome.SessionManager.EndSessionDialog.xml
similarity index 100%
rename from gnome-flashback/org.gnome.SessionManager.EndSessionDialog.xml
rename to gnome-flashback/libend-session-dialog/org.gnome.SessionManager.EndSessionDialog.xml
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]