summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuinn <quinn@berylinabox.(none)>2007-04-05 12:59:36 -0400
committerQuinn <quinn@berylinabox.(none)>2007-04-05 12:59:36 -0400
commit660c682e421176240b789f3cfa6a6a9aac37b993 (patch)
tree2365ffc2c49bb0e3119657e6d1739d23588bcab5
parent398a6423669a5bac8795481a1dbb4022d8e06824 (diff)
parent6fbb88f06feac67f6dbc5c52364039f5b45540c5 (diff)
downloadberyl-premerge-660c682e421176240b789f3cfa6a6a9aac37b993.tar.gz
beryl-premerge-660c682e421176240b789f3cfa6a6a9aac37b993.tar.bz2
Merge branch 'master' of git+ssh://git.beryl-project.org/git/compiz/compiz-plugins-beryl-premerge
-rw-r--r--configure.ac2
-rw-r--r--po/ChangeLog4
-rw-r--r--po/Makevars42
-rw-r--r--po/POTFILES.in20
-rw-r--r--src/ring.c1
-rw-r--r--src/showdesktop.c4
6 files changed, 71 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 6291b3c..bcf2a8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_CHECK_HEADERS([stdlib.h sys/time.h unistd.h])
IT_PROG_INTLTOOL([0.35.0])
AC_SUBST(ALL_LINGUAS)
AM_GLIB_GNU_GETTEXT
-GETTEXT_PACKAGE=beryl-plugins
+GETTEXT_PACKAGE=compiz-plugins-beryl
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
AC_SUBST(GETTEXT_PACKAGE)
diff --git a/po/ChangeLog b/po/ChangeLog
new file mode 100644
index 0000000..4fff0e1
--- /dev/null
+++ b/po/ChangeLog
@@ -0,0 +1,4 @@
+2007-04-05 cyberorg <cyberorg@cyberorg.info>
+
+ * initial internationalization
+ * use intltool-update xy_XY to update your translation
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..a1be8bf
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,42 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = compiz-plugins-beryl
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --no-location
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = beryl-project.org.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = http://bugs.beryl-project.org
+
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e69de29..15db291 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -0,0 +1,20 @@
+src/addhelper.c
+src/bench.c
+src/bench.options
+src/bench_tex.h
+src/crashhandler.c
+src/jpeg.c
+src/mblur.c
+src/neg.c
+src/put.c
+src/reflex.c
+src/ring.c
+src/showdesktop.c
+src/snap.c
+src/snow.c
+src/splash.c
+src/text.c
+src/thumbnail.c
+src/tile.c
+src/trailfocus.c
+src/wall.c
diff --git a/src/ring.c b/src/ring.c
index bc2abf1..b9f480b 100644
--- a/src/ring.c
+++ b/src/ring.c
@@ -1219,6 +1219,7 @@ ringInitiate (CompScreen *s,
return FALSE;
rs->selectedWindow = rs->windows[0]->id;
+ ringRenderWindowTitle (s);
rs->rotTarget = 0;
rs->moreAdjust = TRUE;
diff --git a/src/showdesktop.c b/src/showdesktop.c
index 94740a7..499e9c7 100644
--- a/src/showdesktop.c
+++ b/src/showdesktop.c
@@ -511,8 +511,10 @@ static Bool showdesktopPaintWindow(CompWindow *w,
else if (ss->state == SD_STATE_ON)
{
WindowPaintAttrib wAttrib = *attrib;
+ SD_WINDOW(w);
- wAttrib.opacity = wAttrib.opacity * showdesktopGetWindowOpacity(w->screen);
+ if (sw->adjust)
+ wAttrib.opacity = wAttrib.opacity * showdesktopGetWindowOpacity(w->screen);
UNWRAP(ss, w->screen, paintWindow);
status = (*w->screen->paintWindow) (w, &wAttrib, transform, region, mask);