[Xfce4-commits] xfce4-vala:master Update build to Vala 0.10

2010-10-31 Thread Mike Massonnet 
Updating branch refs/heads/master
 to cc9ce853bf2f1b286a93b012b17238c3e646b5b3 (commit)
   from 26bdc6e30f47a425bf753553495cdc709c341061 (commit)

commit cc9ce853bf2f1b286a93b012b17238c3e646b5b3
Author: Mike Massonnet mmasson...@xfce.org
Date:   Wed Oct 27 21:00:15 2010 +0200

Update build to Vala 0.10

 acinclude.m4|   14 +++---
 configure.ac.in |2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 7324209..d1208ce 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -18,31 +18,31 @@ PKG_CHECK_EXISTS([$2 = $3], [],
 
 dnl # M8T_CHECK_VALA(minimum_version)
 dnl #
-dnl # Check for the package vala-1.0 and substitutes useful Vala variables.
+dnl # Check for the package vala-0.10 and substitutes useful Vala variables.
 dnl #
 AC_DEFUN([M8T_CHECK_VALA],
 [
-PKG_CHECK_MODULES([VALA], [vala-1.0 = $1])
+PKG_CHECK_MODULES([VALA], [vala-0.10 = $1])
 M8T_VALA_PROGS()
 M8T_VAPI_DIR()
 ])
 
 dnl # M8T_VALA_PROGS()
 dnl #
-dnl # Substitutes VALAC, VAPIGEN and VALAGI from vala-1.0 pkgconfig file.
+dnl # Substitutes VALAC, VAPIGEN and VALAGI from vala-0.10 pkgconfig file.
 dnl #
 AC_DEFUN([M8T_VALA_PROGS],
 [
 AC_PATH_PROG([VALAC], [valac], [valac])
-AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen vala-1.0`)
-AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect vala-1.0`)
+AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen vala-0.10`)
+AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect vala-0.10`)
 ])
 
 dnl # M8T_VAPI_DIR()
 dnl #
-dnl # Substitutes vapidir from vala-1.0 pkgconfig file.
+dnl # Substitutes vapidir from vala-0.10 pkgconfig file.
 dnl #
 AC_DEFUN([M8T_VAPI_DIR],
 [
-AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir vala-1.0`)
+AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir vala-0.10`)
 ])
diff --git a/configure.ac.in b/configure.ac.in
index ed8f06b..414c493 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -28,7 +28,7 @@ M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], 
[4.7.0])
 M8T_CHECK_PACKAGE([EXO], [exo-1], [0.5])
 
 dnl Check for Vala
-M8T_CHECK_VALA([0.7.1])
+M8T_CHECK_VALA([0.10.0])
 AC_ARG_WITH([default-vapidir],
AC_HELP_STRING([--with-default-vapidir],
[Use default VAPI prefix from Vala 
installation]),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-vala:xfce-4.6 Update test programs with Vala 0.10

2010-10-31 Thread Mike Massonnet 
Updating branch refs/heads/xfce-4.6
 to 8a20bbb705a49874c4089e9c40f0de282913da25 (commit)
   from 142e8592d2964d8a929a11c5f938bd21f9cb96ca (commit)

commit 8a20bbb705a49874c4089e9c40f0de282913da25
Author: Mike Massonnet mmasson...@xfce.org
Date:   Sun Oct 31 08:35:26 2010 +0100

Update test programs with Vala 0.10

GLib.Value can be boxed/unboxed by assignation/casting.
For example:

  Value var = 1;
  printf(%d\n, (int)var);

GLib.Object.get/set_data uses generics:

  widget.set_data(text, value);
  text = widget.get_datastring (text);

 tests/libxfce4menu-0.1.vala |3 +--
 tests/libxfconf-0.vala  |   16 +++-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/tests/libxfce4menu-0.1.vala b/tests/libxfce4menu-0.1.vala
index e6fcf0d..686937b 100644
--- a/tests/libxfce4menu-0.1.vala
+++ b/tests/libxfce4menu-0.1.vala
@@ -22,7 +22,6 @@ public class ButtonMenu : Gtk.Button {
root_menu = Xfce.Menu.get_root ();
} catch (Error ex) {
error (Unable to build a root menu);
-   return;
}
 
/* Create the gtk menu */
@@ -48,7 +47,7 @@ public class ButtonMenu : Gtk.Button {
mi = new Gtk.MenuItem.with_label (item.get_name 
());
mi.set_data (command, item.get_command());
mi.activate.connect ((mi) = {
-   debug (execute `%s', 
(string)mi.get_data (command));
+   debug (execute `%s', 
mi.get_datastring (command));
});
}
else if (item is Xfce.MenuSeparator) {
diff --git a/tests/libxfconf-0.vala b/tests/libxfconf-0.vala
index 0b0d39a..6a859ea 100644
--- a/tests/libxfconf-0.vala
+++ b/tests/libxfconf-0.vala
@@ -8,7 +8,7 @@ public class LibxfconfTests : Object {
get; set;
}
 
-   LibxfconfTests () {
+   public LibxfconfTests () {
channel = new Xfconf.Channel (test-vala-bindings);
}
 
@@ -37,23 +37,21 @@ public class LibxfconfTests : Object {
}
 
/* Set/get a Value */
-   Value prop_val = Value (typeof(int));
-   prop_val.set_int (5);
+   Value prop_val = 5;
channel.set_property (/property, prop_val);
prop_val.reset ();
channel.get_property (/property, prop_val);
-   print (property: %d\n, prop_val.get_int ());
+   print (property: %d\n, (int)prop_val);
}
 
public void test_arrays () {
/* Set an array */
-   Value val_int = Value (typeof(int));
-   Value val_string = Value (typeof(string));
-   val_int.set_int (5);
-   val_string.set_string (cinq);
-   channel.set_array (/array, typeof(int), ref val_int, 
typeof(string), ref val_string);
+   int val_int = 5;
+   string val_string = cinq;
+   channel.set_array (/array, typeof(int), val_int, 
typeof(string), val_string);
 
/* Get an array */
+// FIXME
int val2_int;
string val2_string;
channel.get_array (/array, typeof(int), out val2_int, 
typeof(string), out val2_string);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-vala:xfce-4.6 Update bindings with Vala 0.10

2010-10-31 Thread Mike Massonnet 
Updating branch refs/heads/xfce-4.6
 to 142e8592d2964d8a929a11c5f938bd21f9cb96ca (commit)
   from ddc41d565069caaa74567a3c3765f384bb9d7b1c (commit)

commit 142e8592d2964d8a929a11c5f938bd21f9cb96ca
Author: Mike Massonnet mmasson...@xfce.org
Date:   Sun Oct 31 08:34:55 2010 +0100

Update bindings with Vala 0.10

 packages/exo-0.3/exo-0.3-custom.vala   |4 +-
 packages/exo-0.3/exo-0.3.gi|2 +
 .../libxfce4menu-0.1/libxfce4menu-0.1-custom.vala  |5 --
 packages/libxfce4menu-0.1/libxfce4menu-0.1.gi  |   22 +++-
 .../libxfce4util-1.0/libxfce4util-1.0-custom.vala  |4 +-
 packages/libxfce4util-1.0/libxfce4util-1.0.gi  |6 ++
 .../libxfce4util-1.0/libxfce4util-1.0.metadata |1 +
 packages/libxfcegui4-1.0/libxfcegui4-1.0.gi|5 +-
 vapi/exo-0.3.vapi  |   51 +++-
 vapi/libxfce4menu-0.1.vapi |   38 --
 vapi/libxfce4util-1.0.vapi |6 +-
 vapi/libxfcegui4-1.0.vapi  |   10 ++--
 vapi/libxfconf-0.vapi  |8 ++--
 13 files changed, 86 insertions(+), 76 deletions(-)

diff --git a/packages/exo-0.3/exo-0.3-custom.vala 
b/packages/exo-0.3/exo-0.3-custom.vala
index b010988..e1d1ae9 100644
--- a/packages/exo-0.3/exo-0.3-custom.vala
+++ b/packages/exo-0.3/exo-0.3-custom.vala
@@ -68,9 +68,9 @@ namespace Exo {
[Compact]
public class String {
[CCode (cname = exo_intern_static_string)]
-   public static weak string intern_static (string str);
+   public static unowned string intern_static (string str);
[CCode (cname = exo_intern_string)]
-   public static weak string intern (string str);
+   public static unowned string intern (string str);
[CCode (cname = exo_str_elide_underscores)]
public static string elide_underscores (string text);
[CCode (cname = exo_str_is_equal)]
diff --git a/packages/exo-0.3/exo-0.3.gi b/packages/exo-0.3/exo-0.3.gi
index d18c894..b3c51c7 100644
--- a/packages/exo-0.3/exo-0.3.gi
+++ b/packages/exo-0.3/exo-0.3.gi
@@ -1018,6 +1018,7 @@
implements
interface name=AtkImplementor/
interface name=GtkBuildable/
+   interface name=GtkOrientable/
/implements
method name=get_model 
symbol=exo_toolbars_editor_get_model
return-type type=ExoToolbarsModel*/
@@ -1373,6 +1374,7 @@
implements
interface name=AtkImplementor/
interface name=GtkBuildable/
+   interface name=GtkOrientable/
/implements
method name=get_editing 
symbol=exo_toolbars_view_get_editing
return-type type=gboolean/
diff --git a/packages/libxfce4menu-0.1/libxfce4menu-0.1-custom.vala 
b/packages/libxfce4menu-0.1/libxfce4menu-0.1-custom.vala
index dc9a1e9..4506139 100644
--- a/packages/libxfce4menu-0.1/libxfce4menu-0.1-custom.vala
+++ b/packages/libxfce4menu-0.1/libxfce4menu-0.1-custom.vala
@@ -1,10 +1,5 @@
 namespace Xfce {
 
-   public class MenuItemCache {
-   /* Should be scanned by gen-introspect (bug?) */
-   public  unowned Xfce.MenuItem lookup (string filename, string 
desktop_id);
-   }
-
[Compact]
public class MenuMonitor {
public void* add_directory (string directory);
diff --git a/packages/libxfce4menu-0.1/libxfce4menu-0.1.gi 
b/packages/libxfce4menu-0.1/libxfce4menu-0.1.gi
index 1f39e77..17ec016 100644
--- a/packages/libxfce4menu-0.1/libxfce4menu-0.1.gi
+++ b/packages/libxfce4menu-0.1/libxfce4menu-0.1.gi
@@ -657,6 +657,14 @@
parameter name=cache 
type=XfceMenuItemCache*/
/parameters
/method
+   method name=lookup 
symbol=xfce_menu_item_cache_lookup
+   return-type type=XfceMenuItem*/
+   parameters
+   parameter name=cache 
type=XfceMenuItemCache*/
+   parameter name=filename 
type=gchar*/
+   parameter name=desktop_id 
type=gchar*/
+   /parameters
+   /method
/object
object name=XfceMenuItemPool parent=GObject 
type-name=XfceMenuItemPool get-type=xfce_menu_item_pool_get_type
method name=apply_exclude_rule 
symbol=xfce_menu_item_pool_apply_exclude_rule
@@ -680,20 +688,6 @@
parameter

[Xfce4-commits] xfce4-vala:xfce-4.6 === Release 4.6.1 ===

2010-10-31 Thread Mike Massonnet 
Updating branch refs/heads/xfce-4.6
 to f20e3846bb65ed664df5db9795bc5b424561c78e (commit)
   from 8a20bbb705a49874c4089e9c40f0de282913da25 (commit)

commit f20e3846bb65ed664df5db9795bc5b424561c78e
Author: Mike Massonnet mmasson...@xfce.org
Date:   Sun Oct 31 08:44:58 2010 +0100

=== Release 4.6.1 ===

 ChangeLog   |   30 ++
 NEWS|3 +++
 configure.ac.in |4 ++--
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e466b8f..3152737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2010-10-31  Mike Massonnet
+
+=== Release 4.6.1 ===
+
+
+2010-10-31  Mike Massonnet
+
+Update test programs with Vala 0.10
+
+GLib.Value can be boxed/unboxed by assignation/casting.
+For example:
+
+  Value var = 1;
+  printf(%d\n, (int)var);
+
+GLib.Object.get/set_data uses generics:
+
+  widget.set_data(text, value);
+  text = widget.get_datastring (text);
+
+2010-10-31  Mike Massonnet
+
+Update bindings with Vala 0.10
+
+
+2010-10-27  Mike Massonnet
+
+Update build to Vala 0.10
+
+
 2009-09-11  Mike Massonnet
 
 === Release 4.6.0 ===
diff --git a/NEWS b/NEWS
index 76d5297..1a8ec91 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
++ Version 4.6.1, 2010-10-31
+
+Updated package to Vala 0.10.
 
 + Version 4.6.0, 2009-09-11
 
diff --git a/configure.ac.in b/configure.ac.in
index 02f6439..23faeb6 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -7,14 +7,14 @@ dnl
 dnl Version information
 m4_define([project_version_major], [4])
 m4_define([project_version_minor], [6])
-m4_define([project_version_micro], [0])
+m4_define([project_version_micro], [1])
 m4_define([project_version_build], [...@revision@])
 m4_define([project_version_tag], []) # leave empty for release
 m4_define([project_version], 
[project_version_major().project_version_minor().project_version_micro()project_version_tag()])
 
 dnl Initialize
 AC_INIT([Xfce4 Vala], [project_version], [mmasson...@xfce.org], [xfce4-vala])
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 AM_MAINTAINER_MODE()
 
 dnl Check for basic programs
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-vala:xfce-4.6 Update build to Vala 0.10

2010-10-31 Thread Mike Massonnet 
Updating branch refs/heads/xfce-4.6
 to ddc41d565069caaa74567a3c3765f384bb9d7b1c (commit)
   from c360d1807f6db61b2de738cbcb9a969bbc42eca7 (commit)

commit ddc41d565069caaa74567a3c3765f384bb9d7b1c
Author: Mike Massonnet mmasson...@xfce.org
Date:   Wed Oct 27 21:00:15 2010 +0200

Update build to Vala 0.10

 acinclude.m4|   14 +++---
 configure.ac.in |2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 7324209..d1208ce 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -18,31 +18,31 @@ PKG_CHECK_EXISTS([$2 = $3], [],
 
 dnl # M8T_CHECK_VALA(minimum_version)
 dnl #
-dnl # Check for the package vala-1.0 and substitutes useful Vala variables.
+dnl # Check for the package vala-0.10 and substitutes useful Vala variables.
 dnl #
 AC_DEFUN([M8T_CHECK_VALA],
 [
-PKG_CHECK_MODULES([VALA], [vala-1.0 = $1])
+PKG_CHECK_MODULES([VALA], [vala-0.10 = $1])
 M8T_VALA_PROGS()
 M8T_VAPI_DIR()
 ])
 
 dnl # M8T_VALA_PROGS()
 dnl #
-dnl # Substitutes VALAC, VAPIGEN and VALAGI from vala-1.0 pkgconfig file.
+dnl # Substitutes VALAC, VAPIGEN and VALAGI from vala-0.10 pkgconfig file.
 dnl #
 AC_DEFUN([M8T_VALA_PROGS],
 [
 AC_PATH_PROG([VALAC], [valac], [valac])
-AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen vala-1.0`)
-AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect vala-1.0`)
+AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen vala-0.10`)
+AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect vala-0.10`)
 ])
 
 dnl # M8T_VAPI_DIR()
 dnl #
-dnl # Substitutes vapidir from vala-1.0 pkgconfig file.
+dnl # Substitutes vapidir from vala-0.10 pkgconfig file.
 dnl #
 AC_DEFUN([M8T_VAPI_DIR],
 [
-AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir vala-1.0`)
+AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir vala-0.10`)
 ])
diff --git a/configure.ac.in b/configure.ac.in
index 56daa8c..02f6439 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -29,7 +29,7 @@ M8T_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100])
 M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.6.0])
 
 dnl Check for Vala
-M8T_CHECK_VALA([0.7.1])
+M8T_CHECK_VALA([0.10.0])
 AC_ARG_WITH([default-vapidir],
AC_HELP_STRING([--with-default-vapidir],
[Use default VAPI prefix from Vala 
installation]),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-vala|xfce4-vala-4.6.1 Creating annotated tag xfce4-vala-4.6.1

2010-10-31 Thread Mike Massonnet 
Updating annotated tag refs/tags/xfce4-vala-4.6.1
 as new annotated tag
 to a8d6e9e6c98558a8fa492a14c1c4e7dadd744b01 (tag)
   succeeds xfce4-vala-4.6.0
  tagged by Mike Massonnet mmasson...@xfce.org
 on 2010-10-31 08:08 +

Mike Massonnet (4):
  Update build to Vala 0.10
  Update bindings with Vala 0.10
  Update test programs with Vala 0.10
  === Release 4.6.1 ===

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-dev-tools:master Add check stage for documentation submodules.

2010-10-31 Thread Nick Schermer 
Updating branch refs/heads/master
 to 7d85dae9cbd88e40fe987dc97e9453932e09b2ca (commit)
   from ddc1f35ba246fea94eea293a8f530de95aa0253e (commit)

commit 7d85dae9cbd88e40fe987dc97e9453932e09b2ca
Author: Nick Schermer n...@xfce.org
Date:   Sun Oct 31 12:09:20 2010 +0100

Add check stage for documentation submodules.

This adds an extra check when XDT_AUTOGEN_CHECK_DOCS
is defined. This variable points to the directory that
should contain the xfce4-docs submodule.

If no submodule clone if found and autogen.sh is running
from within a git clone, it will automatically initialize
the submodule for the user, if not it will show an error
and abort xdt-autogen, since configure will abort too if
we continue because of missing makefile.am files.

 configure.in.in   |2 +-
 scripts/xdt-autogen.in.in |   42 --
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 8e3b48a..c8af429 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -11,7 +11,7 @@ dnl *** Version information ***
 dnl ***
 m4_define([xdt_version_major], [4])
 m4_define([xdt_version_minor], [7])
-m4_define([xdt_version_micro], [2])
+m4_define([xdt_version_micro], [3])
 m4_define([xdt_version_nano], [])
 m4_define([xdt_version_build], [...@revision@])
 m4_define([xdt_version_tag], [])
diff --git a/scripts/xdt-autogen.in.in b/scripts/xdt-autogen.in.in
index 2d14ef8..c7892b6 100644
--- a/scripts/xdt-autogen.in.in
+++ b/scripts/xdt-autogen.in.in
@@ -197,8 +197,11 @@ do_version_check() {
 }
 
 if ! do_version_check; then
-  echo This version of xdt-autogen ($VERSION) is too old.  Version 2
-  echo $XDT_AUTOGEN_REQUIRED_VERSION or greater is required. 2
+  cat 2 EOF
+xdt-autogen: This version of xdt-autogen ($VERSION) is too old.
+ Version $XDT_AUTOGEN_REQUIRED_VERSION or greater is required.
+EOF
+
   exit 1
 fi
 
@@ -215,6 +218,41 @@ export XDG_DATA_DIRS XDG_DATA_HOME
 MASTER_DIR=`pwd`; test -z ${MASTER_DIR}  MASTER_DIR=.
 
 ##
+## Check for documentation submodule
+##
+if test -n $XDT_AUTOGEN_CHECK_DOCS; then
+  if test ! -f $MASTER_DIR/$XDT_AUTOGEN_CHECK_DOCS/Makefile.am; then
+# Check for git and needed files, if found, automatically
+# update the submodule
+if test -d .git -a -f .gitmodules; then
+  echo xdt-autogen: Automaticcaly initializing the 
$XDT_AUTOGEN_CHECK_DOCS submodule.
+
+  # Run git command to get the lastest docs revision
+  res=0  git submodule sync $XDT_AUTOGEN_CHECK_DOCS  \
+  git submodule update --init $XDT_AUTOGEN_CHECK_DOCS  res=1
+
+  if test $res -eq 0; then
+cat 2 EOF
+xdt-autogen: Pulling the xfce4-docs git submodule failed. See errors
+ above for more information and take a look at
+ http://wiki.xfce.org/documentation.
+EOF
+exit 1
+  fi
+else
+  cat 2 EOF
+xdt-autogen: The directory $XDT_AUTOGEN_CHECK_DOCS does not contain
+ the required files to run configure. See
+ http://wiki.xfce.org/documentation for more information.
+EOF
+  exit 1
+fi
+  #else
+# We could warn about out-of-date submodules here.
+  fi
+fi
+
+##
 ## First we do some substitutions to generate configure.{ac,in} if necessary
 ##
 CONFIGURE_AC_IN_FILES=`lookup_configure_ac_in_files $MASTER_DIR`
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-dev-tools:master Check for automake 1.11.

2010-10-31 Thread Nick Schermer 
Updating branch refs/heads/master
 to 0a39faed46ec1a72540649c69efd198a118851e8 (commit)
   from 7d85dae9cbd88e40fe987dc97e9453932e09b2ca (commit)

commit 0a39faed46ec1a72540649c69efd198a118851e8
Author: Yves-Alexis Perez cor...@debian.org
Date:   Sun Oct 31 12:40:17 2010 +0100

Check for automake 1.11.

 scripts/xdt-autogen.in.in |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/xdt-autogen.in.in b/scripts/xdt-autogen.in.in
index c7892b6..74bb2e8 100644
--- a/scripts/xdt-autogen.in.in
+++ b/scripts/xdt-autogen.in.in
@@ -467,7 +467,7 @@ done
 ## simply aclocal.
 ##
 test -z ${XDT_PROG_ACLOCAL} 
-for i in aclocal-1.10 aclocal-1.9 aclocal-1.8 aclocal; do
+for i in aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal-1.8 aclocal; do
   (${i} --version) /dev/null /dev/null 21 
   XDT_PROG_ACLOCAL=${i}  break
 done
@@ -511,7 +511,7 @@ done
 ## simply automake.
 ##
 test -z ${XDT_PROG_AUTOMAKE} 
-for i in automake-1.10 automake-1.9 automake-1.8 automake; do
+for i in automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake; do
   (${i} --version) /dev/null /dev/null 21 
   XDT_PROG_AUTOMAKE=${i}  break
 done
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:master Add test for docs module and depends on xdt 4.7.3.

2010-10-31 Thread Nick Schermer 
Updating branch refs/heads/master
 to 90485890adcfe6eb570a7570eb06009b815d8da0 (commit)
   from d77a1937197a44633c052d18998a102daf21adee (commit)

commit 90485890adcfe6eb570a7570eb06009b815d8da0
Author: Nick Schermer n...@xfce.org
Date:   Sun Oct 31 12:47:57 2010 +0100

Add test for docs module and depends on xdt 4.7.3.

 autogen.sh |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 9b317af..0438bf2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,4 +16,6 @@ EOF
   exit 1
 }
 
-XDT_AUTOGEN_REQUIRED_VERSION=4.7.2 exec xdt-autogen $@
+XDT_AUTOGEN_REQUIRED_VERSION=4.7.3 \
+XDT_AUTOGEN_CHECK_DOCS=docs/manual \
+exec xdt-autogen $@
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-appfinder:master l10n: Updated Indonesian (id) translation to 100%

2010-10-31 Thread Transifex 
Updating branch refs/heads/master
 to d205eb511094019e859fafcd2ad4d154b8546bd7 (commit)
   from 338fd38c712987b2b9f364597991aa8008507b96 (commit)

commit d205eb511094019e859fafcd2ad4d154b8546bd7
Author: Ardjuna ard_...@yahoo.com
Date:   Sun Oct 31 14:32:57 2010 +0100

l10n: Updated Indonesian (id) translation to 100%

New status: 19 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/id.po |   41 -
 1 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/po/id.po b/po/id.po
index 48b04e4..f5c688b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-appfinder 4.4.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2010-06-24 10:05+\n
+POT-Creation-Date: 2010-10-31 11:07+\n
 PO-Revision-Date: 2009-01-27 22:28+0700\n
 Last-Translator: Andhika Padmawan andhika.padma...@gmail.com\n
 Language-Team: Indonesian i...@li.org\n
@@ -50,59 +50,58 @@ msgstr Gagal menyambung ke jurik xfconf. Alasan: %s
 msgid Failed to connect to xfconf daemon.
 msgstr Gagal menyambung ke jurik xfconf.
 
-#: ../src/xfce-appfinder-window.c:225 ../data/xfce4-appfinder.desktop.in.h:1
+#: ../src/xfce-appfinder-window.c:217 ../data/xfce4-appfinder.desktop.in.h:1
 msgid Application Finder
 msgstr Pencari Aplikasi
 
-#: ../src/xfce-appfinder-window.c:227 ../data/xfce4-appfinder.desktop.in.h:2
+#: ../src/xfce-appfinder-window.c:219 ../data/xfce4-appfinder.desktop.in.h:2
 msgid Find and launch applications installed on your system
 msgstr Mencari dan menjalankan aplikasi terinstal di sistem anda
 
-#: ../src/xfce-appfinder-window.c:250
+#: ../src/xfce-appfinder-window.c:242
 msgid Search
 msgstr Telusuri
 
-#: ../src/xfce-appfinder-window.c:278
+#: ../src/xfce-appfinder-window.c:270
 msgid Categories
 msgstr Kategori
 
-#: ../src/xfce-appfinder-window.c:328
+#: ../src/xfce-appfinder-window.c:320
 msgid C_lose after launch
 msgstr Tutup sete_lah menjalankan
 
-#: ../src/xfce-appfinder-window.c:336
+#: ../src/xfce-appfinder-window.c:328
 msgid Launch
 msgstr Jalankan
 
-#: ../src/xfce-appfinder-window.c:722
-#, c-format
-msgid Could not execute application %s.
-msgstr Tak dapat mengeksekusi aplikasi %s.
-
-#: ../src/xfce-appfinder-window.c:845
+#: ../src/xfce-appfinder-window.c:458
 #, c-format
 msgid Could not load menu from %s
 msgstr Tak dapat memuat menu dari %s
 
-#: ../src/xfce-appfinder-window.c:848
-msgid Could not load system menu
-msgstr Tak dapat memuat menu sistem
-
-#: ../src/xfce-appfinder-window.c:870 ../src/xfce-appfinder-window.c:877
-#: ../src/xfce-appfinder-window.c:1106
+#: ../src/xfce-appfinder-window.c:470 ../src/xfce-appfinder-window.c:477
+#: ../src/xfce-appfinder-window.c:1115
 msgid All
 msgstr Semua
 
-#: ../src/xfce-appfinder-window.c:944
+#: ../src/xfce-appfinder-window.c:793
+#, c-format
+msgid Failed to execute command \%s\.
+msgstr Tidak dapat mengeksekusi perintah \%s\.
+
+#: ../src/xfce-appfinder-window.c:951
 #, c-format
 msgid bCategories:/b %s
 msgstr bKategori:/b %s
 
-#: ../src/xfce-appfinder-window.c:955
+#: ../src/xfce-appfinder-window.c:962
 #, c-format
 msgid bCommand:/b %s
 msgstr bPerintah:/b %s
 
+#~ msgid Could not load system menu
+#~ msgstr Tak dapat memuat menu sistem
+
 #~ msgid Could not execute application %s. Reason: %s
 #~ msgstr Tak dapat mengeksekusi aplikasi %s. Alasan: %s
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] tumbler:master l10n: Updated Indonesian (id) translation to 100%

2010-10-31 Thread Transifex 
Updating branch refs/heads/master
 to 442628be141d457d92cc67512303ff85ddfaddee (commit)
   from 64918a15e92b85ea88985d8d18faafdfb52673fc (commit)

commit 442628be141d457d92cc67512303ff85ddfaddee
Author: Ardjuna ard_...@yahoo.com
Date:   Sun Oct 31 14:42:02 2010 +0100

l10n: Updated Indonesian (id) translation to 100%

New status: 45 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/id.po |   33 +
 1 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/po/id.po b/po/id.po
index 5646d5e..5f588a5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,19 +2,19 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR em...@address, YEAR.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: Tumbler (Xfce)\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2010-07-16 17:09+0200\n
+POT-Creation-Date: 2010-10-31 11:01+\n
 PO-Revision-Date: 2010-06-01 14:35+0700\n
 Last-Translator: Δrdjuna ard_12...@rocketmail.com\n
 Language-Team: Bahasa Indonesia\n
-Language: \n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: \n
 X-Poedit-Language: Indonesian\n
 X-Poedit-Country: INDONESIA\n
 
@@ -34,7 +34,7 @@ msgstr Tidak ada proses thumbnailer untuk \%s\
 msgid Another generic thumbnailer is already running
 msgstr Terdapat proses thumbnail lain yang sedang berjalan
 
-#: ../tumblerd/tumbler-service.c:864
+#: ../tumblerd/tumbler-service.c:867
 msgid Unsupported thumbnail flavor requested
 msgstr Permintaan thumbnail tidak dapat dilayani
 
@@ -60,12 +60,8 @@ msgstr Terdapat bagian cacat \%s\ pada berkas \%s\: %s
 
 #: ../tumblerd/tumbler-manager.c:526
 #, c-format
-msgid 
-Malformed section \%s\ in file \%s\: Mismatch between section name and 
-UriScheme/MimeType
-msgstr 
-Terdapat bagian cacat \%s\ pada berkas \%s\: Ketidakcocokan antara nama 
-bagian dengan UriScheme/MimeType
+msgid Malformed section \%s\ in file \%s\: Mismatch between section name 
and UriScheme/MimeType
+msgstr Terdapat bagian cacat \%s\ pada berkas \%s\: Ketidakcocokan antara 
nama bagian dengan UriScheme/MimeType
 
 #: ../tumblerd/tumbler-manager.c:886 ../tumblerd/tumbler-manager.c:900
 #: ../tumblerd/tumbler-manager.c:914
@@ -218,27 +214,24 @@ msgid Thumbnail could not be inferred from file contents
 msgstr Tidak dapat membentuk thumbnail dari isi berkas
 
 #: ../plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c:63
-#, fuzzy
 msgid Initializing the Tumbler ffmpeg video thumbnailer plugin
-msgstr Menginisialisasi plugin \Tumbler Font Thumbnailer\
+msgstr Menginisialisasi plugin: Pratilik Video ffmpeg
 
 #: ../plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c:80
-#, fuzzy
 msgid Shutting down the Tumbler ffmpeg video thumbnailer plugin
-msgstr Mematikan plugin \Tumbler Font Thumbnailer\
+msgstr Mematikan plugin: Pratilik Video ffmpeg
 
 #: ../plugins/poppler-thumbnailer/poppler-thumbnailer-plugin.c:62
-#, fuzzy
 msgid Initializing the Tumbler Poppler PDF/PS Thumbnailer plugin
-msgstr Menginisialisasi plugin \Tumbler Font Thumbnailer\
+msgstr Menginisialisasi plugin: Pratilik Poppler PDF/PS
 
-#: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:182
+#: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:209
 msgid The document is empty
-msgstr 
+msgstr Dokumen kosong
 
-#: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:193
+#: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:221
 msgid First page of the document could not be read
-msgstr 
+msgstr Tidak dapat membaca halaman awal dokumen
 
 #: ../plugins/xdg-cache/xdg-cache-thumbnail.c:382
 #, c-format
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] exo:master l10n: Updated Indonesian (id) translation to 100%

2010-10-31 Thread Transifex 
Updating branch refs/heads/master
 to 992a8e83060db825dfb3c53ba19766d38daf06de (commit)
   from eb277c5d92f4dcdc6fad8ac29a3a5d7db0bea31f (commit)

commit 992a8e83060db825dfb3c53ba19766d38daf06de
Author: Ardjuna ard_...@yahoo.com
Date:   Sun Oct 31 14:53:51 2010 +0100

l10n: Updated Indonesian (id) translation to 100%

New status: 273 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/id.po |  202 ++---
 1 files changed, 73 insertions(+), 129 deletions(-)

diff --git a/po/id.po b/po/id.po
index fe45d94..a820c53 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2004-2007 os-cillation e.K.
 # This file is distributed under the same license as the libexo package.
 # Andhika Padmawan andhika.padma...@gmail.com, 2010.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: exo 0.3.4\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2010-07-21 18:14+0200\n
+POT-Creation-Date: 2010-10-31 11:00+\n
 PO-Revision-Date: 2010-06-26 09:22-0400\n
 Last-Translator: Andhika Padmawan andhika.padma...@gmail.com\n
 Language-Team: Indonesian translation-team...@lists.sourceforge.net\n
-Language: id\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: id\n
 
 #: ../exo/exo-cell-renderer-ellipsized-text.c:131
 #: ../exo/exo-cell-renderer-icon.c:144
@@ -62,11 +62,8 @@ msgstr Gagal membaca berkas \%s\: %s
 
 #: ../exo/exo-gdk-pixbuf-extensions.c:890
 #, c-format
-msgid 
-Failed to load image \%s\: Unknown reason, probably a corrupt image file
-msgstr 
-Gagal memuat gambar \%s\: Alasan tidak diketahui, kemungkinan berkas 
-gambar yang korup
+msgid Failed to load image \%s\: Unknown reason, probably a corrupt image 
file
+msgstr Gagal memuat gambar \%s\: Alasan tidak diketahui, kemungkinan berkas 
gambar yang korup
 
 #: ../exo/exo-gtk-extensions.c:227
 #, c-format
@@ -243,8 +240,7 @@ msgstr Aktifkan Cari
 
 #: ../exo/exo-icon-view.c:677
 msgid View allows user to search through columns interactively
-msgstr 
-Tampilan mengizinkan pengguna untuk mencari dalam kolom secara interaktif
+msgstr Tampilan mengizinkan pengguna untuk mencari dalam kolom secara 
interaktif
 
 #: ../exo/exo-icon-view.c:694
 msgid Width for each item
@@ -276,8 +272,7 @@ msgstr Kolom markah
 
 #: ../exo/exo-icon-view.c:748
 msgid Model column used to retrieve the text if using Pango markup
-msgstr 
-Kolom model yang digunakan untuk mengambil teks jika menggunakan markah Pango
+msgstr Kolom model yang digunakan untuk mengambil teks jika menggunakan 
markah Pango
 
 #: ../exo/exo-icon-view.c:762
 msgid Icon View Model
@@ -288,11 +283,8 @@ msgid The model for the icon view
 msgstr Model untuk tampilan ikon
 
 #: ../exo/exo-icon-view.c:777
-msgid 
-How the text and icon of each item are positioned relative to each other
-msgstr 
-Cara teks dan ikon untuk setiap item diletakkan secara relatif terhadap satu 
-sama lain
+msgid How the text and icon of each item are positioned relative to each 
other
+msgstr Cara teks dan ikon untuk setiap item diletakkan secara relatif 
terhadap satu sama lain
 
 #: ../exo/exo-icon-view.c:809
 msgid Reorderable
@@ -339,12 +331,8 @@ msgid Single Click Timeout
 msgstr Waktu Klik Tunggal
 
 #: ../exo/exo-icon-view.c:889 ../exo/exo-tree-view.c:172
-msgid 
-The amount of time after which the item under the mouse cursor will be 
-selected automatically in single click mode
-msgstr 
-Jumlah waktu yang dibutuhkan kursor tetikus untuk secara otomatis memilih 
-item pada mode klik tunggal
+msgid The amount of time after which the item under the mouse cursor will be 
selected automatically in single click mode
+msgstr Jumlah waktu yang dibutuhkan kursor tetikus untuk secara otomatis 
memilih item pada mode klik tunggal
 
 #: ../exo/exo-icon-view.c:904
 msgid Spacing
@@ -403,12 +391,8 @@ msgid _Add a new toolbar
 msgstr _Tambah batang alat baru
 
 #: ../exo/exo-toolbars-editor.c:221
-msgid 
-Drag an item onto the toolbars above to add it, from the toolbars in the 
-items table to remove it.
-msgstr 
-Tarik item ke batang alat di atas untuk menambahkannya, dari batang alat di 
-tabel item untuk menghapusnya.
+msgid Drag an item onto the toolbars above to add it, from the toolbars in 
the items table to remove it.
+msgstr Tarik item ke batang alat di atas untuk menambahkannya, dari batang 
alat di tabel item untuk menghapusnya.
 
 #: ../exo/exo-toolbars-editor.c:538
 msgid Separator
@@ -614,38 +598,44 @@ msgstr Skrip Shell
 msgid Create Launcher b%s/b
 msgstr Buat Peluncur b%s/b
 
-#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to 
avoid mnemonic conflicts
+#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to
+#. avoid mnemonic conflicts
 #: ../exo-desktop-item-edit/exo-die-editor.c:297
 msgid _Name:
 msgstr _Nama:
 
-#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure

[Xfce4-commits] xfce4-dev-tools:master Updates for release.

2010-10-31 Thread Nick Schermer 
Updating branch refs/heads/master
 to e0952f10499edcf6822b54811cb515b560612969 (commit)
   from 6bdbfdf491d3aa61806edc24b6a4cf984083c7ec (commit)

commit e0952f10499edcf6822b54811cb515b560612969
Author: Nick Schermer n...@xfce.org
Date:   Sun Oct 31 15:08:40 2010 +0100

Updates for release.

 NEWS |7 +++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index bd2e4e3..3e02eab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+4.7.3
+=
+- Build ChangeLog from GIT.
+- Add check stage for documentation submodules.
+- Check for automake 1.11.
+- Check if $1 is a file before calling cat (bug #6101).
+
 4.7.2
 =
 - Brown bag: fix typo that breaks XDT_FEATURE_LINKER_OPTS
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-dev-tools|xfce4-dev-tools-4.7.3 Creating annotated tag xfce4-dev-tools-4.7.3

2010-10-31 Thread Nick Schermer 
Updating annotated tag refs/tags/xfce4-dev-tools-4.7.3
 as new annotated tag
 to b24e540e551e178dee5f31b425e034376b2e70b4 (tag)
   succeeds xfce4-dev-tools-4.7.2
  tagged by Nick Schermer n...@xfce.org
 on 2010-10-31 14:10 +

Nick Schermer (6):
  Don't set the default visibility in XDT_FEATURE_VISIBILITY.
  Revert Don't set the default visibility in XDT_FEATURE_VISIBILITY.
  Build ChangeLog from GIT.
  Add check stage for documentation submodules.
  Check if $1 is a file before calling cat (bug #6101).
  Updates for release.

Yves-Alexis Perez (1):
  Check for automake 1.11.

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] www:master Fix the Italian homepage.

2010-10-31 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to bfc3491475d7d153c67cb847f17cab05da11fe43 (commit)
   from d2df8e71fd715a246ac2263f903103615d74151b (commit)

commit bfc3491475d7d153c67cb847f17cab05da11fe43
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Sun Oct 31 15:18:28 2010 +0100

Fix the Italian homepage.

 i18n/news/it.news.php |   11 ++-
 include/arrays.php|2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/i18n/news/it.news.php b/i18n/news/it.news.php
index ab0ec27..3af4f2f 100755
--- a/i18n/news/it.news.php
+++ b/i18n/news/it.news.php
@@ -46,7 +46,8 @@ $news = array (
  [br][br].
  Si ringraziano tutti coloro che hanno fornito un 
contributo alla traduzione..
  [br][br].
- Il gruppo di traduzione in Italiano di Xfce.
+ Il gruppo di traduzione in Italiano di Xfce.,
+),
 array (
 'id'  = 3,
 'date'= 23 Maggio 2010,
@@ -64,7 +65,7 @@ $news = array (
  La nuova versione può essere scaricata da qui: .
  [link=/download]http://www.xfce.org/download[/link];.
  [br][br].
- Il team di sviluppo di Xfce.
+ Il team di sviluppo di Xfce.,
 ),
 array (
 'id'  = 2,
@@ -88,7 +89,7 @@ $news = array (
  La nuova versione può essere scaricata da qui: .
  [link=/download]http://www.xfce.org/download[/link];.
  [br][br].
- Il team di sviluppo di Xfce.
+ Il team di sviluppo di Xfce.,
 ),
 array (
 'id'  = 1,
@@ -109,7 +110,7 @@ $news = array (
  Xfce 4.6 può essere scaricato dalla sezione Download del 
sito di Xfce:[br].
  [link=/download]http://www.xfce.org/download[/link];.
  [br][br].
- Il team di sviluppo di Xfce.
- ,
+ Il team di sviluppo di Xfce.,
+),
 );
 ?
diff --git a/include/arrays.php b/include/arrays.php
index 179dc41..fe2fbe6 100644
--- a/include/arrays.php
+++ b/include/arrays.php
@@ -35,7 +35,7 @@ $languages = array (
 ca = array ('Català', 'UTF-8', 'ca'),
 fr = array ('Français', 'UTF-8', 'fr_FR.utf8'),
 id = array ('Bahasa Indonesia', 'UTF-8', 'id_ID'),
-/*  it = array ('Italiano', 'UTF-8', 'it'), */
+it = array ('Italiano', 'UTF-8', 'it'),
 ja = array ('Nihon', 'UTF-8', 'ja_JP.utf8'),
 nl = array ('Nederlands', 'UTF-8', 'nl_NL'),
 pt_BR = array ('Português do Brasil', 'UTF-8', 'pt_BR.utf8'),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] libxfcegui4:master Fix distcheck.

2010-10-31 Thread Nick Schermer 
Updating branch refs/heads/master
 to de23ac875814c3a990f81ec59767b577be3eb4fd (commit)
   from a5766f388c4cab08feb9a278e2547427e703dbb3 (commit)

commit de23ac875814c3a990f81ec59767b577be3eb4fd
Author: Nick Schermer n...@xfce.org
Date:   Sun Oct 31 15:27:20 2010 +0100

Fix distcheck.

 docs/Makefile.am   |4 +++-
 glade/Makefile.am  |1 +
 libxfcegui4/Makefile.am|1 +
 libxfcegui4/xfce-appmenuitem.h |6 --
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 4046464..886bfe5 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -42,11 +42,13 @@ content_files = \
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS =\
+   -DLIBXFCEGUI4_COMPILATION   \
+   -DLIBXFCE4UTIL_COMPILATION  \
-I$(top_srcdir) \
-I$(top_builddir)   \
$(GTK_CFLAGS)   \
 $(LIBSM_CFLAGS)\
-$(LIBX11_CFLAGS)   \
+$(LIBX11_CFLAGS)   \
 $(LIBXFCE4UTIL_CFLAGS) 
 
 
diff --git a/glade/Makefile.am b/glade/Makefile.am
index 2471413..577033d 100644
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = \
 
 INCLUDES = \
-DLIBXFCEGUI4_COMPILATION   \
+   -DLIBXFCE4UTIL_COMPILATION  \
$(PLATFORM_CPPFLAGS)
 
 if HAVE_GLADEUI
diff --git a/libxfcegui4/Makefile.am b/libxfcegui4/Makefile.am
index 44d4b72..39cc908 100644
--- a/libxfcegui4/Makefile.am
+++ b/libxfcegui4/Makefile.am
@@ -8,6 +8,7 @@ INCLUDES =  
\
-DPACKAGE_LOCALE_DIR=\$(localedir)\   \
-DPREFIX=\$(prefix)\  \
-DLIBXFCEGUI4_COMPILATION   \
+   -DLIBXFCE4UTIL_COMPILATION  \
$(PLATFORM_CPPFLAGS)
 
 lib_LTLIBRARIES =  \
diff --git a/libxfcegui4/xfce-appmenuitem.h b/libxfcegui4/xfce-appmenuitem.h
index 0a03715..9c33c45 100644
--- a/libxfcegui4/xfce-appmenuitem.h
+++ b/libxfcegui4/xfce-appmenuitem.h
@@ -26,12 +26,6 @@
 #include gtk/gtkimagemenuitem.h
 #include libxfce4util/libxfce4util.h
 
-/* work around deprecated api in libxfce4util */
-#define LIBXFCE4UTIL_COMPILATION
-#undef __XFCE_DESKTOPENTRY_H__
-#include libxfce4util/xfce-desktopentry.h
-#undef LIBXFCE4UTIL_COMPILATION
-
 G_BEGIN_DECLS
 
 #define XFCE_TYPE_APP_MENU_ITEM(xfce_app_menu_item_get_type())
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] libxfcegui4:master Deprecated all functions and objects in libxfcegui4.

2010-10-31 Thread Nick Schermer 
Updating branch refs/heads/master
 to 00e41afbcc1f5170a808ebab64558dc3c39d7216 (commit)
   from de23ac875814c3a990f81ec59767b577be3eb4fd (commit)

commit 00e41afbcc1f5170a808ebab64558dc3c39d7216
Author: Nick Schermer n...@xfce.org
Date:   Sun Oct 31 15:42:43 2010 +0100

Deprecated all functions and objects in libxfcegui4.

 libxfcegui4/dialogs.h   |6 --
 libxfcegui4/gtk_style.h |4 
 libxfcegui4/gtktoxevent.h   |8 
 libxfcegui4/icons.h |   17 +
 libxfcegui4/netk-application.h  |5 +
 libxfcegui4/netk-class-group.h  |5 +
 libxfcegui4/netk-pager.h|5 +
 libxfcegui4/netk-screen.h   |5 +
 libxfcegui4/netk-tasklist.h |5 +
 libxfcegui4/netk-trayicon.h |7 ---
 libxfcegui4/netk-util.h |5 +
 libxfcegui4/netk-window-action-menu.h   |4 
 libxfcegui4/netk-window-menu.h  |5 +
 libxfcegui4/netk-window.h   |5 +
 libxfcegui4/netk-workspace.h|5 +
 libxfcegui4/preview_filesel.h   |7 ---
 libxfcegui4/session-client.h|5 +
 libxfcegui4/xfce-appmenuitem.h  |8 +---
 libxfcegui4/xfce-colorbutton.h  |8 
 libxfcegui4/xfce-exec.h |4 
 libxfcegui4/xfce-filechooser.h  |8 
 libxfcegui4/xfce-gdk-extensions.h   |4 
 libxfcegui4/xfce-gtk-extensions.h   |4 
 libxfcegui4/xfce-heading.h  |4 
 libxfcegui4/xfce-icontheme.h|7 ---
 libxfcegui4/xfce-startup-notification.h |4 
 libxfcegui4/xfce-widget-helpers.h   |4 
 libxfcegui4/xfce_aboutdialog.h  |4 
 libxfcegui4/xfce_clock.h|8 
 libxfcegui4/xfce_decorbutton.h  |8 
 libxfcegui4/xfce_decortoggle.h  |7 +++
 libxfcegui4/xfce_framebox.h |7 ---
 libxfcegui4/xfce_iconbutton.h   |4 
 libxfcegui4/xfce_menubutton.h   |4 
 libxfcegui4/xfce_movehandler.h  |4 
 libxfcegui4/xfce_scaled_image.h |4 
 libxfcegui4/xfce_systemtray.h   |7 ---
 libxfcegui4/xfce_togglebutton.h |5 -
 libxfcegui4/xinerama.h  |   14 +++---
 39 files changed, 174 insertions(+), 60 deletions(-)

diff --git a/libxfcegui4/dialogs.h b/libxfcegui4/dialogs.h
index eda5a03..8c71d56 100644
--- a/libxfcegui4/dialogs.h
+++ b/libxfcegui4/dialogs.h
@@ -21,6 +21,8 @@
 #ifndef _LIBXFCEGUI4_DIALOGS_H
 #define _LIBXFCEGUI4_DIALOGS_H
 
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
 #include stdarg.h
 
 #include glib.h
@@ -32,7 +34,6 @@ G_BEGIN_DECLS
 
 /* new wrappers aroung gtk_message_dialog */
 
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
 /* compat stubs, to be removed someday! */
 void show_info (const char *text);
 void show_warning (const char *text);
@@ -44,7 +45,6 @@ GtkWidget *small_label (const char *text);
 GtkWidget *mixed_button_new (const char *stock, const char *text);
 gboolean exec_command (gchar * command);
 gboolean exec_command_full_with_envp (gchar ** argv, gchar ** envp);
-#endif
 
 #define XFCE_CUSTOM_PIXBUF_BUTTONcustom-button-pixbuf
 #define XFCE_CUSTOM_STOCK_BUTTON custom-button-stock
@@ -88,4 +88,6 @@ GtkWidget *xfce_create_mixed_button  (const gchar *stock,
 
 G_END_DECLS
 
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
 #endif /* _LIBXFCEGUI4_DIALOGS_H */
diff --git a/libxfcegui4/gtk_style.h b/libxfcegui4/gtk_style.h
index 0f52e86..dc2d13c 100644
--- a/libxfcegui4/gtk_style.h
+++ b/libxfcegui4/gtk_style.h
@@ -20,6 +20,8 @@
 #ifndef __GTKSTYLE_H__
 #define __GTKSTYLE_H__
 
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
 #include glib.h
 #include gtk/gtk.h
 #include pango/pango-font.h
@@ -33,4 +35,6 @@ PangoContext *pango_get_context (GtkWidget *widget);
 
 G_END_DECLS
 
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
 #endif
diff --git a/libxfcegui4/gtktoxevent.h b/libxfcegui4/gtktoxevent.h
index decfe42..11916cb 100644
--- a/libxfcegui4/gtktoxevent.h
+++ b/libxfcegui4/gtktoxevent.h
@@ -20,6 +20,8 @@
 #ifndef __GTKTOXEVENT_H__
 #define __GTKTOXEVENT_H__
 
+#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
+
 #include gtk/gtk.h
 #include gdk/gdk.h
 #include X11/Xlib.h
@@ -58,8 +60,6 @@ GdkWindow * xfce_add_event_win   (GdkScreen *gscr,
 XfceFilterSetup * xfce_init_event_filter (gpointer data);
 void xfce_close_event_filter (XfceFilterSetup *setup);
 
-#if defined(LIBXFCEGUI4_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-
 #define GtkToXEventFilterStatus XfceFilterStatus
 #define GtkToXEventFilterStack  XfceFilterStack
 
@@ -78,8 +78,8 @@ Window

[Xfce4-commits] libxfcegui4:master Post release tag bump.

2010-10-31 Thread Nick Schermer 
Updating branch refs/heads/master
 to 20416db2efd8f1f5d59807cb019e7bb41fd33d73 (commit)
   from 6d61151c347d59eed4599b320f0b8d142a390c4f (commit)

commit 20416db2efd8f1f5d59807cb019e7bb41fd33d73
Author: Nick Schermer n...@xfce.org
Date:   Sun Oct 31 15:51:39 2010 +0100

Post release tag bump.

 configure.in.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 9916be5..6c3c805 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -13,7 +13,7 @@ m4_define([libxfcegui4_version_minor], [7])
 m4_define([libxfcegui4_version_micro], [0])
 m4_define([libxfcegui4_version_nano], [])   dnl leave this empty to have no 
nano version
 m4_define([libxfcegui4_version_build], [...@revision@])
-m4_define([libxfcegui4_version_tag], [])
+m4_define([libxfcegui4_version_tag], [git])
 m4_define([libxfcegui4_version], 
[libxfcegui4_version_major().libxfcegui4_version_minor().libxfcegui4_version_micro()ifelse(libxfcegui4_version_nano(),
 [], [], [.libxfcegui4_version_nano()])ifelse(libxfcegui4_version_tag(), [git], 
[libxfcegui4_version_tag()-libxfcegui4_version_build()], 
[libxfcegui4_version_tag()])])
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] libxfcegui4|libxfcegui4-4.7.0 Creating annotated tag libxfcegui4-4.7.0

2010-10-31 Thread Nick Schermer 
Updating annotated tag refs/tags/libxfcegui4-4.7.0
 as new annotated tag
 to 13952fb1f4cf5d1bb0324d6cbf8e639992fcc8f2 (tag)
   succeeds xfce-4.6.1
  tagged by Nick Schermer n...@xfce.org
 on 2010-10-31 14:51 +

Brian J. Tarricone (3):
  add module description file
  new git revision substitution; add 'git' revision tag
  don't put 'r' in front of sha1 hash in REVISION

Denis Koryavov (1):
  l10n: Updated Russian (ru) translation to 100%

Dumitru Moldovan (1):
  Added initial xfce4-settings Romanian translation

Gabor Kelemen (1):
  2009-06-14  Gabor Kelemen  kelem...@gnome.hu

Jannis Pohlmann (2):
  Fix compile error related to disconnect() when libSM is not available.
  Fix docs for make distcheck. Update to xfce4-dev-tools 4.7.0.

Leandro Regueiro (2):
  l10n: Updates to Galician (gl) translation
  l10n: Updated Galician (gl) translation to 100%

Mike Massonnet (9):
  xfce translation update
  galician translation update
  xfce translation update
  update latvian translation
  update xfce translations
  Drop svn:executable bit from po files
  update translation
  Add Asturian translations
  update xfce translation

Nick Schermer (7):
  Drop some files from the po directory.
  Build ChangeLog during make dist.
  Drop libxfce4kbd-private and various fixes.
  Rebuild translations.
  Fix distcheck.
  Deprecated all functions and objects in libxfcegui4.
  Updates for release.

Olivier Fourdan (1):
  Add new keyboard shortcuts to xfwm4

Sankarshan Mukhopadhyay (1):
  l10n: Updated Bengali (India) (bn_IN) translation to 73%

Timo Verbeek (2):
  l10n: Updated Dutch (Flemish) (nl) translation to 55%
  l10n: Updated Dutch (Flemish) (nl) translation to 78%

Vladimir Melo (1):
  l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] libxfcegui4:master Updates for release.

2010-10-31 Thread Nick Schermer 
Updating branch refs/heads/master
 to 6d61151c347d59eed4599b320f0b8d142a390c4f (commit)
   from 00e41afbcc1f5170a808ebab64558dc3c39d7216 (commit)

commit 6d61151c347d59eed4599b320f0b8d142a390c4f
Author: Nick Schermer n...@xfce.org
Date:   Sun Oct 31 15:49:30 2010 +0100

Updates for release.

 NEWS|8 
 configure.in.in |2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index f074bb1..2a79576 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+4.7.0
+=
+- Deprecated all functions and objects, use libxfce4ui instead.
+- Drop libxfce4kbd-private to avoid file conflics with libxfce4ui.
+- Various compiler errors fixed and build improvements.
+- Translation updates (gl, bn_IN, pt_BR, ru, nl, ro, de, tl_PH, lv,
+  ur, ur_PK, hu, zh_CN, ast).
+
 4.6.1
 ==
 - Update translations (pl, ja, gl, pt, nb, es)
diff --git a/configure.in.in b/configure.in.in
index 6c3c805..9916be5 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -13,7 +13,7 @@ m4_define([libxfcegui4_version_minor], [7])
 m4_define([libxfcegui4_version_micro], [0])
 m4_define([libxfcegui4_version_nano], [])   dnl leave this empty to have no 
nano version
 m4_define([libxfcegui4_version_build], [...@revision@])
-m4_define([libxfcegui4_version_tag], [git])
+m4_define([libxfcegui4_version_tag], [])
 m4_define([libxfcegui4_version], 
[libxfcegui4_version_major().libxfcegui4_version_minor().libxfcegui4_version_micro()ifelse(libxfcegui4_version_nano(),
 [], [], [.libxfcegui4_version_nano()])ifelse(libxfcegui4_version_tag(), [git], 
[libxfcegui4_version_tag()-libxfcegui4_version_build()], 
[libxfcegui4_version_tag()])])
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Only show bookmarkbar if we have bookmarks at all

2010-10-31 Thread Christian Dywan 
Updating branch refs/heads/master
 to f9559b7d27b72cb4396026c533c3c2338e2afb7a (commit)
   from 560ad66d48760193a0ed2eee31c145094ffc5bfe (commit)

commit f9559b7d27b72cb4396026c533c3c2338e2afb7a
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Oct 31 21:27:22 2010 +0100

Only show bookmarkbar if we have bookmarks at all

 midori/midori-browser.c |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 503f42b..62318de 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -945,7 +945,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* 
browser,
 }
 
 if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)))
-if (!gtk_widget_get_visible (browser-bookmarkbar))
+if (!gtk_widget_get_visible (browser-bookmarkbar)
+  browser-bookmarks != NULL)
 _action_set_active (browser, Bookmarkbar, TRUE);
 g_free (selected);
 return_status = TRUE;
@@ -6198,7 +6199,8 @@ _midori_browser_update_settings (MidoriBrowser* browser)
 
 _action_set_active (browser, Menubar, show_menubar);
 _action_set_active (browser, Navigationbar, browser-show_navigationbar);
-_action_set_active (browser, Bookmarkbar, show_bookmarkbar);
+_action_set_active (browser, Bookmarkbar, show_bookmarkbar
+  browser-bookmarks != NULL);
 _action_set_active (browser, Panel, show_panel);
 #if WEBKIT_CHECK_VERSION (1, 1, 3)
 _action_set_active (browser, Transferbar, show_transferbar);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Add 'Identify As' button to Statusbar Features

2010-10-31 Thread Christian Dywan 
Updating branch refs/heads/master
 to 560ad66d48760193a0ed2eee31c145094ffc5bfe (commit)
   from 985912a9cd6a398d19042109d119f13795d9c063 (commit)

commit 560ad66d48760193a0ed2eee31c145094ffc5bfe
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Oct 31 21:24:34 2010 +0100

Add 'Identify As' button to Statusbar Features

 extensions/statusbar-features.c |   16 +---
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c
index 9a6b066..43b9d33 100644
--- a/extensions/statusbar-features.c
+++ b/extensions/statusbar-features.c
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008-2009 Christian Dywan christ...@twotoasts.de
+ Copyright (C) 2008-2010 Christian Dywan christ...@twotoasts.de
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -10,6 +10,7 @@
 */
 
 #include midori/midori.h
+#include midori/sokoke.h
 
 static void
 statusbar_features_app_add_browser_cb (MidoriApp*   app,
@@ -84,39 +85,32 @@ statusbar_features_app_add_browser_cb (MidoriApp*   app,
 g_object_set_data (G_OBJECT (button), feature-label, _(Images));
 image = gtk_image_new_from_stock (STOCK_IMAGE, GTK_ICON_SIZE_MENU);
 gtk_button_set_image (GTK_BUTTON (button), image);
-#if GTK_CHECK_VERSION(2, 12, 0)
 gtk_widget_set_tooltip_text (button, _(Load images automatically));
-#endif
 statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
 g_signal_connect (toolbar, notify::toolbar-style,
 G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), 
button);
 gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
-gtk_widget_show (button);
 button = katze_property_proxy (settings, enable-scripts, toggle);
 g_object_set_data (G_OBJECT (button), feature-label, _(Scripts));
 image = gtk_image_new_from_stock (STOCK_SCRIPTS, GTK_ICON_SIZE_MENU);
 gtk_button_set_image (GTK_BUTTON (button), image);
-#if GTK_CHECK_VERSION(2, 12, 0)
 gtk_widget_set_tooltip_text (button, _(Enable scripts));
-#endif
 statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
 g_signal_connect (toolbar, notify::toolbar-style,
 G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), 
button);
 gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
-gtk_widget_show (button);
 button = katze_property_proxy (settings, enable-plugins, toggle);
 g_object_set_data (G_OBJECT (button), feature-label, _(Netscape 
plugins));
 image = gtk_image_new_from_stock (STOCK_PLUGINS, GTK_ICON_SIZE_MENU);
 gtk_button_set_image (GTK_BUTTON (button), image);
-#if GTK_CHECK_VERSION(2, 12, 0)
 gtk_widget_set_tooltip_text (button, _(Enable Netscape plugins));
-#endif
 statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
 g_signal_connect (toolbar, notify::toolbar-style,
 G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), 
button);
 gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
-gtk_widget_show (button);
-gtk_widget_show (bbox);
+button = katze_property_proxy (settings, identify-as, NULL);
+gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
+gtk_widget_show_all (bbox);
 gtk_box_pack_start (GTK_BOX (statusbar), bbox, FALSE, FALSE, 3);
 g_object_unref (settings);
 g_object_unref (statusbar);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Update Brazilian Portuguese translation

2010-10-31 Thread Christian Dywan 
Updating branch refs/heads/master
 to f470d26692bfa8c46f8ee28926438a9b4acfd469 (commit)
   from d20f0c3b89151b3bd5dcb8ad83ca74ac92db67ae (commit)

commit f470d26692bfa8c46f8ee28926438a9b4acfd469
Author: Sergio Cipolla secipo...@gmail.com
Date:   Sun Oct 31 21:30:10 2010 +0100

Update Brazilian Portuguese translation

 po/pt_BR.po |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0c2f830..ef7a548 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: Midori 0.2.8\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2010-10-30 12:51-0200\n
-PO-Revision-Date: 2010-10-30 12:55-0300\n
+PO-Revision-Date: 2010-10-31 09:38-0300\n
 Last-Translator: Sérgio Cipolla secipo...@gmail.com\n
 Language-Team: Brazilian Portuguese pt...@li.org\n
 Language: pt_BR\n
@@ -1808,7 +1808,7 @@ msgstr Abrir link em nova _janela
 
 #: ../midori/midori-view.c:2397
 msgid Open Link as Web A_pplication
-msgstr Abrir link como aplicação _web
+msgstr Abrir link como aplicativo _web
 
 #: ../midori/midori-view.c:2400
 msgid Copy Link de_stination
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Only show Trash and UndoTabClose if there is a trash

2010-10-31 Thread Christian Dywan 
Updating branch refs/heads/master
 to d20f0c3b89151b3bd5dcb8ad83ca74ac92db67ae (commit)
   from f9559b7d27b72cb4396026c533c3c2338e2afb7a (commit)

commit d20f0c3b89151b3bd5dcb8ad83ca74ac92db67ae
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Oct 31 21:27:47 2010 +0100

Only show Trash and UndoTabClose if there is a trash

 midori/midori-browser.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 62318de..c3440c8 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -5784,6 +5784,8 @@ midori_browser_init (MidoriBrowser* browser)
 _action_set_visible (browser, BookmarksImport, browser-bookmarks != 
NULL);
 _action_set_visible (browser, BookmarksExport, browser-bookmarks != 
NULL);
 _action_set_visible (browser, Bookmarkbar, browser-bookmarks != NULL);
+_action_set_visible (browser, Trash, browser-trash != NULL);
+_action_set_visible (browser, UndoTabClose, browser-trash != NULL);
 
 /* Create the navigationbar */
 browser-navigationbar = gtk_ui_manager_get_widget (
@@ -6504,6 +6506,8 @@ midori_browser_set_property (GObject*  object,
 g_object_set (_action_by_name (browser, Trash),
   array, browser-trash, reversed, TRUE,
   NULL);
+_action_set_visible (browser, Trash, browser-trash != NULL);
+_action_set_visible (browser, UndoTabClose, browser-trash != NULL);
 /* FIXME: Connect to updates */
 _midori_browser_update_actions (browser);
 break;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Reword cookie description to say 'saved games, '

2010-10-31 Thread Christian Dywan 
Updating branch refs/heads/master
 to b28c828f02e0af5fe9c433fce6c6f87dc9f75235 (commit)
   from f470d26692bfa8c46f8ee28926438a9b4acfd469 (commit)

commit b28c828f02e0af5fe9c433fce6c6f87dc9f75235
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Oct 31 21:33:16 2010 +0100

Reword cookie description to say 'saved games, '

This is purely an improvement to the English, no change in meaning.

 midori/midori-preferences.c |2 +-
 po/cs.po|2 +-
 po/de.po|2 +-
 po/el.po|2 +-
 po/fr.po|2 +-
 po/gl.po|2 +-
 po/ja.po|2 +-
 po/ko.po|2 +-
 po/lt.po|2 +-
 po/pl.po|2 +-
 po/pt.po|2 +-
 po/pt_BR.po |2 +-
 po/ru.po|2 +-
 po/uk.po|2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 5d391ae..07b1a20 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -561,7 +561,7 @@ midori_preferences_set_settings (MidoriPreferences* 
preferences,
 SPANNED_ADD (button);
 {
 gchar* markup = g_strdup_printf (span size=\smaller\%s/span,
-_(Cookies store login data, save games 
+_(Cookies store login data, saved games, 
   or user profiles for advertisement purposes.));
 label = gtk_label_new (NULL);
 gtk_label_set_markup (GTK_LABEL (label), markup);
diff --git a/po/cs.po b/po/cs.po
index 642503a..9eb6e18 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2086,7 +2086,7 @@ msgid Delete old cookies after 1 year
 msgstr Smazat stará cookies po roce
 
 #: ../midori/midori-preferences.c:568
-msgid Cookies store login data, save games or user profiles for advertisement 
purposes.
+msgid Cookies store login data, saved games, or user profiles for 
advertisement purposes.
 msgstr V cookies se ukládají přihlašovací údaje, stavy her nebo uživatelská 
data pro reklamu.
 
 #: ../midori/midori-preferences.c:589
diff --git a/po/de.po b/po/de.po
index 1a710bd..ab8bc73 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2124,7 +2124,7 @@ msgstr Alte Cookies nach 1 Jahr löschen
 
 #: ../midori/midori-preferences.c:564
 msgid 
-Cookies store login data, save games or user profiles for advertisement 
+Cookies store login data, saved games, or user profiles for advertisement 
 purposes.
 msgstr 
 Cookies sind Profildateien, die Anmeldedaten, Spielstände oder 
diff --git a/po/el.po b/po/el.po
index dbc7cd4..07c9ac2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2120,7 +2120,7 @@ msgid Delete old cookies after 1 year
 msgstr Διαγραφή παλιών cookies μετά από 1 χρόνο
 
 #: ../midori/midori-preferences.c:568
-msgid Cookies store login data, save games or user profiles for advertisement 
purposes.
+msgid Cookies store login data, saved games, or user profiles for 
advertisement purposes.
 msgstr Τα cookies αποθηκεύουν δεδομένα σύνδεσης, αποθηκεύουν παιχνίδια ή 
προφίλ χρηστών για διαφημιστικούς λόγους.
 
 #: ../midori/midori-preferences.c:587
diff --git a/po/fr.po b/po/fr.po
index 718d7cd..bb82f58 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2097,7 +2097,7 @@ msgid Delete old cookies after 1 year
 msgstr Effacer les anciens cookies après 1 an
 
 #: ../midori/midori-preferences.c:564
-msgid Cookies store login data, save games or user profiles for advertisement 
purposes.
+msgid Cookies store login data, saved games, or user profiles for 
advertisement purposes.
 msgstr Les cookies contiennent les informations de login, les sauvegardes de 
jeu ou les profils utilisateurs à des fins publicitaires.
 
 #: ../midori/midori-preferences.c:585
diff --git a/po/gl.po b/po/gl.po
index 5bf798f..74e3b6c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2157,7 +2157,7 @@ msgid Delete old cookies after 1 year
 msgstr Borrar as cookies antigas despois de 1 ano
 
 #: ../midori/midori-preferences.c:568
-msgid Cookies store login data, save games or user profiles for advertisement 
purposes.
+msgid Cookies store login data, saved games, or user profiles for 
advertisement purposes.
 msgstr As cookies almacenan datos de sesión e gardan xogos ou perfís de 
usuario para anuncios.
 
 #: ../midori/midori-preferences.c:589
diff --git a/po/ja.po b/po/ja.po
index 55b312c..7268d52 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2248,7 +2248,7 @@ msgstr 1年以上過去の Cookie を削除
 
 #: ../midori/midori-preferences.c:568
 msgid 
-Cookies store login data, save games or user profiles for advertisement 
+Cookies store login data, saved games, or user profiles for advertisement 
 purposes.
 msgstr 
 Cookie には、ログインデータやゲームデータ、広告用のユーザプロファイルなどが格
diff --git a/po/ko.po b/po/ko.po
index 2b2a60c..339bf7d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2159,7 +2159,7 @@ msgid Delete old cookies after 1 year
 msgstr 저장한 후 일 년 이상 지난 쿠키 삭제
 
 #:

[Xfce4-commits] midori:master Don't regard file URIs as external

2010-10-31 Thread Christian Dywan 
Updating branch refs/heads/master
 to f2ca46163893e4c6154738d572a0fc5de780a7a0 (commit)
   from a4715ad4c7f73c1c4cb261419be594e9defcd13a (commit)

commit f2ca46163893e4c6154738d572a0fc5de780a7a0
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Oct 31 22:42:15 2010 +0100

Don't regard file URIs as external

 midori/sokoke.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/midori/sokoke.c b/midori/sokoke.c
index 133de3c..962eb58 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -746,6 +746,7 @@ sokoke_external_uri (const gchar* uri)
 GAppInfo* info;
 
 if (!uri || !strncmp (uri, http, 4)
+ || !strncmp (uri, file, 4)
  || !strncmp (uri, about:, 6))
 return FALSE;
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori|0.2.9 Creating annotated tag 0.2.9

2010-10-31 Thread Christian Dywan 
Updating annotated tag refs/tags/0.2.9
 as new annotated tag
 to 352245ece90bd31c5eff76ff1b50ac938eee2c73 (tag)
   succeeds 0.2.8-163-g914d5e3
  tagged by Christian Dywan christ...@twotoasts.de
 on 2010-10-31 22:25 +

Christian Dywan (1):
  Bump version to 0.2.9

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits