[Xfce4-commits] gtk-xfce-engine:xfce-4.8 Fixed rendering of inconsistent checkboxes (bug #7279)

2011-03-06 Thread Peter de Ridder
Updating branch refs/heads/xfce-4.8
 to d6b60ea674eb1c2bbc9c1ba1b5bb3b41b58500e2 (commit)
   from 229f602aa68eb0b6f87fd13acad4787083759120 (commit)

commit d6b60ea674eb1c2bbc9c1ba1b5bb3b41b58500e2
Author: Peter de Ridder pe...@xfce.org
Date:   Mon Feb 28 22:00:44 2011 +0100

Fixed rendering of inconsistent checkboxes (bug #7279)

Draw a [-] (dash) for inconsistent checkboxes.

 src/xfce_theme_draw.c |   15 +++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index baefbdc..8b472ca 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -65,6 +65,7 @@ typedef enum
 CHECK_BASE,
 CHECK_TEXT,
 CHECK_CROSS,
+CHECK_DASH,
 RADIO_LIGHT,
 RADIO_DARK,
 RADIO_BASE,
@@ -99,6 +100,11 @@ static const guchar check_cross_bits[] = {
 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00,
 };
+static const guchar check_dash_bits[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03,
+0xf8, 0x03, 0xf8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00,
+};
 static const guchar radio_light_bits[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x08, 0x00, 0x08,
 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x04, 0x08, 0x02, 0xf0, 0x01,
@@ -136,6 +142,7 @@ parts[] =
 { check_base_bits,  NULL },
 { check_text_bits,  NULL },
 { check_cross_bits, NULL },
+{ check_dash_bits,  NULL },
 { radio_light_bits, NULL },
 { radio_dark_bits,  NULL },
 { radio_base_bits,  NULL },
@@ -981,6 +988,10 @@ static void draw_check(GtkStyle * style, GdkWindow * 
window, GtkStateType state,
 {
 draw_part(window, style-fg_gc[state], area, x, y, CHECK_CROSS);
 }
+else if (shadow == GTK_SHADOW_ETCHED_IN)
+{
+draw_part(window, style-fg_gc[state], area, x, y, CHECK_DASH);
+}
 }
 else
 {
@@ -992,6 +1003,10 @@ static void draw_check(GtkStyle * style, GdkWindow * 
window, GtkStateType state,
 {
 draw_part(window, style-text_gc[state], area, x, y, CHECK_CROSS);
 }
+else if (shadow == GTK_SHADOW_ETCHED_IN)
+{
+draw_part(window, style-fg_gc[state], area, x, y, CHECK_DASH);
+}
 }
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] gtk-xfce-engine:xfce-4.8 Fixed rendering of GtkSpinButton (bug #4946)

2011-03-06 Thread Peter de Ridder
Updating branch refs/heads/xfce-4.8
 to 229f602aa68eb0b6f87fd13acad4787083759120 (commit)
   from 4e1217e45f43b80c215777e6d77bc708c6283164 (commit)

commit 229f602aa68eb0b6f87fd13acad4787083759120
Author: Peter de Ridder pe...@xfce.org
Date:   Mon Feb 28 21:46:22 2011 +0100

Fixed rendering of GtkSpinButton (bug #4946)

Calculate the size of the text area of a spin button since gtk doesn't
provide this size.
Also use this size for drawing exterior focus lines.

 src/xfce_theme_draw.c |   45 -
 1 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/xfce_theme_draw.c b/src/xfce_theme_draw.c
index fd0da76..baefbdc 100644
--- a/src/xfce_theme_draw.c
+++ b/src/xfce_theme_draw.c
@@ -505,6 +505,23 @@ static void draw_shadow(GtkStyle * style, GdkWindow * 
window, GtkStateType state
 g_return_if_fail(style != NULL);
 g_return_if_fail(window != NULL);
 
+/* Spin buttons are a special case */
+if (widget  GTK_IS_SPIN_BUTTON (widget))
+{
+/* GtkEntry doesn't provide the text area as frame size */
+if (DETAIL(entry))
+{
+gint line_width = 0;
+gboolean interior_focus;
+gdk_drawable_get_size (GTK_ENTRY(widget)-text_area, width, NULL);
+if (!gtk_widget_has_focus(widget))
+gtk_widget_style_get(widget, focus-line-width, line_width, 
interior-focus, interior_focus, NULL);
+if (interior_focus)
+line_width = 0;
+width += (style-xthickness + line_width) * 2;
+}
+}
+
 if (shadow_type == GTK_SHADOW_NONE)
 return;
 
@@ -665,7 +682,7 @@ static void draw_shadow(GtkStyle * style, GdkWindow * 
window, GtkStateType state
 case GTK_SHADOW_OUT:
 if (XFCE_RC_STYLE(style-rc_style)-smooth_edge)
 {
-if ((DETAIL(spinbutton_up) || DETAIL(spinbutton_up) || 
DETAIL(spinbutton_down))  (state_type != GTK_STATE_PRELIGHT))
+if ((DETAIL(spinbutton_up) || DETAIL(spinbutton_down))  
(state_type != GTK_STATE_PRELIGHT))
 {
 /* Do nothing */
 }
@@ -811,10 +828,6 @@ static void draw_shadow(GtkStyle * style, GdkWindow * 
window, GtkStateType state
 {
 /* Do nothing */
 }
-if ((DETAIL(spinbutton_up) || DETAIL(spinbutton_down))  
(state_type != GTK_STATE_PRELIGHT))
-{
-/* Do nothing */
-}
 else if (DETAIL(menubar))
 {
 if ((xt  1)  (yt  1))
@@ -1310,6 +1323,27 @@ static void draw_extension(GtkStyle * style, GdkWindow * 
window, GtkStateType st
 }
 }
 
+static void draw_focus(GtkStyle * style, GdkWindow * window, GtkStateType 
state_type, GdkRectangle * area, GtkWidget * widget, const gchar * detail, gint 
x, gint y, gint width, gint height)
+{
+/* Spin buttons are a special case */
+if (widget  GTK_IS_SPIN_BUTTON (widget))
+{
+/* GtkEntry doesn't provide the text area as focus size */
+if (DETAIL(entry))
+{
+gint line_width = 0;
+gboolean interior_focus;
+gdk_drawable_get_size (GTK_ENTRY(widget)-text_area, width, NULL);
+gtk_widget_style_get (widget, focus-line-width, line_width, 
interior-focus, interior_focus, NULL);
+if (interior_focus)
+line_width = 0;
+width += (style-xthickness + line_width) * 2;
+}
+}
+
+parent_class-draw_focus(style, window, state_type, area, widget, detail, 
x, y, width, height);
+}
+
 static void draw_slider(GtkStyle * style, GdkWindow * window, GtkStateType 
state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, 
const gchar * detail, gint x, gint y, gint width, gint height, GtkOrientation 
orientation)
 {
 g_return_if_fail(style != NULL);
@@ -1389,6 +1423,7 @@ static void xfce_style_class_init(XfceStyleClass * klass)
 style_class-draw_shadow_gap = draw_shadow_gap;
 style_class-draw_box_gap = draw_box_gap;
 style_class-draw_extension = draw_extension;
+style_class-draw_focus = draw_focus;
 style_class-draw_slider = draw_slider;
 style_class-draw_handle = draw_handle;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] gtk-xfce-engine:xfce-4.8 Release 2.8.1!

2011-03-06 Thread Peter de Ridder
Updating branch refs/heads/xfce-4.8
 to e5fbfdbe3b224c83831108b728dabe9803225220 (commit)
   from d6b60ea674eb1c2bbc9c1ba1b5bb3b41b58500e2 (commit)

commit e5fbfdbe3b224c83831108b728dabe9803225220
Author: Peter de Ridder pe...@xfce.org
Date:   Sun Mar 6 12:13:12 2011 +0100

Release 2.8.1!

 AUTHORS   |1 +
 COPYING   |  339 +
 NEWS  |5 +
 configure.in.in   |2 +-
 gtk-xfce-engine-2.spec.in |2 +-
 src/xfce_theme_draw.c |1 +
 6 files changed, 348 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 274904d..23102ed 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,5 @@
 Xfce engine by Olivier Fourdan four...@xfce.org
+Peter de Ridder pe...@xfce.org
 
 Port to GTK+-2.0 based on Thinice port by Tim Gerla t...@rrv.net
 Tomas �gren st...@ing.umu.se and  Richard Hult rh...@codefactory.se
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..d159169
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The Program, below,
+refers to any such program or work, and a work based on the Program
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term modification.)  Each licensee is addressed as you.
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its 

[Xfce4-commits] gtk-xfce-engine|gtk-xfce-engine-2.8.1 Creating annotated tag gtk-xfce-engine-2.8.1

2011-03-06 Thread Peter de Ridder
Updating annotated tag refs/tags/gtk-xfce-engine-2.8.1
 as new annotated tag
 to 50a975ad62a8d0b740ca71a25e44563335adb1c1 (tag)
   succeeds gtk-xfce-engine-2.8.0
  tagged by Peter de Ridder pe...@xfce.org
 on 2011-03-06 11:14 +

Peter de Ridder (3):
  Fixed rendering of GtkSpinButton (bug #4946)
  Fixed rendering of inconsistent checkboxes (bug #7279)
  Release 2.8.1!

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


[Xfce4-commits] gtk-xfce-engine:master Post release tag bump.

2011-03-06 Thread Peter de Ridder
Updating branch refs/heads/master
 to 7aabfb06eca7731ac5e6c318ae1f7055a3622d0b (commit)
   from e5fbfdbe3b224c83831108b728dabe9803225220 (commit)

commit 7aabfb06eca7731ac5e6c318ae1f7055a3622d0b
Author: Peter de Ridder pe...@xfce.org
Date:   Sun Mar 6 12:26:27 2011 +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 601e1e7..cb2fc53 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -10,7 +10,7 @@ m4_define([gtk_xfce_engine_version_minor], [8])
 m4_define([gtk_xfce_engine_version_micro], [1])
 m4_define([gtk_xfce_engine_version_nano],  []) dnl leave this empty to have no 
nano version
 m4_define([gtk_xfce_engine_version_build], [@REVISION@])
-m4_define([gtk_xfce_engine_version_tag],   [])
+m4_define([gtk_xfce_engine_version_tag],   [git])
 m4_define([gtk_xfce_engine_version], 
[gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(),
 [], [], 
[.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], 
[gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], 
[gtk_xfce_engine_version_tag()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] gtk-xfce-engine:master Release 2.8.1!

2011-03-06 Thread Peter de Ridder
Updating branch refs/heads/master
 to e5fbfdbe3b224c83831108b728dabe9803225220 (commit)
   from d6b60ea674eb1c2bbc9c1ba1b5bb3b41b58500e2 (commit)

commit e5fbfdbe3b224c83831108b728dabe9803225220
Author: Peter de Ridder pe...@xfce.org
Date:   Sun Mar 6 12:13:12 2011 +0100

Release 2.8.1!

 AUTHORS   |1 +
 COPYING   |  339 +
 NEWS  |5 +
 configure.in.in   |2 +-
 gtk-xfce-engine-2.spec.in |2 +-
 src/xfce_theme_draw.c |1 +
 6 files changed, 348 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 274904d..23102ed 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,5 @@
 Xfce engine by Olivier Fourdan four...@xfce.org
+Peter de Ridder pe...@xfce.org
 
 Port to GTK+-2.0 based on Thinice port by Tim Gerla t...@rrv.net
 Tomas �gren st...@ing.umu.se and  Richard Hult rh...@codefactory.se
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..d159169
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The Program, below,
+refers to any such program or work, and a work based on the Program
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term modification.)  Each licensee is addressed as you.
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its 

[Xfce4-commits] xfce4-volumed:master Changed CFLAGS again in configure.ac

2011-03-06 Thread Steve Dodier
Updating branch refs/heads/master
 to 0ebbdc3c2734f498965d9104b0f8d0a563a39806 (commit)
   from 2ee3b12be641501ee3a9ce0278291b8c5a865021 (commit)

commit 0ebbdc3c2734f498965d9104b0f8d0a563a39806
Author: Steve Dodier sidnio...@gmail.com
Date:   Sun Mar 6 12:29:43 2011 +0100

Changed CFLAGS again in configure.ac

 ChangeLog|3 +++
 configure.ac |4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index beeb5f6..2ac6d93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2001-03-06  Steve Dodier sidnio...@gmail.com
+   * Changed CFLAGS again in configure.ac
+
 2011-03-03  Steve Dodier sidnio...@gmail.com
* Removed deprecated Encoding entry in .desktop file (thanks to 
Samuli Suominen)
 
diff --git a/configure.ac b/configure.ac
index 46adf56..f003712 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,9 +57,9 @@ AM_CONDITIONAL(HAVE_LIBNOTIFY, [test $HAVE_LIBNOTIFY = 1])
 
 
 if test x$enable_debug = xyes; then
-  CFLAGS=-g
+  CFLAGS=$CFLAGS -g -O0
 else
-  CFLAGS=$CFLAGS -O2 -DNDEBUG
+  CFLAGS=-O2 -DNDEBUG $CFLAGS
 fi
 
 AC_OUTPUT([
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] midori:master Don't emit add-download before all preparations

2011-03-06 Thread Christian Dywan
Updating branch refs/heads/master
 to 663e7e9285807130999aa9615635f7a037422956 (commit)
   from bbc6bdea3005b02fad3091bd5c635c97f0a0de4d (commit)

commit 663e7e9285807130999aa9615635f7a037422956
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Mar 6 17:20:18 2011 +0100

Don't emit add-download before all preparations

Notably verifying that there's space available and a file
shouldn't be overriden has to come first. This already was
the case for the transferbar which isn't using the signal.

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 0efb183..325aef9 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -983,6 +983,7 @@ midori_browser_prepare_download (MidoriBrowser*  browser,
 }
 
 webkit_download_set_destination_uri (download, uri);
+g_signal_emit (browser, signals[ADD_DOWNLOAD], 0, download);
 midori_transferbar_add_download_item (MIDORI_TRANSFERBAR 
(browser-transferbar), download);
 return TRUE;
 }
@@ -1416,7 +1417,6 @@ midori_view_download_requested_cb (GtkWidget*  view,
WebKitDownload* download,
MidoriBrowser*  browser)
 {
-g_signal_emit (browser, signals[ADD_DOWNLOAD], 0, download);
 if (!webkit_download_get_destination_uri (download))
 {
 gchar* folder;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] midori:master Focus the view on key press if nothing's focussed

2011-03-06 Thread Christian Dywan
Updating branch refs/heads/master
 to de0ede905f6b641677111cae785e0917024a7d56 (commit)
   from 663e7e9285807130999aa9615635f7a037422956 (commit)

commit de0ede905f6b641677111cae785e0917024a7d56
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Mar 6 17:25:32 2011 +0100

Focus the view on key press if nothing's focussed

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 325aef9..584ca48 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1671,6 +1671,9 @@ midori_browser_key_press_event (GtkWidget*   widget,
 GtkWidgetClass* widget_class;
 guint clean_state;
 
+if (gtk_window_get_focus (GTK_WINDOW (widget)) == NULL)
+gtk_widget_grab_focus (midori_browser_get_current_tab (MIDORI_BROWSER 
(widget)));
+
 if (event-state  (GDK_CONTROL_MASK | GDK_MOD1_MASK))
 if (sokoke_window_activate_key (window, event))
 return TRUE;
diff --git a/midori/midori-view.c b/midori/midori-view.c
index d0cb178..a193a97 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3285,10 +3285,8 @@ static gboolean
 midori_view_focus_in_event (GtkWidget* widget,
 GdkEventFocus* event)
 {
-MidoriView* view = MIDORI_VIEW (widget);
-
 /* Always propagate focus to the child web view */
-gtk_widget_grab_focus (view-web_view);
+gtk_widget_grab_focus (midori_view_get_web_view (MIDORI_VIEW (widget)));
 return TRUE;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] midori:master Work around copying bug in WebKitGTK+

2011-03-06 Thread Christian Dywan
Updating branch refs/heads/master
 to fb9629c1aa53d743fa9cef6347789cb147060749 (commit)
   from de0ede905f6b641677111cae785e0917024a7d56 (commit)

commit fb9629c1aa53d743fa9cef6347789cb147060749
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Mar 6 18:13:54 2011 +0100

Work around copying bug in WebKitGTK+

Fixes: https://bugs.launchpad.net/midori/+bug/707888

 midori/midori-browser.c |9 +
 midori/midori-view.c|   23 +--
 midori/sokoke.c |   13 +
 midori/sokoke.h |4 
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 584ca48..4f04691 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2443,6 +2443,15 @@ _action_copy_activate (GtkAction* action,
MidoriBrowser* browser)
 {
 GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
+/* Work around broken clipboard handling for the sake of the user */
+if (WEBKIT_IS_WEB_VIEW (widget))
+{
+GtkWidget* scrolled = gtk_widget_get_parent (widget);
+GtkWidget* view = gtk_widget_get_parent (scrolled);
+const gchar* selected = midori_view_get_selected_text (MIDORI_VIEW 
(view));
+sokoke_widget_copy_clipboard (widget, selected);
+return;
+}
 if (G_LIKELY (widget)  g_signal_lookup (copy-clipboard, G_OBJECT_TYPE 
(widget)))
 g_signal_emit_by_name (widget, copy-clipboard);
 }
diff --git a/midori/midori-view.c b/midori/midori-view.c
index a193a97..2b87ae6 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1974,19 +1974,6 @@ gtk_widget_scroll_event_cb (WebKitWebView*  web_view,
 
 #if WEBKIT_CHECK_VERSION (1, 1, 15)
 static void
-midori_web_view_set_clipboard (GtkWidget*   widget,
-  const gchar* text)
-{
-GdkDisplay* display = gtk_widget_get_display (widget);
-GtkClipboard* clipboard;
-
-clipboard = gtk_clipboard_get_for_display (display, 
GDK_SELECTION_CLIPBOARD);
-gtk_clipboard_set_text (clipboard, text, -1);
-clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_PRIMARY);
-gtk_clipboard_set_text (clipboard, text, -1);
-}
-
-static void
 midori_web_view_menu_new_window_activate_cb (GtkWidget*  widget,
  MidoriView* view)
 {
@@ -2005,9 +1992,9 @@ midori_web_view_menu_link_copy_activate_cb (GtkWidget*  
widget,
 MidoriView* view)
 {
 if (g_str_has_prefix (view-link_uri, mailto:;))
-midori_web_view_set_clipboard (widget, view-link_uri + 7);
+sokoke_widget_copy_clipboard (widget, view-link_uri + 7);
 else
-midori_web_view_set_clipboard (widget, view-link_uri);
+sokoke_widget_copy_clipboard (widget, view-link_uri);
 }
 
 static void
@@ -2037,7 +2024,7 @@ midori_web_view_menu_image_copy_activate_cb (GtkWidget*  
widget,
  MidoriView* view)
 {
 gchar* uri = katze_object_get_string (view-hit_test, image-uri);
-midori_web_view_set_clipboard (widget, uri);
+sokoke_widget_copy_clipboard (widget, uri);
 g_free (uri);
 }
 
@@ -2060,7 +2047,7 @@ midori_web_view_menu_video_copy_activate_cb (GtkWidget*  
widget,
  MidoriView* view)
 {
 gchar* uri = katze_object_get_string (view-hit_test, media-uri);
-midori_web_view_set_clipboard (widget, uri);
+sokoke_widget_copy_clipboard (widget, uri);
 g_free (uri);
 }
 
@@ -2153,7 +2140,7 @@ static void
 midori_web_view_menu_copy_activate_cb (GtkWidget*  widget,
MidoriView* view)
 {
-midori_web_view_set_clipboard (widget, view-selected_text);
+sokoke_widget_copy_clipboard (widget, view-selected_text);
 }
 #endif
 
diff --git a/midori/sokoke.c b/midori/sokoke.c
index 219fc8f..7bb38b1 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -2171,3 +2171,16 @@ sokoke_register_privacy_item (const gchar* name,
 items = g_list_append (items, item);
 return NULL;
 }
+
+void
+sokoke_widget_copy_clipboard (GtkWidget*   widget,
+  const gchar* text)
+{
+GdkDisplay* display = gtk_widget_get_display (widget);
+GtkClipboard* clipboard;
+
+clipboard = gtk_clipboard_get_for_display (display, 
GDK_SELECTION_CLIPBOARD);
+gtk_clipboard_set_text (clipboard, text, -1);
+clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_PRIMARY);
+gtk_clipboard_set_text (clipboard, text, -1);
+}
diff --git a/midori/sokoke.h b/midori/sokoke.h
index 679e684..8813786 100644
--- a/midori/sokoke.h
+++ b/midori/sokoke.h
@@ -280,4 +280,8 @@ sokoke_register_privacy_item (const gchar* name,
   const gchar* label,
   GCallbackclear);
 
+void
+sokoke_widget_copy_clipboard (GtkWidget*   

[Xfce4-commits] xfce4-dev-tools:master Fix FSF address and add missing licenses.

2011-03-06 Thread Nick Schermer
Updating branch refs/heads/master
 to 9516648eab1302bb7003c2298bb72c7b777b9013 (commit)
   from f304f8bd2fe1c49b55c457f009bcd0434a6a4e7c (commit)

commit 9516648eab1302bb7003c2298bb72c7b777b9013
Author: Nick Schermer n...@xfce.org
Date:   Sun Mar 6 19:23:15 2011 +0100

Fix FSF address and add missing licenses.

 autogen.sh|   18 +++---
 m4macros/xdt-depends.m4   |   26 +-
 m4macros/xdt-features.m4  |   26 +-
 m4macros/xdt-i18n.m4  |   26 +-
 m4macros/xdt-python.m4|   24 
 m4macros/xdt-xfce.m4  |   26 +-
 scripts/xdt-autogen.in.in |   24 +++-
 scripts/xdt-commit|   24 +++-
 8 files changed, 101 insertions(+), 93 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 02b0071..eae2da1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,12 +1,24 @@
 #!/bin/sh
 #
-# $Id$
-#
-# Copyright (c) 2002-2005
+# Copyright (c) 2002-2010
 # The Xfce development team. All rights reserved.
 #
 # Written for Xfce by Benedikt Meurer be...@xfce.org.
 #
+# 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
 
 # substitute revision and date
 if test -d .git; then
diff --git a/m4macros/xdt-depends.m4 b/m4macros/xdt-depends.m4
index a834dd5..ccf5a44 100644
--- a/m4macros/xdt-depends.m4
+++ b/m4macros/xdt-depends.m4
@@ -5,19 +5,19 @@ dnl The Xfce development team. All rights reserved.
 dnl
 dnl Written for Xfce by Benedikt Meurer be...@xfce.org.
 dnl
-dnl This program is free software; you can redistribute it and/or modify it
-dnl under the terms of the GNU General Public License as published by the Free
-dnl Software Foundation; either version 2 of the License, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful, but WITHOUT
-dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-dnl more details.
-dnl
-dnl You should have received a copy of the GNU General Public License along 
with
-dnl this program; if not, write to the Free Software Foundation, Inc., 59 
Temple
-dnl Place, Suite 330, Boston, MA  02111-1307  USA
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License along
+dnl with this program; if not, write to the Free Software Foundation, Inc.,
+dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 dnl
 dnl xdt-depends
 dnl ---
diff --git a/m4macros/xdt-features.m4 b/m4macros/xdt-features.m4
index ea0c685..063c188 100644
--- a/m4macros/xdt-features.m4
+++ b/m4macros/xdt-features.m4
@@ -5,19 +5,19 @@ dnl The Xfce development team. All rights reserved.
 dnl
 dnl Written for Xfce by Benedikt Meurer be...@xfce.org.
 dnl
-dnl This program is free software; you can redistribute it and/or modify it
-dnl under the terms of the GNU General Public License as published by the Free
-dnl Software Foundation; either version 2 of the License, or (at your option)
-dnl any later version.
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful, but WITHOUT
-dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-dnl more details.
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl 

[Xfce4-commits] thunar:master l10n: Updated Russian (ru) translation to 100%

2011-03-06 Thread Transifex
Updating branch refs/heads/master
 to 58658d77f909706e421d49be80667dbfc7657c16 (commit)
   from f3e4dbc2df11ffdf4fa92b31501f1b61b47c4b68 (commit)

commit 58658d77f909706e421d49be80667dbfc7657c16
Author: Dmitrij Smirnov a...@cnc-parts.info
Date:   Sun Mar 6 20:13:37 2011 +0100

l10n: Updated Russian (ru) translation to 100%

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

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

 po/ru.po |  257 +++---
 1 files changed, 162 insertions(+), 95 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index ae5a149..8993bd5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the Thunar package.
 # Andrey Fedoseev andrey.fedos...@gmail.com, 2006-2008.
 # Sergey Fedoseev fedoseev.ser...@gmail.com, 2006.
-# 
+#
 msgid 
 msgstr 
 Project-Id-Version: Thunar 1.0.1\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-02-27 17:14+\n
-PO-Revision-Date: 2010-01-05 18:08+0300\n
-Last-Translator: dima i...@cnc-parts.info\n
+POT-Creation-Date: 2011-03-06 17:14+\n
+PO-Revision-Date: 2011-03-06 21:12+0300\n
+Last-Translator: Dmitrij Smirnov a...@cnc-parts.info\n
 Language-Team: Russian r...@li.org\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -134,10 +134,13 @@ msgid Failed to launch operation
 msgstr Не удалось запустить операцию
 
 #. tell the user that we were unable to launch the file specified
-#: ../thunar/thunar-application.c:1048 ../thunar/thunar-application.c:1174
-#: ../thunar/thunar-launcher.c:1065 ../thunar/thunar-location-entry.c:394
+#: ../thunar/thunar-application.c:1048
+#: ../thunar/thunar-application.c:1174
+#: ../thunar/thunar-launcher.c:1065
+#: ../thunar/thunar-location-entry.c:394
 #: ../thunar/thunar-location-entry.c:422
-#: ../thunar/thunar-shortcuts-view.c:1277 ../thunar/thunar-window.c:1507
+#: ../thunar/thunar-shortcuts-view.c:1277
+#: ../thunar/thunar-window.c:1507
 #, c-format
 msgid Failed to open \%s\
 msgstr Не удалось открыть \%s\
@@ -150,20 +153,23 @@ msgstr Не удалось открыть \%s\: %s
 #. display an error message
 #: ../thunar/thunar-application.c:1242
 #: ../thunar/thunar-properties-dialog.c:643
-#: ../thunar/thunar-standard-view.c:2259 ../thunar/thunar-tree-view.c:1672
+#: ../thunar/thunar-standard-view.c:2259
+#: ../thunar/thunar-tree-view.c:1672
 #, c-format
 msgid Failed to rename \%s\
 msgstr Не удалось переименовать \%s\
 
 #: ../thunar/thunar-application.c:1344
 #: ../thunar/thunar-location-buttons.c:1285
-#: ../thunar/thunar-standard-view.c:1880 ../thunar/thunar-tree-view.c:1569
+#: ../thunar/thunar-standard-view.c:1880
+#: ../thunar/thunar-tree-view.c:1569
 msgid New Folder
 msgstr Новая папка
 
 #: ../thunar/thunar-application.c:1345
 #: ../thunar/thunar-location-buttons.c:1286
-#: ../thunar/thunar-standard-view.c:1881 ../thunar/thunar-tree-view.c:1570
+#: ../thunar/thunar-standard-view.c:1881
+#: ../thunar/thunar-tree-view.c:1570
 msgid Create New Folder
 msgstr Создать новую папку
 
@@ -176,7 +182,8 @@ msgid Create New File
 msgstr Создать новый файл
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-application.c:1408 ../thunar/thunar-standard-view.c:1926
+#: ../thunar/thunar-application.c:1408
+#: ../thunar/thunar-standard-view.c:1926
 #, c-format
 msgid Create Document from template \%s\
 msgstr Создать документ по шаблону \%s\
@@ -253,9 +260,12 @@ msgstr Удалить все файлы и папки из корзины?
 
 #. append the Empty Trash menu action
 #. prepare the menu item
-#: ../thunar/thunar-application.c:1894 ../thunar/thunar-location-buttons.c:171
-#: ../thunar/thunar-shortcuts-view.c:875 ../thunar/thunar-tree-view.c:1145
-#: ../thunar/thunar-window.c:296 ../plugins/thunar-tpa/thunar-tpa.c:177
+#: ../thunar/thunar-application.c:1894
+#: ../thunar/thunar-location-buttons.c:171
+#: ../thunar/thunar-shortcuts-view.c:875
+#: ../thunar/thunar-tree-view.c:1145
+#: ../thunar/thunar-window.c:296
+#: ../plugins/thunar-tpa/thunar-tpa.c:177
 msgid _Empty Trash
 msgstr _Очистить корзину
 
@@ -282,7 +292,8 @@ msgstr Не удалось восстановить \%s\
 msgid Restoring files...
 msgstr Восстановление файлов...
 
-#: ../thunar/thunar-chooser-button.c:309 ../thunar/thunar-chooser-dialog.c:465
+#: ../thunar/thunar-chooser-button.c:309
+#: ../thunar/thunar-chooser-dialog.c:465
 #, c-format
 msgid Failed to set default application for \%s\
 msgstr Не удалось назначить приложение по умолчанию для \%s\
@@ -300,7 +311,8 @@ msgstr Приложения не выбраны
 msgid Other Application...
 msgstr _Другое приложение...
 
-#: ../thunar/thunar-chooser-dialog.c:185 ../thunar/thunar-launcher.c:171
+#: ../thunar/thunar-chooser-dialog.c:185
+#: ../thunar/thunar-launcher.c:171
 msgid Open With
 msgstr Открыть с помощью
 
@@ -496,9 +508,11 @@ msgstr _Автоматически увеличивать ширину стол
 #. the file_time is invalid
 #. reset page title
 #. tell the user that we're unable to determine the 

[Xfce4-commits] postler:master Mention db and openssl as requirements in README

2011-03-06 Thread Christian Dywan
Updating branch refs/heads/master
 to d255360ef3c5f7fcf09d7d5ea8cbf0c33c2e3e57 (commit)
   from 3e2ba67ac60dc2afe661fa0ec0a9bc707c4c8889 (commit)

commit d255360ef3c5f7fcf09d7d5ea8cbf0c33c2e3e57
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Mar 6 19:41:00 2011 +0100

Mention db and openssl as requirements in README

 README |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/README b/README
index ce8cc62..ffcc28d 100644
--- a/README
+++ b/README
@@ -7,7 +7,8 @@ module runs separately. No network access occurs from within 
the user interface
 by default, offline access is integral. Contact completion and address book
 integration are provided by Dexter.
 
-Requirements: GIO 2.26, GTK+ 2.18, WebkitGTK+ 1.1.18, Unique 0.9, libnotify, 
libcanberra
+Requirements: GIO 2.26, GTK+ 2.18, WebkitGTK+ 1.1.18, Unique 0.9, libnotify,
+  libcanberra, (Berkeley) db, openssl
 
 Recommended: libindicate, Dexter, lynx
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] postler:master Give 'Mark as Unread' action a label

2011-03-06 Thread Christian Dywan
Updating branch refs/heads/master
 to cd9946f7d33c030cf8be905250d5d7bff5d7202d (commit)
   from d255360ef3c5f7fcf09d7d5ea8cbf0c33c2e3e57 (commit)

commit cd9946f7d33c030cf8be905250d5d7bff5d7202d
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Mar 6 19:41:55 2011 +0100

Give 'Mark as Unread' action a label

 postler/postler-app.vala |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/postler/postler-app.vala b/postler/postler-app.vala
index 5d09869..584a80c 100644
--- a/postler/postler-app.vala
+++ b/postler/postler-app.vala
@@ -91,7 +91,7 @@ public class Postler.App : Unique.App {
 { STOCK_MAIL_MARK_IMPORTANT, N_(Mark as _Important), 0, 0, 
STOCK_EMBLEM_IMPORTANT },
 { STOCK_MAIL_MARK_JUNK, N_(Mark as Junk), 0, 0, null },
 { STOCK_MAIL_MARK_NOT_JUNK, N_(Mark as Not Junk), 0, 0, null },
-{ STOCK_MAIL_MARK_UNREAD, null, 0, 0, Gtk.STOCK_NEW },
+{ STOCK_MAIL_MARK_UNREAD, N_(Mark as _Unread), 0, 0, Gtk.STOCK_NEW },
 { STOCK_MAIL_MESSAGE_NEW, N_(New _Message) },
{ STOCK_MAIL_REPLIED, mail-replied, 0, 0, STOCK_MAIL_REPLY_SENDER },
 { STOCK_MAIL_REPLY_SENDER, N_(Reply To _Sender) },
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] postler:master Use search-specific labels for search properties

2011-03-06 Thread Christian Dywan
Updating branch refs/heads/master
 to b829c4979ea0d1a80a5d7fc82cb30a1eda7b848b (commit)
   from cf589a075bc8d7fdce94880c07f0892246e39a88 (commit)

commit b829c4979ea0d1a80a5d7fc82cb30a1eda7b848b
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Mar 6 21:58:04 2011 +0100

Use search-specific labels for search properties

Fixes: https://bugs.launchpad.net/postler/+bug/726718

 postler/postler-accountsetup.vala |   18 ++
 postler/postler-folders.vala  |2 ++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/postler/postler-accountsetup.vala 
b/postler/postler-accountsetup.vala
index 9b69433..4ad5009 100644
--- a/postler/postler-accountsetup.vala
+++ b/postler/postler-accountsetup.vala
@@ -237,6 +237,7 @@ public class Postler.AccountSetup : Gtk.Dialog {
 public signal void done (AccountInfo? info);
 
 private AccountSetup (AccountInfo? info=null) {
+GLib.Object (title: _(Account Properties));
 widget = new AccountWidget (info);
 widget.done.connect ((info) = {
 hide ();
@@ -269,8 +270,17 @@ public class Postler.AccountSetup : Gtk.Dialog {
 }
 
 public static AccountSetup edit_account (AccountInfo info) {
-var setup = new AccountSetup (info);
-var remove = new Gtk.Button.with_mnemonic (_(Remove account));
+ var setup = new AccountSetup (info);
+
+unowned string remove_label = _(Remove Account);
+unowned string update_label = _(Update Account);
+if (info.type == AccountType.SEARCH) {
+setup.title = _(Saved Search Properties);
+remove_label = _(Remove Saved Search);
+update_label = _(Update Saved Search);
+}
+
+var remove = new Gtk.Button.with_mnemonic (remove_label);
 remove.set_image (new Gtk.Image.from_stock (Gtk.STOCK_DELETE,
 Gtk.IconSize.BUTTON));
 remove.relief = Gtk.ReliefStyle.NONE;
@@ -283,7 +293,7 @@ public class Postler.AccountSetup : Gtk.Dialog {
 Gtk.MessageType.WARNING, Gtk.ButtonsType.NONE,
 _(You are about to remove the account \%s\.), info.name);
 dialog.add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-_(_Remove Account), Gtk.ResponseType.OK);
+remove_label, Gtk.ResponseType.OK);
 dialog.set_default_response (Gtk.ResponseType.CANCEL);
 int response = dialog.run ();
 dialog.destroy ();
@@ -293,7 +303,7 @@ public class Postler.AccountSetup : Gtk.Dialog {
 setup.destroy ();
 }
 });
-var apply = setup.add_button (_(_Update Account), 
Gtk.ResponseType.APPLY);
+var apply = setup.add_button (update_label, Gtk.ResponseType.APPLY);
 (setup.action_area as Gtk.Box).set_child_packing (apply,
 true, true, 0, Gtk.PackType.END);
 setup.set_default_response (Gtk.ResponseType.APPLY);
diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index 116362d..3a09f46 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -739,6 +739,8 @@ public class Postler.Folders : Gtk.TreeView {
 menu.append (new Gtk.SeparatorMenuItem ());
 
 menuitem = new Gtk.MenuItem.with_mnemonic (_(Account 
_Properties));
+if (is_search)
+menuitem.label = _(Saved Search _Properties);
 menuitem.activate.connect ((menuitem) = {
 Gtk.TreeIter iter;
  if (get_selection ().get_selected (null, out iter)) {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] thunar-shares-plugin:master l10n: Updated German (de) translation to 100%

2011-03-06 Thread Transifex
Updating branch refs/heads/master
 to 94df7b43163ca93919e49a7ee1d14e0fee6c982e (commit)
   from ae647db615589b50d420156b3a79fb92e9990668 (commit)

commit 94df7b43163ca93919e49a7ee1d14e0fee6c982e
Author: Christoph Wickert christoph.wick...@googlemail.com
Date:   Sun Mar 6 22:16:29 2011 +0100

l10n: Updated German (de) translation to 100%

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

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

 po/de.po |   24 
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/po/de.po b/po/de.po
index c036cbb..63ad637 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid 
 msgstr 
 Project-Id-Version: thunar-shares-plugin\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2010-02-22 18:07+0100\n
+POT-Creation-Date: 2011-03-06 17:15+\n
 PO-Revision-Date: 2009-03-11 22:53+\n
 Last-Translator: Simon Schneider si...@schneiderimtal.de\n
 Language-Team: German xfce-i18n-de@xfce-org\n
@@ -19,7 +19,7 @@ msgstr 
 
 #: ../libshares/libshares-util.c:161
 msgid Please, write a name.
-msgstr Geben Sie bitte einen Namen ein.
+msgstr Bitte einen Namen eingeben.
 
 #. Warn the user
 #: ../libshares/libshares-util.c:169
@@ -41,11 +41,11 @@ msgstr Freigabe kann nicht bearbeitet werden:
 
 #: ../libshares/libshares-util.c:345
 msgid Thunar needs to add some permissions to your folder in order to share 
it. Do you agree?
-msgstr Thunar muss einige Rechte dieses Ordners ändern, um ihn freizugeben. 
Wollen Sie das?
+msgstr Thunar muss einige Rechte dieses Ordners ändern, um ihn freizugeben. 
Möchten Sie das?
 
 #: ../libshares/libshares-util.c:384
 msgid Error when changing folder permissions.
-msgstr Fehler beim Ändern der Ordnerrechte
+msgstr Fehler beim Ändern der Ordnerrechte.
 
 #: ../libshares/shares.c:165
 #, c-format
@@ -55,17 +55,17 @@ msgstr %s %s %s gab das Signal %d zurück.
 #: ../libshares/shares.c:174
 #, c-format
 msgid %s %s %s failed for an unknown reason
-msgstr %s %s %s schlug mit unbekanntem Grund fehl.
+msgstr %s %s %s schlug aus unbekanntem Grund fehl.
 
 #: ../libshares/shares.c:195
 #, c-format
 msgid 'net usershare' returned error %d: %s
-msgstr Der Aufruf von »net usershare« erzeugte Fehler Nummer %d: %s
+msgstr Der Aufruf von »net usershare« erzeugte Fehler %d: %s
 
 #: ../libshares/shares.c:197
 #, c-format
 msgid 'net usershare' returned error %d
-msgstr Der Aufruf von »net usershare« erzeugte Fehler Nummer %d.
+msgstr Der Aufruf von »net usershare« erzeugte Fehler %d.
 
 #: ../libshares/shares.c:231
 #, c-format
@@ -90,22 +90,22 @@ msgstr Die Sambafunktion »testparm« schlug aus unbekanntem 
Grund fehl.
 #: ../libshares/shares.c:613
 #, c-format
 msgid Samba's testparm returned error %d: %s
-msgstr Die Sambafunktion »testparm« erzeugte Fehler Nummer %d: %s
+msgstr Die Sambafunktion »testparm« erzeugte Fehler %d: %s
 
 #: ../libshares/shares.c:615
 #, c-format
 msgid Samba's testparm returned error %d
-msgstr Die Sambafunktion »testparm« erzeugte Fehler Nummer %d.
+msgstr Die Sambafunktion »testparm« erzeugte Fehler %d.
 
 #: ../libshares/shares.c:784
 #, c-format
 msgid Cannot remove the share for path %s: that path is not shared
-msgstr Die Freigabe für »%s« kann nicht entfernt werden: Das ist keine 
Freigabe.
+msgstr Die Freigabe für »%s« kann nicht entfernt werden: Dieser Pfad ist 
nicht freigegeben.
 
 #: ../libshares/shares.c:837
 #, c-format
 msgid Cannot change the path of an existing share; please remove the old 
share first and add a new one
-msgstr Der Dateipfad einer Freigabe kann nicht geändert werden. Bitte 
entfernen Sie die Freigabe und erzeugen Sie sie neu.
+msgstr Der Dateipfad einer Freigabe kann nicht geändert werden. Bitte 
entfernen Sie zuerst die alte Freigabe und erzeugen Sie eine neue.
 
 #: ../thunar-plugin/tsp-page.c:152
 msgid bFolder Sharing/b
@@ -123,7 +123,7 @@ msgstr Freigabename
 #. Write access
 #: ../thunar-plugin/tsp-page.c:180
 msgid Allow others users to write in this folder
-msgstr Andere Benutzer dürfen in diesen Ordner schreiben.
+msgstr Andere Benutzer dürfen in diesem Ordner schreiben.
 
 #. Guest access
 #: ../thunar-plugin/tsp-page.c:185
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] midori:master Localise ?B and correct a typo in the function call

2011-03-06 Thread Christian Dywan
Updating branch refs/heads/master
 to 67b706b550d7e8f8bbe8f3f4c8d66d8eec3f6a37 (commit)
   from 21faa34589fc407f252de87d528d2dea9dde0c3d (commit)

commit 67b706b550d7e8f8bbe8f3f4c8d66d8eec3f6a37
Author: Christian Dywan christ...@twotoasts.de
Date:   Mon Mar 7 00:10:05 2011 +0100

Localise ?B and correct a typo in the function call

 toolbars/midori-transferbar.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/toolbars/midori-transferbar.c b/toolbars/midori-transferbar.c
index 16a5fc6..7a67e25 100644
--- a/toolbars/midori-transferbar.c
+++ b/toolbars/midori-transferbar.c
@@ -97,7 +97,8 @@ midori_transferbar_download_notify_progress_cb 
(WebKitDownload* download,
 if (time != *last_time)
 transfer = g_format_size_for_display ((size - *last_size) / (time - 
*last_time));
 else
-transfer = g_strup (?B);
+/* i18n: Unknown number of bytes, used for transfer rate like ?B/s */
+transfer = g_strdup (_(?B));
 /* i18n: Download tooltip, 4KB of 43MB, 130KB/s */
 size_text = g_strdup_printf (_(%s of %s, %s/s), current, total, 
transfer);
 if (time - *last_time  5.0)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-docs:xfce4-panel-master Completed initial draft of Add New Items. Modified spacing in Prefrences.

2011-03-06 Thread Shara Miller
Updating branch refs/heads/xfce4-panel-master
 to 0e7ff915396847622a9675de81684bbd9dc6e269 (commit)
   from 602d568c50e82e05933780aceb699f09a0e6c19a (commit)

commit 0e7ff915396847622a9675de81684bbd9dc6e269
Author: Shara Miller shara.mil...@gmail.com
Date:   Sun Mar 6 17:40:52 2011 -0600

Completed initial draft of Add New Items.
Modified spacing in Prefrences.

 add-new-items.page |   24 
 preferences.page   |6 +++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/add-new-items.page b/add-new-items.page
index 34e34fa..86ff984 100644
--- a/add-new-items.page
+++ b/add-new-items.page
@@ -17,9 +17,33 @@
   /info
 
   titleAdd New Plugins/title
+  p
+The appAdd New Items/app dialogue allows you insert plugins into your
+panel.
+  /p
 
   figure
 titleAdd new items dialog/title
 media type=image src=figures/add-new-items.png mime=image/png 
style=right/
   /figure
+
+  section
+titleAccessing appAdd New Items/app/title
+p
+  The appAdd New Items/app dialogue can be opened by right clicking on
+  empty space on a panel and going to guiAdd New Items/gui. If you 
right
+  click on a space occupied by a panel plugin, you can access appAdd New
+  Items/app by going to guiseqguiPanel/guiguiAdd New
+  Items/gui/guiseq.
+  /p
+  /section
+
+  section
+titleAdding Panel Plugins/title
+p
+  To add a panel plugin to a panel, select a plugin in the list and click
+  guiAdd/gui. The panel plugin you have selected will appear in the 
panel.
+/p
+  /section
+
 /page
diff --git a/preferences.page b/preferences.page
index e8d9609..df4d435 100644
--- a/preferences.page
+++ b/preferences.page
@@ -21,7 +21,7 @@
The Xfce panel preferences dialog gives you the ability
to customize your panel. You can change the size, appearance,
and orentation of your panels. You can also add or remove extra 
-   panels on your desktop. 
+   panels on your desktop.  
/p 
 
   figure
@@ -174,7 +174,7 @@
 guiseqguiSettings/guiguiAppearance/gui/guiseq.
   /p
 /item
- 
+
 item
   titleguiSolid Color/gui/title
   p
@@ -182,7 +182,7 @@
 The color you select will be applied to the panel.
   /p
 /item
- 
+
 item
   titleguiBackground Image/gui/title
   p
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] midori:master Disarm built-in notebook reorder key bindings

2011-03-06 Thread Christian Dywan
Updating branch refs/heads/master
 to 302c1b364d37e300d6808d09db361c53579a61b9 (commit)
   from 67b706b550d7e8f8bbe8f3f4c8d66d8eec3f6a37 (commit)

commit 302c1b364d37e300d6808d09db361c53579a61b9
Author: Alexander Friesen a_06...@fastmail.fm
Date:   Mon Mar 7 03:38:17 2011 +0100

Disarm built-in notebook reorder key bindings

The keys are confusing if triggered accidentally.

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 4f04691..9c37502 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4781,6 +4781,16 @@ midori_browser_notebook_page_reordered_cb (GtkNotebook*  
 notebook,
 g_object_notify (G_OBJECT (browser), tab);
 }
 
+static gboolean
+midori_browser_notebook_reorder_tab_cb (GtkNotebook* notebook,
+GtkDirectionType arg1,
+gboolean arg2,
+gpointer user_data)
+{
+g_signal_stop_emission_by_name (notebook, reorder-tab);
+return TRUE;
+}
+
 static void
 midori_browser_switch_tab_cb (GtkWidget* menuitem,
   MidoriBrowser* browser)
@@ -5246,6 +5256,9 @@ midori_browser_destroy_cb (MidoriBrowser* browser)
 /* Destroy panel first, so panels don't need special care */
 gtk_widget_destroy (browser-panel);
 /* Destroy tabs second, so child widgets don't need special care */
+g_signal_handlers_disconnect_by_func (browser-notebook,
+  
midori_browser_notebook_reorder_tab_cb,
+  NULL);
 gtk_container_foreach (GTK_CONTAINER (browser-notebook),
(GtkCallback) gtk_widget_destroy, NULL);
 }
@@ -5968,6 +5981,8 @@ midori_browser_init (MidoriBrowser* browser)
 g_signal_connect_after (browser-notebook, button-press-event,
 G_CALLBACK (midori_browser_notebook_button_press_event_after_cb),
   browser);
+g_signal_connect (browser-notebook, reorder-tab,
+  G_CALLBACK (midori_browser_notebook_reorder_tab_cb), 
NULL);
 gtk_widget_show (browser-notebook);
 
 /* Inspector container */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits