Hello community,
here is the log from the commit of package gnome-settings-daemon for
openSUSE:Factory checked in at 2015-04-23 08:01:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-settings-daemon"
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-settings-daemon/gnome-settings-daemon.changes
2015-04-03 14:33:36.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-settings-daemon.new/gnome-settings-daemon.changes
2015-04-23 08:01:27.000000000 +0200
@@ -1,0 +2,17 @@
+Tue Apr 14 22:17:37 UTC 2015 - zai...@opensuse.org
+
+- Update to version 3.16.1:
+ + Housekeeping: Remove support for notification servers without
+ action support.
+ + Media keys: Fix a logic error that caused the power key not to
+ work.
+ + Print Notifications:
+ - Fix HTTP connection leaks.
+ - Don't show printer-deleted notifications.
+ + Wacom:
+ - Add support with stylii without an eraser, as used in some
+ Huion tablets.
+ - Fix possible crashes.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
gnome-settings-daemon-3.16.0.tar.xz
New:
----
gnome-settings-daemon-3.16.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.cp3FmU/_old 2015-04-23 08:01:28.000000000 +0200
+++ /var/tmp/diff_new_pack.cp3FmU/_new 2015-04-23 08:01:28.000000000 +0200
@@ -30,7 +30,7 @@
%endif
Name: gnome-settings-daemon
-Version: 3.16.0
+Version: 3.16.1
Release: 0
Summary: Settings daemon for the GNOME desktop
License: GPL-2.0+
++++++ gnome-settings-daemon-3.16.0.tar.xz ->
gnome-settings-daemon-3.16.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.16.0/NEWS
new/gnome-settings-daemon-3.16.1/NEWS
--- old/gnome-settings-daemon-3.16.0/NEWS 2015-03-23 11:46:15.000000000
+0100
+++ new/gnome-settings-daemon-3.16.1/NEWS 2015-04-14 12:16:52.000000000
+0200
@@ -1,4 +1,24 @@
==============
+Version 3.16.1
+==============
+
+Housekeeping:
+- Remove support for notification servers without action support
+
+Media keys:
+- Fix a logic error that caused the power key not to work
+
+Print Notifications:
+- Fix HTTP connection leaks
+- Don't show printer-deleted notifications
+
+Wacom:
+- Add support with stylii without an eraser, as used in some Huion tablets
+- Fix possible crashes
+
+- Updated translations
+
+==============
Version 3.16.0
==============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.16.0/configure
new/gnome-settings-daemon-3.16.1/configure
--- old/gnome-settings-daemon-3.16.0/configure 2015-03-23 11:46:39.000000000
+0100
+++ new/gnome-settings-daemon-3.16.1/configure 2015-04-14 12:17:12.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gnome-settings-daemon 3.16.0.
+# Generated by GNU Autoconf 2.69 for gnome-settings-daemon 3.16.1.
#
# Report bugs to
<http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='gnome-settings-daemon'
PACKAGE_TARNAME='gnome-settings-daemon'
-PACKAGE_VERSION='3.16.0'
-PACKAGE_STRING='gnome-settings-daemon 3.16.0'
+PACKAGE_VERSION='3.16.1'
+PACKAGE_STRING='gnome-settings-daemon 3.16.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon'
PACKAGE_URL=''
@@ -1534,7 +1534,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gnome-settings-daemon 3.16.0 to adapt to many kinds of
systems.
+\`configure' configures gnome-settings-daemon 3.16.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1605,7 +1605,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gnome-settings-daemon
3.16.0:";;
+ short | recursive ) echo "Configuration of gnome-settings-daemon
3.16.1:";;
esac
cat <<\_ACEOF
@@ -1830,7 +1830,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gnome-settings-daemon configure 3.16.0
+gnome-settings-daemon configure 3.16.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2320,7 +2320,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gnome-settings-daemon $as_me 3.16.0, which was
+It was created by gnome-settings-daemon $as_me 3.16.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3186,7 +3186,7 @@
# Define the identity of the package.
PACKAGE='gnome-settings-daemon'
- VERSION='3.16.0'
+ VERSION='3.16.1'
cat >>confdefs.h <<_ACEOF
@@ -21442,7 +21442,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gnome-settings-daemon $as_me 3.16.0, which was
+This file was extended by gnome-settings-daemon $as_me 3.16.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21508,7 +21508,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gnome-settings-daemon config.status 3.16.0
+gnome-settings-daemon config.status 3.16.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.16.0/configure.ac
new/gnome-settings-daemon-3.16.1/configure.ac
--- old/gnome-settings-daemon-3.16.0/configure.ac 2015-03-23
11:46:22.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/configure.ac 2015-04-14
12:16:59.000000000 +0200
@@ -1,7 +1,7 @@
AC_PREREQ([2.60])
AC_INIT([gnome-settings-daemon],
- [3.16.0],
+ [3.16.1],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon])
AC_CONFIG_SRCDIR([gnome-settings-daemon/gnome-settings-manager.c])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/gnome-settings-daemon/gsd-screen-saver-glue.c
new/gnome-settings-daemon-3.16.1/gnome-settings-daemon/gsd-screen-saver-glue.c
---
old/gnome-settings-daemon-3.16.0/gnome-settings-daemon/gsd-screen-saver-glue.c
2015-02-20 13:33:24.000000000 +0100
+++
new/gnome-settings-daemon-3.16.1/gnome-settings-daemon/gsd-screen-saver-glue.c
2015-04-14 12:17:17.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/gnome-settings-daemon/gsd-screen-saver-glue.h
new/gnome-settings-daemon-3.16.1/gnome-settings-daemon/gsd-screen-saver-glue.h
---
old/gnome-settings-daemon-3.16.0/gnome-settings-daemon/gsd-screen-saver-glue.h
2015-02-20 13:33:24.000000000 +0100
+++
new/gnome-settings-daemon-3.16.1/gnome-settings-daemon/gsd-screen-saver-glue.h
2015-04-14 12:17:17.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/gnome-settings-daemon/gsd-session-manager-glue.c
new/gnome-settings-daemon-3.16.1/gnome-settings-daemon/gsd-session-manager-glue.c
---
old/gnome-settings-daemon-3.16.0/gnome-settings-daemon/gsd-session-manager-glue.c
2015-02-20 13:33:24.000000000 +0100
+++
new/gnome-settings-daemon-3.16.1/gnome-settings-daemon/gsd-session-manager-glue.c
2015-04-14 12:17:17.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/gnome-settings-daemon/gsd-session-manager-glue.h
new/gnome-settings-daemon-3.16.1/gnome-settings-daemon/gsd-session-manager-glue.h
---
old/gnome-settings-daemon-3.16.0/gnome-settings-daemon/gsd-session-manager-glue.h
2015-02-20 13:33:24.000000000 +0100
+++
new/gnome-settings-daemon-3.16.1/gnome-settings-daemon/gsd-session-manager-glue.h
2015-04-14 12:17:17.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/gnome-settings-daemon/gsd-shell-glue.c
new/gnome-settings-daemon-3.16.1/gnome-settings-daemon/gsd-shell-glue.c
--- old/gnome-settings-daemon-3.16.0/gnome-settings-daemon/gsd-shell-glue.c
2015-02-20 13:33:24.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/gnome-settings-daemon/gsd-shell-glue.c
2015-04-14 12:17:17.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/gnome-settings-daemon/gsd-shell-glue.h
new/gnome-settings-daemon-3.16.1/gnome-settings-daemon/gsd-shell-glue.h
--- old/gnome-settings-daemon-3.16.0/gnome-settings-daemon/gsd-shell-glue.h
2015-02-20 13:33:24.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/gnome-settings-daemon/gsd-shell-glue.h
2015-04-14 12:17:17.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/datetime/geoclue.c
new/gnome-settings-daemon-3.16.1/plugins/datetime/geoclue.c
--- old/gnome-settings-daemon-3.16.0/plugins/datetime/geoclue.c 2015-02-20
13:33:37.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/datetime/geoclue.c 2015-04-14
12:17:18.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/datetime/geoclue.h
new/gnome-settings-daemon-3.16.1/plugins/datetime/geoclue.h
--- old/gnome-settings-daemon-3.16.0/plugins/datetime/geoclue.h 2015-02-20
13:33:37.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/datetime/geoclue.h 2015-04-14
12:17:18.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/datetime/timedated.c
new/gnome-settings-daemon-3.16.1/plugins/datetime/timedated.c
--- old/gnome-settings-daemon-3.16.0/plugins/datetime/timedated.c
2015-02-20 13:33:37.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/datetime/timedated.c
2015-04-14 12:17:18.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/datetime/timedated.h
new/gnome-settings-daemon-3.16.1/plugins/datetime/timedated.h
--- old/gnome-settings-daemon-3.16.0/plugins/datetime/timedated.h
2015-02-20 13:33:37.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/datetime/timedated.h
2015-04-14 12:17:18.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/housekeeping/Makefile.am
new/gnome-settings-daemon-3.16.1/plugins/housekeeping/Makefile.am
--- old/gnome-settings-daemon-3.16.0/plugins/housekeeping/Makefile.am
2015-01-29 16:55:53.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/housekeeping/Makefile.am
2015-04-01 11:32:18.000000000 +0200
@@ -3,8 +3,6 @@
COMMON_FILES = \
gsd-disk-space.c \
gsd-disk-space.h \
- gsd-ldsm-dialog.c \
- gsd-ldsm-dialog.h \
gsd-disk-space-helper.h \
gsd-disk-space-helper.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/housekeeping/Makefile.in
new/gnome-settings-daemon-3.16.1/plugins/housekeeping/Makefile.in
--- old/gnome-settings-daemon-3.16.0/plugins/housekeeping/Makefile.in
2015-03-23 11:46:41.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/housekeeping/Makefile.in
2015-04-14 12:17:13.000000000 +0200
@@ -138,7 +138,6 @@
libhousekeeping_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am__objects_1 = libhousekeeping_la-gsd-disk-space.lo \
- libhousekeeping_la-gsd-ldsm-dialog.lo \
libhousekeeping_la-gsd-disk-space-helper.lo
am_libhousekeeping_la_OBJECTS = $(am__objects_1) \
libhousekeeping_la-gsd-housekeeping-manager.lo \
@@ -154,7 +153,6 @@
$(libhousekeeping_la_LDFLAGS) $(LDFLAGS) -o $@
PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
am__objects_2 = gsd_disk_space_test-gsd-disk-space.$(OBJEXT) \
- gsd_disk_space_test-gsd-ldsm-dialog.$(OBJEXT) \
gsd_disk_space_test-gsd-disk-space-helper.$(OBJEXT)
am_gsd_disk_space_test_OBJECTS = \
gsd_disk_space_test-gsd-disk-space-test.$(OBJEXT) \
@@ -167,7 +165,6 @@
$(gsd_disk_space_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
am__objects_3 = gsd_empty_trash_test-gsd-disk-space.$(OBJEXT) \
- gsd_empty_trash_test-gsd-ldsm-dialog.$(OBJEXT) \
gsd_empty_trash_test-gsd-disk-space-helper.$(OBJEXT)
am_gsd_empty_trash_test_OBJECTS = \
gsd_empty_trash_test-gsd-empty-trash-test.$(OBJEXT) \
@@ -180,7 +177,6 @@
$(gsd_empty_trash_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
am__objects_4 = gsd_purge_temp_test-gsd-disk-space.$(OBJEXT) \
- gsd_purge_temp_test-gsd-ldsm-dialog.$(OBJEXT) \
gsd_purge_temp_test-gsd-disk-space-helper.$(OBJEXT)
am_gsd_purge_temp_test_OBJECTS = \
gsd_purge_temp_test-gsd-purge-temp-test.$(OBJEXT) \
@@ -193,7 +189,6 @@
$(gsd_purge_temp_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
am__objects_5 = gsd_test_housekeeping-gsd-disk-space.$(OBJEXT) \
- gsd_test_housekeeping-gsd-ldsm-dialog.$(OBJEXT) \
gsd_test_housekeeping-gsd-disk-space-helper.$(OBJEXT)
am_gsd_test_housekeeping_OBJECTS = \
gsd_test_housekeeping-test-housekeeping.$(OBJEXT) \
@@ -504,8 +499,6 @@
COMMON_FILES = \
gsd-disk-space.c \
gsd-disk-space.h \
- gsd-ldsm-dialog.c \
- gsd-ldsm-dialog.h \
gsd-disk-space-helper.h \
gsd-disk-space-helper.c
@@ -751,25 +744,20 @@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_disk_space_test-gsd-disk-space-helper.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_disk_space_test-gsd-disk-space-test.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_disk_space_test-gsd-disk-space.Po@am__quote@
-@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_disk_space_test-gsd-ldsm-dialog.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_empty_trash_test-gsd-disk-space-helper.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_empty_trash_test-gsd-disk-space.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_empty_trash_test-gsd-empty-trash-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_empty_trash_test-gsd-ldsm-dialog.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_purge_temp_test-gsd-disk-space-helper.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_purge_temp_test-gsd-disk-space.Po@am__quote@
-@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_purge_temp_test-gsd-ldsm-dialog.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_purge_temp_test-gsd-purge-temp-test.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_test_housekeeping-gsd-disk-space-helper.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_test_housekeeping-gsd-disk-space.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_test_housekeeping-gsd-housekeeping-manager.Po@am__quote@
-@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_test_housekeeping-gsd-ldsm-dialog.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/gsd_test_housekeeping-test-housekeeping.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libhousekeeping_la-gsd-disk-space-helper.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libhousekeeping_la-gsd-disk-space.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libhousekeeping_la-gsd-housekeeping-manager.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libhousekeeping_la-gsd-housekeeping-plugin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libhousekeeping_la-gsd-ldsm-dialog.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF
$(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -799,13 +787,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(libhousekeeping_la_CPPFLAGS) $(CPPFLAGS)
$(libhousekeeping_la_CFLAGS) $(CFLAGS) -c -o
libhousekeeping_la-gsd-disk-space.lo `test -f 'gsd-disk-space.c' || echo
'$(srcdir)/'`gsd-disk-space.c
-libhousekeeping_la-gsd-ldsm-dialog.lo: gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(libhousekeeping_la_CPPFLAGS) $(CPPFLAGS)
$(libhousekeeping_la_CFLAGS) $(CFLAGS) -MT
libhousekeeping_la-gsd-ldsm-dialog.lo -MD -MP -MF
$(DEPDIR)/libhousekeeping_la-gsd-ldsm-dialog.Tpo -c -o
libhousekeeping_la-gsd-ldsm-dialog.lo `test -f 'gsd-ldsm-dialog.c' || echo
'$(srcdir)/'`gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/libhousekeeping_la-gsd-ldsm-dialog.Tpo
$(DEPDIR)/libhousekeeping_la-gsd-ldsm-dialog.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsd-ldsm-dialog.c'
object='libhousekeeping_la-gsd-ldsm-dialog.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(libhousekeeping_la_CPPFLAGS) $(CPPFLAGS)
$(libhousekeeping_la_CFLAGS) $(CFLAGS) -c -o
libhousekeeping_la-gsd-ldsm-dialog.lo `test -f 'gsd-ldsm-dialog.c' || echo
'$(srcdir)/'`gsd-ldsm-dialog.c
-
libhousekeeping_la-gsd-disk-space-helper.lo: gsd-disk-space-helper.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(libhousekeeping_la_CPPFLAGS) $(CPPFLAGS)
$(libhousekeeping_la_CFLAGS) $(CFLAGS) -MT
libhousekeeping_la-gsd-disk-space-helper.lo -MD -MP -MF
$(DEPDIR)/libhousekeeping_la-gsd-disk-space-helper.Tpo -c -o
libhousekeeping_la-gsd-disk-space-helper.lo `test -f 'gsd-disk-space-helper.c'
|| echo '$(srcdir)/'`gsd-disk-space-helper.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/libhousekeeping_la-gsd-disk-space-helper.Tpo
$(DEPDIR)/libhousekeeping_la-gsd-disk-space-helper.Plo
@@ -855,20 +836,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_disk_space_test_CFLAGS) $(CFLAGS)
-c -o gsd_disk_space_test-gsd-disk-space.obj `if test -f 'gsd-disk-space.c';
then $(CYGPATH_W) 'gsd-disk-space.c'; else $(CYGPATH_W)
'$(srcdir)/gsd-disk-space.c'; fi`
-gsd_disk_space_test-gsd-ldsm-dialog.o: gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_disk_space_test_CFLAGS) $(CFLAGS) -MT
gsd_disk_space_test-gsd-ldsm-dialog.o -MD -MP -MF
$(DEPDIR)/gsd_disk_space_test-gsd-ldsm-dialog.Tpo -c -o
gsd_disk_space_test-gsd-ldsm-dialog.o `test -f 'gsd-ldsm-dialog.c' || echo
'$(srcdir)/'`gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gsd_disk_space_test-gsd-ldsm-dialog.Tpo
$(DEPDIR)/gsd_disk_space_test-gsd-ldsm-dialog.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsd-ldsm-dialog.c'
object='gsd_disk_space_test-gsd-ldsm-dialog.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_disk_space_test_CFLAGS) $(CFLAGS)
-c -o gsd_disk_space_test-gsd-ldsm-dialog.o `test -f 'gsd-ldsm-dialog.c' ||
echo '$(srcdir)/'`gsd-ldsm-dialog.c
-
-gsd_disk_space_test-gsd-ldsm-dialog.obj: gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_disk_space_test_CFLAGS) $(CFLAGS) -MT
gsd_disk_space_test-gsd-ldsm-dialog.obj -MD -MP -MF
$(DEPDIR)/gsd_disk_space_test-gsd-ldsm-dialog.Tpo -c -o
gsd_disk_space_test-gsd-ldsm-dialog.obj `if test -f 'gsd-ldsm-dialog.c'; then
$(CYGPATH_W) 'gsd-ldsm-dialog.c'; else $(CYGPATH_W)
'$(srcdir)/gsd-ldsm-dialog.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gsd_disk_space_test-gsd-ldsm-dialog.Tpo
$(DEPDIR)/gsd_disk_space_test-gsd-ldsm-dialog.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsd-ldsm-dialog.c'
object='gsd_disk_space_test-gsd-ldsm-dialog.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_disk_space_test_CFLAGS) $(CFLAGS)
-c -o gsd_disk_space_test-gsd-ldsm-dialog.obj `if test -f 'gsd-ldsm-dialog.c';
then $(CYGPATH_W) 'gsd-ldsm-dialog.c'; else $(CYGPATH_W)
'$(srcdir)/gsd-ldsm-dialog.c'; fi`
-
gsd_disk_space_test-gsd-disk-space-helper.o: gsd-disk-space-helper.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_disk_space_test_CFLAGS) $(CFLAGS) -MT
gsd_disk_space_test-gsd-disk-space-helper.o -MD -MP -MF
$(DEPDIR)/gsd_disk_space_test-gsd-disk-space-helper.Tpo -c -o
gsd_disk_space_test-gsd-disk-space-helper.o `test -f 'gsd-disk-space-helper.c'
|| echo '$(srcdir)/'`gsd-disk-space-helper.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gsd_disk_space_test-gsd-disk-space-helper.Tpo
$(DEPDIR)/gsd_disk_space_test-gsd-disk-space-helper.Po
@@ -911,20 +878,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_empty_trash_test_CFLAGS) $(CFLAGS)
-c -o gsd_empty_trash_test-gsd-disk-space.obj `if test -f 'gsd-disk-space.c';
then $(CYGPATH_W) 'gsd-disk-space.c'; else $(CYGPATH_W)
'$(srcdir)/gsd-disk-space.c'; fi`
-gsd_empty_trash_test-gsd-ldsm-dialog.o: gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_empty_trash_test_CFLAGS) $(CFLAGS) -MT
gsd_empty_trash_test-gsd-ldsm-dialog.o -MD -MP -MF
$(DEPDIR)/gsd_empty_trash_test-gsd-ldsm-dialog.Tpo -c -o
gsd_empty_trash_test-gsd-ldsm-dialog.o `test -f 'gsd-ldsm-dialog.c' || echo
'$(srcdir)/'`gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gsd_empty_trash_test-gsd-ldsm-dialog.Tpo
$(DEPDIR)/gsd_empty_trash_test-gsd-ldsm-dialog.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsd-ldsm-dialog.c'
object='gsd_empty_trash_test-gsd-ldsm-dialog.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_empty_trash_test_CFLAGS) $(CFLAGS)
-c -o gsd_empty_trash_test-gsd-ldsm-dialog.o `test -f 'gsd-ldsm-dialog.c' ||
echo '$(srcdir)/'`gsd-ldsm-dialog.c
-
-gsd_empty_trash_test-gsd-ldsm-dialog.obj: gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_empty_trash_test_CFLAGS) $(CFLAGS) -MT
gsd_empty_trash_test-gsd-ldsm-dialog.obj -MD -MP -MF
$(DEPDIR)/gsd_empty_trash_test-gsd-ldsm-dialog.Tpo -c -o
gsd_empty_trash_test-gsd-ldsm-dialog.obj `if test -f 'gsd-ldsm-dialog.c'; then
$(CYGPATH_W) 'gsd-ldsm-dialog.c'; else $(CYGPATH_W)
'$(srcdir)/gsd-ldsm-dialog.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gsd_empty_trash_test-gsd-ldsm-dialog.Tpo
$(DEPDIR)/gsd_empty_trash_test-gsd-ldsm-dialog.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsd-ldsm-dialog.c'
object='gsd_empty_trash_test-gsd-ldsm-dialog.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_empty_trash_test_CFLAGS) $(CFLAGS)
-c -o gsd_empty_trash_test-gsd-ldsm-dialog.obj `if test -f 'gsd-ldsm-dialog.c';
then $(CYGPATH_W) 'gsd-ldsm-dialog.c'; else $(CYGPATH_W)
'$(srcdir)/gsd-ldsm-dialog.c'; fi`
-
gsd_empty_trash_test-gsd-disk-space-helper.o: gsd-disk-space-helper.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_empty_trash_test_CFLAGS) $(CFLAGS) -MT
gsd_empty_trash_test-gsd-disk-space-helper.o -MD -MP -MF
$(DEPDIR)/gsd_empty_trash_test-gsd-disk-space-helper.Tpo -c -o
gsd_empty_trash_test-gsd-disk-space-helper.o `test -f 'gsd-disk-space-helper.c'
|| echo '$(srcdir)/'`gsd-disk-space-helper.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gsd_empty_trash_test-gsd-disk-space-helper.Tpo
$(DEPDIR)/gsd_empty_trash_test-gsd-disk-space-helper.Po
@@ -967,20 +920,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_purge_temp_test_CFLAGS) $(CFLAGS)
-c -o gsd_purge_temp_test-gsd-disk-space.obj `if test -f 'gsd-disk-space.c';
then $(CYGPATH_W) 'gsd-disk-space.c'; else $(CYGPATH_W)
'$(srcdir)/gsd-disk-space.c'; fi`
-gsd_purge_temp_test-gsd-ldsm-dialog.o: gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_purge_temp_test_CFLAGS) $(CFLAGS) -MT
gsd_purge_temp_test-gsd-ldsm-dialog.o -MD -MP -MF
$(DEPDIR)/gsd_purge_temp_test-gsd-ldsm-dialog.Tpo -c -o
gsd_purge_temp_test-gsd-ldsm-dialog.o `test -f 'gsd-ldsm-dialog.c' || echo
'$(srcdir)/'`gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gsd_purge_temp_test-gsd-ldsm-dialog.Tpo
$(DEPDIR)/gsd_purge_temp_test-gsd-ldsm-dialog.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsd-ldsm-dialog.c'
object='gsd_purge_temp_test-gsd-ldsm-dialog.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_purge_temp_test_CFLAGS) $(CFLAGS)
-c -o gsd_purge_temp_test-gsd-ldsm-dialog.o `test -f 'gsd-ldsm-dialog.c' ||
echo '$(srcdir)/'`gsd-ldsm-dialog.c
-
-gsd_purge_temp_test-gsd-ldsm-dialog.obj: gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_purge_temp_test_CFLAGS) $(CFLAGS) -MT
gsd_purge_temp_test-gsd-ldsm-dialog.obj -MD -MP -MF
$(DEPDIR)/gsd_purge_temp_test-gsd-ldsm-dialog.Tpo -c -o
gsd_purge_temp_test-gsd-ldsm-dialog.obj `if test -f 'gsd-ldsm-dialog.c'; then
$(CYGPATH_W) 'gsd-ldsm-dialog.c'; else $(CYGPATH_W)
'$(srcdir)/gsd-ldsm-dialog.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gsd_purge_temp_test-gsd-ldsm-dialog.Tpo
$(DEPDIR)/gsd_purge_temp_test-gsd-ldsm-dialog.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsd-ldsm-dialog.c'
object='gsd_purge_temp_test-gsd-ldsm-dialog.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_purge_temp_test_CFLAGS) $(CFLAGS)
-c -o gsd_purge_temp_test-gsd-ldsm-dialog.obj `if test -f 'gsd-ldsm-dialog.c';
then $(CYGPATH_W) 'gsd-ldsm-dialog.c'; else $(CYGPATH_W)
'$(srcdir)/gsd-ldsm-dialog.c'; fi`
-
gsd_purge_temp_test-gsd-disk-space-helper.o: gsd-disk-space-helper.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(gsd_purge_temp_test_CFLAGS) $(CFLAGS) -MT
gsd_purge_temp_test-gsd-disk-space-helper.o -MD -MP -MF
$(DEPDIR)/gsd_purge_temp_test-gsd-disk-space-helper.Tpo -c -o
gsd_purge_temp_test-gsd-disk-space-helper.o `test -f 'gsd-disk-space-helper.c'
|| echo '$(srcdir)/'`gsd-disk-space-helper.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gsd_purge_temp_test-gsd-disk-space-helper.Tpo
$(DEPDIR)/gsd_purge_temp_test-gsd-disk-space-helper.Po
@@ -1037,20 +976,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(gsd_test_housekeeping_CPPFLAGS) $(CPPFLAGS)
$(gsd_test_housekeeping_CFLAGS) $(CFLAGS) -c -o
gsd_test_housekeeping-gsd-disk-space.obj `if test -f 'gsd-disk-space.c'; then
$(CYGPATH_W) 'gsd-disk-space.c'; else $(CYGPATH_W)
'$(srcdir)/gsd-disk-space.c'; fi`
-gsd_test_housekeeping-gsd-ldsm-dialog.o: gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(gsd_test_housekeeping_CPPFLAGS) $(CPPFLAGS) $(gsd_test_housekeeping_CFLAGS)
$(CFLAGS) -MT gsd_test_housekeeping-gsd-ldsm-dialog.o -MD -MP -MF
$(DEPDIR)/gsd_test_housekeeping-gsd-ldsm-dialog.Tpo -c -o
gsd_test_housekeeping-gsd-ldsm-dialog.o `test -f 'gsd-ldsm-dialog.c' || echo
'$(srcdir)/'`gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gsd_test_housekeeping-gsd-ldsm-dialog.Tpo
$(DEPDIR)/gsd_test_housekeeping-gsd-ldsm-dialog.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsd-ldsm-dialog.c'
object='gsd_test_housekeeping-gsd-ldsm-dialog.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(gsd_test_housekeeping_CPPFLAGS) $(CPPFLAGS)
$(gsd_test_housekeeping_CFLAGS) $(CFLAGS) -c -o
gsd_test_housekeeping-gsd-ldsm-dialog.o `test -f 'gsd-ldsm-dialog.c' || echo
'$(srcdir)/'`gsd-ldsm-dialog.c
-
-gsd_test_housekeeping-gsd-ldsm-dialog.obj: gsd-ldsm-dialog.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(gsd_test_housekeeping_CPPFLAGS) $(CPPFLAGS) $(gsd_test_housekeeping_CFLAGS)
$(CFLAGS) -MT gsd_test_housekeeping-gsd-ldsm-dialog.obj -MD -MP -MF
$(DEPDIR)/gsd_test_housekeeping-gsd-ldsm-dialog.Tpo -c -o
gsd_test_housekeeping-gsd-ldsm-dialog.obj `if test -f 'gsd-ldsm-dialog.c'; then
$(CYGPATH_W) 'gsd-ldsm-dialog.c'; else $(CYGPATH_W)
'$(srcdir)/gsd-ldsm-dialog.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gsd_test_housekeeping-gsd-ldsm-dialog.Tpo
$(DEPDIR)/gsd_test_housekeeping-gsd-ldsm-dialog.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsd-ldsm-dialog.c'
object='gsd_test_housekeeping-gsd-ldsm-dialog.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(gsd_test_housekeeping_CPPFLAGS) $(CPPFLAGS)
$(gsd_test_housekeeping_CFLAGS) $(CFLAGS) -c -o
gsd_test_housekeeping-gsd-ldsm-dialog.obj `if test -f 'gsd-ldsm-dialog.c'; then
$(CYGPATH_W) 'gsd-ldsm-dialog.c'; else $(CYGPATH_W)
'$(srcdir)/gsd-ldsm-dialog.c'; fi`
-
gsd_test_housekeeping-gsd-disk-space-helper.o: gsd-disk-space-helper.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(gsd_test_housekeeping_CPPFLAGS) $(CPPFLAGS) $(gsd_test_housekeeping_CFLAGS)
$(CFLAGS) -MT gsd_test_housekeeping-gsd-disk-space-helper.o -MD -MP -MF
$(DEPDIR)/gsd_test_housekeeping-gsd-disk-space-helper.Tpo -c -o
gsd_test_housekeeping-gsd-disk-space-helper.o `test -f
'gsd-disk-space-helper.c' || echo '$(srcdir)/'`gsd-disk-space-helper.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/gsd_test_housekeeping-gsd-disk-space-helper.Tpo
$(DEPDIR)/gsd_test_housekeeping-gsd-disk-space-helper.Po
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/housekeeping/gsd-disk-space.c
new/gnome-settings-daemon-3.16.1/plugins/housekeeping/gsd-disk-space.c
--- old/gnome-settings-daemon-3.16.0/plugins/housekeeping/gsd-disk-space.c
2015-02-25 18:29:52.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/housekeeping/gsd-disk-space.c
2015-04-01 11:32:18.000000000 +0200
@@ -35,7 +35,6 @@
#include <libnotify/notify.h>
#include "gsd-disk-space.h"
-#include "gsd-ldsm-dialog.h"
#include "gsd-disk-space-helper.h"
#define GIGABYTE 1024 * 1024 * 1024
@@ -73,7 +72,6 @@
static GSList *ignore_paths = NULL;
static GSettings *settings = NULL;
static GSettings *privacy_settings = NULL;
-static GsdLdsmDialog *dialog = NULL;
static NotifyNotification *notification = NULL;
static guint64 *time_read;
@@ -179,28 +177,6 @@
NULL, NULL, NULL, NULL);
}
-static gboolean
-server_has_actions (void)
-{
- gboolean has;
- GList *caps;
- GList *l;
-
- caps = notify_get_server_caps ();
- if (caps == NULL) {
- fprintf (stderr, "Failed to receive server caps.\n");
- return FALSE;
- }
-
- l = g_list_find_custom (caps, "actions", (GCompareFunc)strcmp);
- has = l != NULL;
-
- g_list_foreach (caps, (GFunc) g_free, NULL);
- g_list_free (caps);
-
- return has;
-}
-
static void
ignore_callback (NotifyNotification *n,
const char *action)
@@ -584,14 +560,16 @@
{
gchar *name, *program;
gint64 free_space;
- gint response;
gboolean has_trash;
gboolean has_disk_analyzer;
gboolean retval = TRUE;
gchar *path;
+ char *free_space_str;
+ char *summary;
+ char *body;
/* Don't show a notice if one is already displayed */
- if (dialog != NULL || notification != NULL)
+ if (notification != NULL)
return retval;
name = g_unix_mount_guess_name (mount->mount);
@@ -603,111 +581,70 @@
has_disk_analyzer = (program != NULL);
g_free (program);
- if (server_has_actions ()) {
- char *free_space_str;
- char *summary;
- char *body;
-
- free_space_str = g_format_size (free_space);
-
- if (multiple_volumes) {
- summary = g_strdup_printf (_("Low Disk Space on
“%s”"), name);
- if (has_trash) {
- body = g_strdup_printf (_("The volume “%s” has
only %s disk space remaining. You may free up some space by emptying the
trash."),
- name,
- free_space_str);
- } else {
- body = g_strdup_printf (_("The volume “%s” has
only %s disk space remaining."),
- name,
- free_space_str);
- }
- } else {
- summary = g_strdup (_("Low Disk Space"));
- if (has_trash) {
- body = g_strdup_printf (_("This computer has
only %s disk space remaining. You may free up some space by emptying the
trash."),
- free_space_str);
- } else {
- body = g_strdup_printf (_("This computer has
only %s disk space remaining."),
- free_space_str);
- }
- }
- g_free (free_space_str);
-
- notification = notify_notification_new (summary, body,
"drive-harddisk-symbolic");
- g_free (summary);
- g_free (body);
-
- g_signal_connect (notification,
- "closed",
- G_CALLBACK (on_notification_closed),
- NULL);
+ free_space_str = g_format_size (free_space);
- notify_notification_set_app_name (notification, _("Disk
space"));
- notify_notification_set_hint (notification, "transient",
g_variant_new_boolean (TRUE));
- notify_notification_set_urgency (notification,
NOTIFY_URGENCY_CRITICAL);
- notify_notification_set_timeout (notification,
NOTIFY_EXPIRES_DEFAULT);
- if (has_disk_analyzer) {
- notify_notification_add_action (notification,
- "examine",
- _("Examine"),
- (NotifyActionCallback)
examine_callback,
- g_strdup (path),
- g_free);
+ if (multiple_volumes) {
+ summary = g_strdup_printf (_("Low Disk Space on “%s”"), name);
+ if (has_trash) {
+ body = g_strdup_printf (_("The volume “%s” has only %s
disk space remaining. You may free up some space by emptying the trash."),
+ name,
+ free_space_str);
+ } else {
+ body = g_strdup_printf (_("The volume “%s” has only %s
disk space remaining."),
+ name,
+ free_space_str);
}
+ } else {
+ summary = g_strdup (_("Low Disk Space"));
if (has_trash) {
- notify_notification_add_action (notification,
- "empty-trash",
- _("Empty Trash"),
- (NotifyActionCallback)
empty_trash_callback,
- NULL,
- NULL);
+ body = g_strdup_printf (_("This computer has only %s
disk space remaining. You may free up some space by emptying the trash."),
+ free_space_str);
+ } else {
+ body = g_strdup_printf (_("This computer has only %s
disk space remaining."),
+ free_space_str);
}
+ }
+ g_free (free_space_str);
+
+ notification = notify_notification_new (summary, body,
"drive-harddisk-symbolic");
+ g_free (summary);
+ g_free (body);
+
+ g_signal_connect (notification,
+ "closed",
+ G_CALLBACK (on_notification_closed),
+ NULL);
+
+ notify_notification_set_app_name (notification, _("Disk space"));
+ notify_notification_set_hint (notification, "transient",
g_variant_new_boolean (TRUE));
+ notify_notification_set_urgency (notification,
NOTIFY_URGENCY_CRITICAL);
+ notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
+ if (has_disk_analyzer) {
notify_notification_add_action (notification,
- "ignore",
- _("Ignore"),
- (NotifyActionCallback)
ignore_callback,
+ "examine",
+ _("Examine"),
+ (NotifyActionCallback)
examine_callback,
+ g_strdup (path),
+ g_free);
+ }
+ if (has_trash) {
+ notify_notification_add_action (notification,
+ "empty-trash",
+ _("Empty Trash"),
+ (NotifyActionCallback)
empty_trash_callback,
NULL,
NULL);
- notify_notification_set_category (notification, "device");
-
- if (!notify_notification_show (notification, NULL)) {
- g_warning ("failed to send disk space notification\n");
- }
+ }
+ notify_notification_add_action (notification,
+ "ignore",
+ _("Ignore"),
+ (NotifyActionCallback) ignore_callback,
+ NULL,
+ NULL);
+ notify_notification_set_category (notification, "device");
- } else {
- dialog = gsd_ldsm_dialog_new (other_usable_volumes,
- multiple_volumes,
- has_disk_analyzer,
- has_trash,
- free_space,
- name,
- path);
-
- g_object_ref (G_OBJECT (dialog));
- response = gtk_dialog_run (GTK_DIALOG (dialog));
-
- gtk_widget_destroy (GTK_WIDGET (dialog));
- dialog = NULL;
-
- switch (response) {
- case GTK_RESPONSE_CANCEL:
- retval = FALSE;
- break;
- case GSD_LDSM_DIALOG_RESPONSE_ANALYZE:
- retval = FALSE;
- ldsm_analyze_path (path);
- break;
- case GSD_LDSM_DIALOG_RESPONSE_EMPTY_TRASH:
- retval = TRUE;
- gsd_ldsm_show_empty_trash ();
- break;
- case GTK_RESPONSE_NONE:
- case GTK_RESPONSE_DELETE_EVENT:
- retval = TRUE;
- break;
- default:
- g_assert_not_reached ();
- }
+ if (!notify_notification_show (notification, NULL)) {
+ g_warning ("failed to send disk space notification\n");
}
g_free (name);
@@ -1045,8 +982,7 @@
g_signal_connect (G_OBJECT (settings), "changed",
G_CALLBACK (gsd_ldsm_update_config), NULL);
- ldsm_monitor = g_unix_mount_monitor_new ();
- g_unix_mount_monitor_set_rate_limit (ldsm_monitor, 1000);
+ ldsm_monitor = g_unix_mount_monitor_get ();
g_signal_connect (ldsm_monitor, "mounts-changed",
G_CALLBACK (ldsm_mounts_changed), NULL);
@@ -1080,7 +1016,6 @@
g_clear_object (&ldsm_monitor);
g_clear_object (&settings);
g_clear_object (&privacy_settings);
- g_clear_object (&dialog);
g_clear_pointer (¬ification, notify_notification_close);
g_slist_free_full (ignore_paths, g_free);
ignore_paths = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/housekeeping/gsd-ldsm-dialog.c
new/gnome-settings-daemon-3.16.1/plugins/housekeeping/gsd-ldsm-dialog.c
--- old/gnome-settings-daemon-3.16.0/plugins/housekeeping/gsd-ldsm-dialog.c
2015-02-17 12:16:09.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/housekeeping/gsd-ldsm-dialog.c
1970-01-01 01:00:00.000000000 +0100
@@ -1,470 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * gsd-ldsm-dialog.c
- * Copyright (C) Chris Coulson 2009 <chrisccoul...@googlemail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-
-#include "gsd-ldsm-dialog.h"
-
-#define SETTINGS_HOUSEKEEPING_DIR
"org.gnome.settings-daemon.plugins.housekeeping"
-
-enum
-{
- PROP_0,
- PROP_OTHER_USABLE_PARTITIONS,
- PROP_OTHER_PARTITIONS,
- PROP_HAS_TRASH,
- PROP_SPACE_REMAINING,
- PROP_PARTITION_NAME,
- PROP_MOUNT_PATH
-};
-
-struct GsdLdsmDialogPrivate
-{
- GtkWidget *primary_label;
- GtkWidget *secondary_label;
- GtkWidget *ignore_check_button;
- gboolean other_usable_partitions;
- gboolean other_partitions;
- gboolean has_trash;
- gint64 space_remaining;
- gchar *partition_name;
- gchar *mount_path;
-};
-
-#define GSD_LDSM_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
GSD_TYPE_LDSM_DIALOG, GsdLdsmDialogPrivate))
-
-static void gsd_ldsm_dialog_class_init (GsdLdsmDialogClass *klass);
-static void gsd_ldsm_dialog_init (GsdLdsmDialog *dialog);
-
-G_DEFINE_TYPE (GsdLdsmDialog, gsd_ldsm_dialog, GTK_TYPE_DIALOG);
-
-static const gchar*
-gsd_ldsm_dialog_get_checkbutton_text (GsdLdsmDialog *dialog)
-{
- g_return_val_if_fail (GSD_IS_LDSM_DIALOG (dialog), NULL);
-
- if (dialog->priv->other_partitions)
- return _("Don't show any warnings again for this file system");
- else
- return _("Don't show any warnings again");
-}
-
-static gchar*
-gsd_ldsm_dialog_get_primary_text (GsdLdsmDialog *dialog)
-{
- gchar *primary_text, *free_space;
-
- g_return_val_if_fail (GSD_IS_LDSM_DIALOG (dialog), NULL);
-
- free_space = g_format_size (dialog->priv->space_remaining);
-
- if (dialog->priv->other_partitions) {
- primary_text = g_strdup_printf (_("The volume \"%s\" has only
%s disk space remaining."),
- dialog->priv->partition_name,
free_space);
- } else {
- primary_text = g_strdup_printf (_("This computer has only %s
disk space remaining."),
- free_space);
- }
-
- g_free (free_space);
-
- return primary_text;
-}
-
-static const gchar*
-gsd_ldsm_dialog_get_secondary_text (GsdLdsmDialog *dialog)
-{
- g_return_val_if_fail (GSD_IS_LDSM_DIALOG (dialog), NULL);
-
- if (dialog->priv->other_usable_partitions) {
- if (dialog->priv->has_trash) {
- return _("You can free up disk space by emptying the
Trash, removing " \
- "unused programs or files, or moving files to
another disk or partition.");
- } else {
- return _("You can free up disk space by removing
unused programs or files, " \
- "or by moving files to another disk or
partition.");
- }
- } else {
- if (dialog->priv->has_trash) {
- return _("You can free up disk space by emptying the
Trash, removing unused " \
- "programs or files, or moving files to an
external disk.");
- } else {
- return _("You can free up disk space by removing
unused programs or files, " \
- "or by moving files to an external disk.");
- }
- }
-}
-
-static gint
-ignore_path_compare (gconstpointer a,
- gconstpointer b)
-{
- return g_strcmp0 ((const gchar *)a, (const gchar *)b);
-}
-
-static gboolean
-update_ignore_paths (GSList **ignore_paths,
- const gchar *mount_path,
- gboolean ignore)
-{
- GSList *found;
- gchar *path_to_remove;
-
- found = g_slist_find_custom (*ignore_paths, mount_path, (GCompareFunc)
ignore_path_compare);
-
- if (ignore && (found == NULL)) {
- *ignore_paths = g_slist_prepend (*ignore_paths, g_strdup
(mount_path));
- return TRUE;
- }
-
- if (!ignore && (found != NULL)) {
- path_to_remove = found->data;
- *ignore_paths = g_slist_remove (*ignore_paths, path_to_remove);
- g_free (path_to_remove);
- return TRUE;
- }
-
- return FALSE;
-}
-
-static void
-ignore_check_button_toggled_cb (GtkToggleButton *button,
- gpointer user_data)
-{
- GsdLdsmDialog *dialog = (GsdLdsmDialog *)user_data;
- GSettings *settings;
- gchar **settings_list;
- gboolean ignore, updated;
- gint i;
- GSList *ignore_paths = NULL;
-
- settings = g_settings_new (SETTINGS_HOUSEKEEPING_DIR);
-
- settings_list = g_settings_get_strv (settings, "ignore-paths");
-
- for (i = 0; i < G_N_ELEMENTS (settings_list); i++) {
- if (settings_list[i] != NULL)
- ignore_paths = g_slist_append (ignore_paths, g_strdup
(settings_list[i]));
- }
-
- ignore = gtk_toggle_button_get_active (button);
- updated = update_ignore_paths (&ignore_paths,
dialog->priv->mount_path, ignore);
-
- g_strfreev (settings_list);
-
- if (updated) {
- GSList *l;
- GPtrArray *array = g_ptr_array_new ();
-
- for (l = ignore_paths; l != NULL; l = l->next)
- g_ptr_array_add (array, l->data);
- g_ptr_array_add (array, NULL);
-
- if (!g_settings_set_strv (settings, "ignore-paths", (const
gchar **) array->pdata)) {
- g_warning ("Cannot change ignore preference - failed
to commit changes");
- }
-
- g_ptr_array_free (array, FALSE);
- }
-
- g_slist_foreach (ignore_paths, (GFunc) g_free, NULL);
- g_slist_free (ignore_paths);
- g_object_unref (settings);
-}
-
-static void
-gsd_ldsm_dialog_init (GsdLdsmDialog *dialog)
-{
- GtkWidget *main_vbox, *text_vbox, *hbox;
- GtkWidget *image;
-
- dialog->priv = GSD_LDSM_DIALOG_GET_PRIVATE (dialog);
-
- main_vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-
- /* Set up all the window stuff here */
- gtk_window_set_title (GTK_WINDOW (dialog), _("Low Disk Space"));
- gtk_window_set_icon_name (GTK_WINDOW (dialog),
- "dialog-warning");
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
- gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
- gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE);
- gtk_window_set_focus_on_map (GTK_WINDOW (dialog), FALSE);
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-
- /* Create the image */
- image = gtk_image_new_from_icon_name ("dialog-warning",
GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
-
- /* Create the labels */
- dialog->priv->primary_label = gtk_label_new (NULL);
- gtk_label_set_line_wrap (GTK_LABEL (dialog->priv->primary_label),
TRUE);
- gtk_label_set_single_line_mode (GTK_LABEL
(dialog->priv->primary_label), FALSE);
- gtk_misc_set_alignment (GTK_MISC (dialog->priv->primary_label), 0.0,
0.0);
- gtk_label_set_max_width_chars (GTK_LABEL
(dialog->priv->primary_label), 72);
-
- dialog->priv->secondary_label = gtk_label_new (NULL);
- gtk_label_set_line_wrap (GTK_LABEL (dialog->priv->secondary_label),
TRUE);
- gtk_label_set_single_line_mode (GTK_LABEL
(dialog->priv->secondary_label), FALSE);
- gtk_misc_set_alignment (GTK_MISC (dialog->priv->secondary_label), 0.0,
0.0);
- gtk_label_set_max_width_chars (GTK_LABEL
(dialog->priv->secondary_label), 72);
-
- /* Create the check button to ignore future warnings */
- dialog->priv->ignore_check_button = gtk_check_button_new ();
- /* The button should be inactive if the dialog was just called.
- * I suppose it could be possible for the user to manually edit the
GSettings key between
- * the mount being checked and the dialog appearing, but I don't think
it matters
- * too much */
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
(dialog->priv->ignore_check_button), FALSE);
- g_signal_connect (dialog->priv->ignore_check_button, "toggled",
- G_CALLBACK (ignore_check_button_toggled_cb), dialog);
-
- /* Now set up the dialog's GtkBox's' */
- gtk_box_set_spacing (GTK_BOX (main_vbox), 14);
-
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
-
- text_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-
- gtk_box_pack_start (GTK_BOX (text_vbox), dialog->priv->primary_label,
FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (text_vbox),
dialog->priv->secondary_label, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (text_vbox),
dialog->priv->ignore_check_button, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), text_vbox, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
-
- /* Set up the action area */
- gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG
(dialog))), 6);
- gtk_container_set_border_width (GTK_CONTAINER
(gtk_dialog_get_action_area (GTK_DIALOG (dialog))), 5);
-
- gtk_widget_show_all (hbox);
-}
-
-static void
-gsd_ldsm_dialog_finalize (GObject *object)
-{
- GsdLdsmDialog *self;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GSD_IS_LDSM_DIALOG (object));
-
- self = GSD_LDSM_DIALOG (object);
-
- g_clear_pointer (&self->priv->partition_name, g_free);
- g_clear_pointer (&self->priv->mount_path, g_free);
-
- G_OBJECT_CLASS (gsd_ldsm_dialog_parent_class)->finalize (object);
-}
-
-static void
-gsd_ldsm_dialog_set_property (GObject *object, guint prop_id, const GValue
*value, GParamSpec *pspec)
-{
- GsdLdsmDialog *self;
-
- g_return_if_fail (GSD_IS_LDSM_DIALOG (object));
-
- self = GSD_LDSM_DIALOG (object);
-
- switch (prop_id)
- {
- case PROP_OTHER_USABLE_PARTITIONS:
- self->priv->other_usable_partitions = g_value_get_boolean
(value);
- break;
- case PROP_OTHER_PARTITIONS:
- self->priv->other_partitions = g_value_get_boolean (value);
- break;
- case PROP_HAS_TRASH:
- self->priv->has_trash = g_value_get_boolean (value);
- break;
- case PROP_SPACE_REMAINING:
- self->priv->space_remaining = g_value_get_int64 (value);
- break;
- case PROP_PARTITION_NAME:
- self->priv->partition_name = g_value_dup_string (value);
- break;
- case PROP_MOUNT_PATH:
- self->priv->mount_path = g_value_dup_string (value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gsd_ldsm_dialog_get_property (GObject *object, guint prop_id, GValue *value,
GParamSpec *pspec)
-{
- GsdLdsmDialog *self;
-
- g_return_if_fail (GSD_IS_LDSM_DIALOG (object));
-
- self = GSD_LDSM_DIALOG (object);
-
- switch (prop_id)
- {
- case PROP_OTHER_USABLE_PARTITIONS:
- g_value_set_boolean (value,
self->priv->other_usable_partitions);
- break;
- case PROP_OTHER_PARTITIONS:
- g_value_set_boolean (value, self->priv->other_partitions);
- break;
- case PROP_HAS_TRASH:
- g_value_set_boolean (value, self->priv->has_trash);
- break;
- case PROP_SPACE_REMAINING:
- g_value_set_int64 (value, self->priv->space_remaining);
- break;
- case PROP_PARTITION_NAME:
- g_value_set_string (value, self->priv->partition_name);
- break;
- case PROP_MOUNT_PATH:
- g_value_set_string (value, self->priv->mount_path);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gsd_ldsm_dialog_class_init (GsdLdsmDialogClass *klass)
-{
- GObjectClass* object_class = G_OBJECT_CLASS (klass);
-
- object_class->finalize = gsd_ldsm_dialog_finalize;
- object_class->set_property = gsd_ldsm_dialog_set_property;
- object_class->get_property = gsd_ldsm_dialog_get_property;
-
- g_object_class_install_property (object_class,
- PROP_OTHER_USABLE_PARTITIONS,
- g_param_spec_boolean
("other-usable-partitions",
-
"other-usable-partitions",
- "Set to TRUE if
there are other usable partitions on the system",
- FALSE,
-
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
- g_object_class_install_property (object_class,
- PROP_OTHER_PARTITIONS,
- g_param_spec_boolean
("other-partitions",
-
"other-partitions",
- "Set to TRUE if
there are other partitions on the system",
- FALSE,
-
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
- g_object_class_install_property (object_class,
- PROP_HAS_TRASH,
- g_param_spec_boolean ("has-trash",
- "has-trash",
- "Set to TRUE if
the partition has files in it's trash folder that can be deleted",
- FALSE,
-
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
- g_object_class_install_property (object_class,
- PROP_SPACE_REMAINING,
- g_param_spec_int64 ("space-remaining",
- "space-remaining",
- "Specify how much
space is remaining in bytes",
- G_MININT64,
G_MAXINT64, 0,
- G_PARAM_WRITABLE
| G_PARAM_CONSTRUCT_ONLY));
-
- g_object_class_install_property (object_class,
- PROP_PARTITION_NAME,
- g_param_spec_string ("partition-name",
- "partition-name",
- "Specify the
name of the partition",
- "Unknown",
- G_PARAM_WRITABLE
| G_PARAM_CONSTRUCT_ONLY));
-
- g_object_class_install_property (object_class,
- PROP_MOUNT_PATH,
- g_param_spec_string ("mount-path",
- "mount-path",
- "Specify the
mount path for the partition",
- "Unknown",
- G_PARAM_WRITABLE
| G_PARAM_CONSTRUCT_ONLY));
-
- g_type_class_add_private (klass, sizeof (GsdLdsmDialogPrivate));
-}
-
-GsdLdsmDialog*
-gsd_ldsm_dialog_new (gboolean other_usable_partitions,
- gboolean other_partitions,
- gboolean display_baobab,
- gboolean display_empty_trash,
- gint64 space_remaining,
- const gchar *partition_name,
- const gchar *mount_path)
-{
- GsdLdsmDialog *dialog;
- GtkWidget *button_empty_trash, *button_ignore, *button_analyze;
- GtkWidget *empty_trash_image, *analyze_image;
- gchar *primary_text, *primary_text_markup;
- const gchar *secondary_text, *checkbutton_text;
-
- dialog = GSD_LDSM_DIALOG (g_object_new (GSD_TYPE_LDSM_DIALOG,
- "other-usable-partitions",
other_usable_partitions,
- "other-partitions",
other_partitions,
- "has-trash",
display_empty_trash,
- "space-remaining",
space_remaining,
- "partition-name",
partition_name,
- "mount-path", mount_path,
- NULL));
-
- /* Add some buttons */
- if (dialog->priv->has_trash) {
- button_empty_trash = gtk_dialog_add_button (GTK_DIALOG
(dialog),
- _("Empty Trash"),
-
GSD_LDSM_DIALOG_RESPONSE_EMPTY_TRASH);
- empty_trash_image = gtk_image_new_from_icon_name
("edit-clear", GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (GTK_BUTTON (button_empty_trash),
empty_trash_image);
- }
-
- if (display_baobab) {
- button_analyze = gtk_dialog_add_button (GTK_DIALOG (dialog),
- _("Examine…"),
-
GSD_LDSM_DIALOG_RESPONSE_ANALYZE);
- analyze_image = gtk_image_new_from_icon_name ("baobab",
GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (GTK_BUTTON (button_analyze),
analyze_image);
- }
-
- button_ignore = gtk_dialog_add_button (GTK_DIALOG (dialog),
- _("Ignore"),
- GTK_RESPONSE_CANCEL);
-
- gtk_widget_grab_default (button_ignore);
-
- /* Set the label text */
- primary_text = gsd_ldsm_dialog_get_primary_text (dialog);
- primary_text_markup = g_markup_printf_escaped ("<big><b>%s</b></big>",
primary_text);
- gtk_label_set_markup (GTK_LABEL (dialog->priv->primary_label),
primary_text_markup);
-
- secondary_text = gsd_ldsm_dialog_get_secondary_text (dialog);
- gtk_label_set_text (GTK_LABEL (dialog->priv->secondary_label),
secondary_text);
-
- checkbutton_text = gsd_ldsm_dialog_get_checkbutton_text (dialog);
- gtk_button_set_label (GTK_BUTTON (dialog->priv->ignore_check_button),
checkbutton_text);
-
- g_free (primary_text);
- g_free (primary_text_markup);
-
- return dialog;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/housekeeping/gsd-ldsm-dialog.h
new/gnome-settings-daemon-3.16.1/plugins/housekeeping/gsd-ldsm-dialog.h
--- old/gnome-settings-daemon-3.16.0/plugins/housekeeping/gsd-ldsm-dialog.h
2015-01-29 16:55:53.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/housekeeping/gsd-ldsm-dialog.h
1970-01-01 01:00:00.000000000 +0100
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * gsd-ldsm-dialog.c
- * Copyright (C) Chris Coulson 2009 <chrisccoul...@googlemail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _GSD_LDSM_DIALOG_H_
-#define _GSD_LDSM_DIALOG_H_
-
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GSD_TYPE_LDSM_DIALOG (gsd_ldsm_dialog_get_type ())
-#define GSD_LDSM_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GSD_TYPE_LDSM_DIALOG, GsdLdsmDialog))
-#define GSD_LDSM_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
GSD_TYPE_LDSM_DIALOG, GsdLdsmDialogClass))
-#define GSD_IS_LDSM_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
GSD_TYPE_LDSM_DIALOG))
-#define GSD_IS_LDSM_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
GSD_TYPE_LDSM_DIALOG))
-#define GSD_LDSM_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
GSD_TYPE_LDSM_DIALOG, GsdLdsmDialogClass))
-
-enum
-{
- GSD_LDSM_DIALOG_RESPONSE_EMPTY_TRASH = -20,
- GSD_LDSM_DIALOG_RESPONSE_ANALYZE = -21
-};
-
-typedef struct GsdLdsmDialogPrivate GsdLdsmDialogPrivate;
-typedef struct _GsdLdsmDialogClass GsdLdsmDialogClass;
-typedef struct _GsdLdsmDialog GsdLdsmDialog;
-
-struct _GsdLdsmDialogClass
-{
- GtkDialogClass parent_class;
-};
-
-struct _GsdLdsmDialog
-{
- GtkDialog parent_instance;
- GsdLdsmDialogPrivate *priv;
-};
-
-GType gsd_ldsm_dialog_get_type (void) G_GNUC_CONST;
-
-GsdLdsmDialog * gsd_ldsm_dialog_new (gboolean other_usable_partitions,
- gboolean other_partitions,
- gboolean display_baobab,
- gboolean display_empty_trash,
- gint64 space_remaining,
- const gchar *partition_name,
- const gchar *mount_path);
-
-G_END_DECLS
-
-#endif /* _GSD_LDSM_DIALOG_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/media-keys/gsd-media-keys-manager.c
new/gnome-settings-daemon-3.16.1/plugins/media-keys/gsd-media-keys-manager.c
---
old/gnome-settings-daemon-3.16.0/plugins/media-keys/gsd-media-keys-manager.c
2015-02-04 17:05:36.000000000 +0100
+++
new/gnome-settings-daemon-3.16.1/plugins/media-keys/gsd-media-keys-manager.c
2015-04-01 11:34:08.000000000 +0200
@@ -2029,7 +2029,7 @@
{
g_debug ("Launching action for key type '%d' (on device id %d)", type,
deviceid);
- gboolean power_action_interactive = !(POWER_KEYS_MODE_NO_DIALOG &
mode);
+ gboolean power_action_noninteractive = (POWER_KEYS_MODE_NO_DIALOG &
mode);
switch (type) {
case TOUCHPAD_KEY:
@@ -2150,16 +2150,16 @@
do_toggle_contrast_action (manager);
break;
case POWER_KEY:
- do_config_power_action (manager, "button-power",
power_action_interactive);
+ do_config_power_action (manager, "button-power",
power_action_noninteractive);
break;
case SLEEP_KEY:
- do_config_power_action (manager, "button-sleep",
power_action_interactive);
+ do_config_power_action (manager, "button-sleep",
power_action_noninteractive);
break;
case SUSPEND_KEY:
- do_config_power_action (manager, "button-suspend",
power_action_interactive);
+ do_config_power_action (manager, "button-suspend",
power_action_noninteractive);
break;
case HIBERNATE_KEY:
- do_config_power_action (manager, "button-hibernate",
power_action_interactive);
+ do_config_power_action (manager, "button-hibernate",
power_action_noninteractive);
break;
case SCREEN_BRIGHTNESS_UP_KEY:
case SCREEN_BRIGHTNESS_DOWN_KEY:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/media-keys/shell-key-grabber.c
new/gnome-settings-daemon-3.16.1/plugins/media-keys/shell-key-grabber.c
--- old/gnome-settings-daemon-3.16.0/plugins/media-keys/shell-key-grabber.c
2015-02-20 13:33:50.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/media-keys/shell-key-grabber.c
2015-04-01 11:38:04.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/media-keys/shell-key-grabber.h
new/gnome-settings-daemon-3.16.1/plugins/media-keys/shell-key-grabber.h
--- old/gnome-settings-daemon-3.16.0/plugins/media-keys/shell-key-grabber.h
2015-02-20 13:33:50.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/media-keys/shell-key-grabber.h
2015-04-01 11:38:04.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/mouse/gsd-mouse-manager.c
new/gnome-settings-daemon-3.16.1/plugins/mouse/gsd-mouse-manager.c
--- old/gnome-settings-daemon-3.16.0/plugins/mouse/gsd-mouse-manager.c
2015-02-04 17:05:36.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/mouse/gsd-mouse-manager.c
2015-04-08 17:43:52.000000000 +0200
@@ -1448,6 +1448,7 @@
g_clear_object (&p->mouse_settings);
g_clear_object (&p->touchpad_settings);
g_clear_object (&p->trackball_settings);
+ g_clear_object (&p->gsd_mouse_settings);
set_locate_pointer (manager, FALSE);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/print-notifications/gsd-print-notifications-manager.c
new/gnome-settings-daemon-3.16.1/plugins/print-notifications/gsd-print-notifications-manager.c
---
old/gnome-settings-daemon-3.16.0/plugins/print-notifications/gsd-print-notifications-manager.c
2015-01-29 16:55:53.000000000 +0100
+++
new/gnome-settings-daemon-3.16.1/plugins/print-notifications/gsd-print-notifications-manager.c
2015-04-13 12:50:24.000000000 +0200
@@ -443,6 +443,7 @@
ippDelete(response);
}
g_free (job_uri);
+ httpClose (http);
}
}
@@ -458,14 +459,6 @@
secondary_text = g_strdup (printer_name);
}
} else if (g_strcmp0 (notify_subscribed_event, "printer-deleted") ==
0) {
- if (is_local_dest (printer_name,
- manager->priv->dests,
- manager->priv->num_dests)) {
- /* Translators: A printer has been removed */
- primary_text = g_strdup (_("Printer removed"));
- secondary_text = g_strdup (printer_name);
- }
-
cupsFreeDests (manager->priv->num_dests, manager->priv->dests);
manager->priv->num_dests = cupsGetDests
(&manager->priv->dests);
} else if (g_strcmp0 (notify_subscribed_event, "job-completed") == 0
&& my_job) {
@@ -1040,6 +1033,7 @@
ippAddInteger (request, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
"notify-subscription-id", id);
ippDelete (cupsDoRequest (http, request, "/"));
+ httpClose (http);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.c
new/gnome-settings-daemon-3.16.1/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.c
---
old/gnome-settings-daemon-3.16.0/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.c
2015-02-20 13:34:54.000000000 +0100
+++
new/gnome-settings-daemon-3.16.1/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.c
2015-04-14 12:17:19.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.h
new/gnome-settings-daemon-3.16.1/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.h
---
old/gnome-settings-daemon-3.16.0/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.h
2015-02-20 13:34:54.000000000 +0100
+++
new/gnome-settings-daemon-3.16.1/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.h
2015-04-14 12:17:19.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.43.4. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.44.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/wacom/gsd-wacom-device.c
new/gnome-settings-daemon-3.16.1/plugins/wacom/gsd-wacom-device.c
--- old/gnome-settings-daemon-3.16.0/plugins/wacom/gsd-wacom-device.c
2015-03-13 16:07:34.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/wacom/gsd-wacom-device.c
2015-04-14 11:23:53.000000000 +0200
@@ -122,8 +122,10 @@
}
static const char *
-get_icon_name_from_type (WacomStylusType type)
+get_icon_name_from_type (const WacomStylus *wstylus)
{
+ WacomStylusType type = libwacom_stylus_get_type (wstylus);
+
switch (type) {
case WSTYLUS_INKING:
case WSTYLUS_STROKE:
@@ -137,6 +139,8 @@
case WSTYLUS_CLASSIC:
return "wacom-stylus-classic";
default:
+ if (!libwacom_stylus_has_eraser (wstylus))
+ return "wacom-stylus-no-eraser";
return "wacom-stylus";
}
}
@@ -158,7 +162,7 @@
stylus->priv->name = g_strdup (libwacom_stylus_get_name (wstylus));
stylus->priv->settings = settings;
stylus->priv->type = libwacom_stylus_get_type (wstylus);
- stylus->priv->icon_name = get_icon_name_from_type (stylus->priv->type);
+ stylus->priv->icon_name = get_icon_name_from_type (wstylus);
stylus->priv->has_eraser = libwacom_stylus_has_eraser (wstylus);
stylus->priv->num_buttons = libwacom_stylus_get_num_buttons (wstylus);
@@ -2103,6 +2107,12 @@
return "none";
}
+GdkDevice *
+gsd_wacom_device_get_gdk_device (GsdWacomDevice *device)
+{
+ return device->priv->gdk_device;
+}
+
GsdWacomDevice *
gsd_wacom_device_create_fake (GsdWacomDeviceType type,
const char *name,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/wacom/gsd-wacom-device.h
new/gnome-settings-daemon-3.16.1/plugins/wacom/gsd-wacom-device.h
--- old/gnome-settings-daemon-3.16.0/plugins/wacom/gsd-wacom-device.h
2015-03-13 16:07:34.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/wacom/gsd-wacom-device.h
2015-04-14 11:23:53.000000000 +0200
@@ -180,6 +180,8 @@
int
group_id);
int gsd_wacom_device_set_next_mode (GsdWacomDevice
*device,
GsdWacomTabletButton
*button);
+GdkDevice * gsd_wacom_device_get_gdk_device (GsdWacomDevice *device);
+
GsdWacomRotation gsd_wacom_device_rotation_name_to_type (const char *rotation);
const char * gsd_wacom_device_rotation_type_to_name (GsdWacomRotation
type);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/wacom/gsd-wacom-manager.c
new/gnome-settings-daemon-3.16.1/plugins/wacom/gsd-wacom-manager.c
--- old/gnome-settings-daemon-3.16.0/plugins/wacom/gsd-wacom-manager.c
2015-03-13 16:07:34.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/wacom/gsd-wacom-manager.c
2015-04-14 11:23:53.000000000 +0200
@@ -168,7 +168,8 @@
GdkDevice *gdk_device;
int id;
- g_object_get (device, "gdk-device", &gdk_device, NULL);
+ gdk_device = gsd_wacom_device_get_gdk_device (device);
+
if (gdk_device == NULL)
return -1;
g_object_get (gdk_device, "device-id", &id, NULL);
@@ -476,11 +477,11 @@
/* Get corresponding monitor size */
mapper = gsd_device_mapper_get ();
device_manager = gsd_device_manager_get ();
- g_object_get (device, "gdk-device", &gdk_device, NULL);
+
+ gdk_device = gsd_wacom_device_get_gdk_device (device);
gsd_device = gsd_x11_device_manager_lookup_gdk_device
(GSD_X11_DEVICE_MANAGER (device_manager),
gdk_device);
monitor = gsd_device_mapper_get_device_monitor (mapper, gsd_device);
- g_object_unref (gdk_device);
/* Adjust area to match the monitor aspect ratio */
g_debug ("Initial device area: (%d,%d) (%d,%d)", area[0], area[1],
area[2], area[3]);
@@ -1340,10 +1341,9 @@
if (n_monitors < 2)
return;
- g_object_get (device, "gdk-device", &gdk_device, NULL);
+ gdk_device = gsd_wacom_device_get_gdk_device (device);
gsd_device = gsd_x11_device_manager_lookup_gdk_device
(GSD_X11_DEVICE_MANAGER (gsd_device_manager_get ()),
gdk_device);
- g_object_unref (gdk_device);
current_monitor =
gsd_device_mapper_get_device_monitor
(manager->priv->device_mapper,
gsd_device);
@@ -1367,7 +1367,7 @@
GdkScreen *screen;
gint monitor_num;
- g_object_get (device, "gdk-device", &gdk_device, NULL);
+ gdk_device = gsd_wacom_device_get_gdk_device (device);
gsd_device = gsd_x11_device_manager_lookup_gdk_device
(GSD_X11_DEVICE_MANAGER (gsd_device_manager_get ()),
gdk_device);
monitor_num = gsd_device_mapper_get_device_monitor
(manager->priv->device_mapper,
@@ -1598,11 +1598,10 @@
screen = gdk_screen_get_default ();
mapper = gsd_device_mapper_get ();
- g_object_get (device, "gdk-device", &gdk_device, NULL);
+ gdk_device = gsd_wacom_device_get_gdk_device (device);
gsd_device = gsd_x11_device_manager_lookup_gdk_device
(GSD_X11_DEVICE_MANAGER (gsd_device_manager_get ()),
gdk_device);
monitor = gsd_device_mapper_get_device_monitor (mapper, gsd_device);
- g_object_unref (gdk_device);
if (monitor < 0) {
geometry.width = gdk_screen_get_width (screen);
@@ -1964,10 +1963,9 @@
if (type == WACOM_TYPE_PAD) {
GdkDevice *gdk_device;
- g_object_get (device, "gdk-device",
&gdk_device, NULL);
+ gdk_device = gsd_wacom_device_get_gdk_device
(device);
grab_button (gdk_x11_device_get_id
(gdk_device),
FALSE, manager->priv->screen);
- g_object_unref (gdk_device);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gnome-settings-daemon-3.16.0/plugins/wacom/list-wacom.c
new/gnome-settings-daemon-3.16.1/plugins/wacom/list-wacom.c
--- old/gnome-settings-daemon-3.16.0/plugins/wacom/list-wacom.c 2015-03-13
16:07:34.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/plugins/wacom/list-wacom.c 2015-04-14
11:23:53.000000000 +0200
@@ -190,13 +190,12 @@
GSettings *gsd_settings;
char **edid;
- g_object_get (device, "gdk-device", &gdk_device, NULL);
+ gdk_device = gsd_wacom_device_get_gdk_device (device);
if (!gdk_device)
goto bail;
gsd_device = gsd_x11_device_manager_lookup_gdk_device
(GSD_X11_DEVICE_MANAGER (gsd_device_manager_get ()),
gdk_device);
- g_object_unref (gdk_device);
if (!gsd_device)
goto bail;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gnome-settings-daemon-3.16.0/po/POTFILES.in
new/gnome-settings-daemon-3.16.1/po/POTFILES.in
--- old/gnome-settings-daemon-3.16.0/po/POTFILES.in 2015-03-13
21:32:40.000000000 +0100
+++ new/gnome-settings-daemon-3.16.1/po/POTFILES.in 2015-04-08
17:43:11.000000000 +0200
@@ -27,7 +27,6 @@
plugins/datetime/gsd-datetime-manager.c
[type: gettext/ini]plugins/dummy/dummy.gnome-settings-plugin.in
plugins/housekeeping/gsd-disk-space.c
-plugins/housekeeping/gsd-ldsm-dialog.c
[type: gettext/ini]plugins/housekeeping/housekeeping.gnome-settings-plugin.in
plugins/keyboard/gsd-keyboard-manager.c
[type: gettext/ini]plugins/keyboard/keyboard.gnome-settings-plugin.in
