summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@XPS-FEDORA.(none)>2010-05-07 10:28:08 +0800
committerSam Spilsbury <smspillaz@XPS-FEDORA.(none)>2010-05-07 10:28:08 +0800
commite60f4490f9672071e888d6047a728ece3b9354b8 (patch)
tree438854db67a6e693e20fcf66746801ad475001d9
parent350e4d5329a103326feb844a48e02376700b15c5 (diff)
parent2adeb06dc8dae7648e434bd784767ebb015b5989 (diff)
downloadcompizconfig-backend-gsettings-e60f4490f9672071e888d6047a728ece3b9354b8.tar.gz
compizconfig-backend-gsettings-e60f4490f9672071e888d6047a728ece3b9354b8.tar.bz2
Merge branch 'compiz++' of git+ssh://smspillaz@git.compiz.org/git/fusion/compizconfig/compizconfig-backend-gconf into compiz++
-rw-r--r--CMakeLists.txt5
-rw-r--r--Makefile.am7
-rwxr-xr-xautogen.sh16
-rw-r--r--configure.ac84
-rw-r--r--gconf.c (renamed from settings-backend/gconf.c)27
-rw-r--r--settings-backend/Makefile.am14
6 files changed, 11 insertions, 142 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..792ef12
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,5 @@
+find_package (CompizConfig REQUIRED)
+
+include (LibCompizConfigCommon)
+
+compizconfig_backend (gconf glib-2.0 gconf-2.0)
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index ed7599b..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-ALL_SUBDIRS = settings-backend
-
-SUBDIRS = $(ALL_SUBDIRS)
-
-EXTRA_DIST = VERSION
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 4b9690d..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-glib-gettextize --copy --force || exit 1
-intltoolize --automake --copy --force || exit 1
-
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
-
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 1e3bef8..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,84 +0,0 @@
-AC_PREREQ(2.57)
-
-AC_INIT([compizconfig-backend-gconf],esyscmd(. ./VERSION;echo -n $VERSION), [maniac@opencompositing.org])
-
-#AC_CONFIG_AUX_DIR(config)
-
-AM_INIT_AUTOMAKE([1.9 dist-bzip2])
-
-#AC_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
-
-AC_ISC_POSIX
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_LIBTOOL
-AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h sys/time.h unistd.h])
-
-if test "x$GCC" = "xyes"; then
- case " $CFLAGS " in
- *[[\ \ ]]-Wall[[\ \ ]]*) ;;
- *) CFLAGS="$CFLAGS -Wall" ;;
- esac
-
- case " $CFLAGS " in
- *[[\ \ ]]-Wpointer-arith[[\ \ ]]*) ;;
- *) CFLAGS="$CFLAGS -Wpointer-arith" ;;
- esac
-
- case " $CFLAGS " in
- *[[\ \ ]]-Wstrict-prototypes[[\ \ ]]*) ;;
- *) CFLAGS="$CFLAGS -Wstrict-prototypes" ;;
- esac
-
- case " $CFLAGS " in
- *[[\ \ ]]-Wmissing-prototypes[[\ \ ]]*) ;;
- *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
- esac
-
- case " $CFLAGS " in
- *[[\ \ ]]-Wmissing-declarations[[\ \ ]]*) ;;
- *) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
- esac
-
- case " $CFLAGS " in
- *[[\ \ ]]-Wnested-externs[[\ \ ]]*) ;;
- *) CFLAGS="$CFLAGS -Wnested-externs" ;;
- esac
-
- case " $CFLAGS " in
- *[[\ \ ]]-fno-strict-aliasing[[\ \ ]]*) ;;
- *) CFLAGS="$CFLAGS -fno-strict-aliasing" ;;
- esac
-
- if test "x$enable_ansi" = "xyes"; then
- case " $CFLAGS " in
- *[[\ \ ]]-ansi[[\ \ ]]*) ;;
- *) CFLAGS="$CFLAGS -ansi" ;;
- esac
-
- case " $CFLAGS " in
- *[[\ \ ]]-pedantic[[\ \ ]]*) ;;
- *) CFLAGS="$CFLAGS -pedantic" ;;
- esac
- fi
-fi
-
-AC_C_BIGENDIAN
-
-#LIBBERYLDECORATION_REQUIRES="xrender >= 0.8.4"
-#PKG_CHECK_MODULES(LIBBERYLDECORATION, $LIBBERYLDECORATION_REQUIRES)
-#AC_SUBST(LIBBERYLDECORATION_REQUIRES)
-
-PKG_CHECK_MODULES(GLIB, "glib-2.0")
-PKG_CHECK_MODULES(GCONF, "gconf-2.0")
-PKG_CHECK_MODULES(CCS, "libcompizconfig")
-
-AC_CONFIG_FILES([
-Makefile
-settings-backend/Makefile
-])
-
-AC_OUTPUT
-
diff --git a/settings-backend/gconf.c b/gconf.c
index 5903175..00e0ce2 100644
--- a/settings-backend/gconf.c
+++ b/gconf.c
@@ -60,11 +60,7 @@
#define BUFSIZE 512
#define KEYNAME char keyName[BUFSIZE]; \
- if (setting->isScreen) \
- snprintf (keyName, BUFSIZE, "screen%d", \
- setting->screenNum); \
- else \
- snprintf (keyName, BUFSIZE, "allscreens");
+ snprintf (keyName, BUFSIZE, "allscreens");
#define PATHNAME char pathName[BUFSIZE]; \
if (!setting->parent->name || \
@@ -394,7 +390,7 @@ findDisplaySettingForPlugin (CCSContext *context,
if (!p)
return NULL;
- s = ccsFindSetting (p, setting, FALSE, 0);
+ s = ccsFindSetting (p, setting);
if (!s)
return NULL;
@@ -427,11 +423,6 @@ isIntegratedOption (CCSSetting *setting,
continue;
}
- if (setting->isScreen && !opt->screen)
- continue;
- if (!setting->isScreen && opt->screen)
- continue;
-
if (index)
*index = i;
@@ -499,7 +490,7 @@ valueChanged (GConfClient *client,
if (!token)
return;
- setting = ccsFindSetting (plugin, token, isScreen, screenNum);
+ setting = ccsFindSetting (plugin, token);
if (!setting)
return;
@@ -584,17 +575,13 @@ gnomeValueChanged (GConfClient *client,
plugin = ccsFindPlugin (context, (char*) opt->pluginName);
if (plugin)
{
- for (i = 0; i < context->numScreens; i++)
+ for (i = 0; i < 1; i++)
{
unsigned int screen;
- if (opt->screen)
- screen = context->screens[i];
- else
- screen = 0;
+ screen = 0;
- setting = ccsFindSetting (plugin, (char*) opt->settingName,
- opt->screen, screen);
+ setting = ccsFindSetting (plugin, (char*) opt->settingName);
if (setting)
{
@@ -608,8 +595,6 @@ gnomeValueChanged (GConfClient *client,
/* do not read display settings multiple
times for multiscreen environments */
- if (!opt->screen)
- i = context->numScreens;
}
}
}
diff --git a/settings-backend/Makefile.am b/settings-backend/Makefile.am
deleted file mode 100644
index 5865392..0000000
--- a/settings-backend/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-INCLUDES = @GLIB_CFLAGS@ \
- @GCONF_CFLAGS@ \
- @CCS_CFLAGS@
-
-libgconf_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
-libgconf_la_LIBADD = @CCS_LIBS@ @GCONF_LIBS@ @GLIB_LIBS@
-libgconf_la_SOURCES = gconf.c
-backenddir = $(libdir)/compizconfig/backends
-
-METASOURCES = AUTO
-
-backend_LTLIBRARIES = libgconf.la