[Xfce4-commits] xfce4-panel:master Update dependencies (libxfce4ui = 4.11)

2014-02-15 Thread Andrzej
Updating branch refs/heads/master
 to bb48fc0ff694f97cd55c0ea076d84387852f9638 (commit)
   from 1b1749d5cb7421101dcbf43d085e835516d5bb8f (commit)

commit bb48fc0ff694f97cd55c0ea076d84387852f9638
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Feb 16 02:33:41 2014 +

Update dependencies (libxfce4ui = 4.11)

TODO: bump required version of libxfce4util and xfconf to 4.11
once they are ready.

 configure.ac.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index 69126fd..9357577 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -130,7 +130,7 @@ dnl ***
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
 XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.1.5])
 XDT_CHECK_PACKAGE([GARCON_GTK2], [garcon-gtk2-1], [0.3.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.11.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
 XDT_CHECK_PACKAGE([EXO], [exo-1], [0.7.2])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:master NEWS: copy changes from 4.10.1

2014-02-15 Thread Andrzej
Updating branch refs/heads/master
 to 45629db32cf26a3cd10dc5eb69fe07d7634b28c6 (commit)
   from bb48fc0ff694f97cd55c0ea076d84387852f9638 (commit)

commit 45629db32cf26a3cd10dc5eb69fe07d7634b28c6
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Feb 16 02:49:05 2014 +

NEWS: copy changes from 4.10.1

 NEWS |   14 ++
 1 file changed, 14 insertions(+)

diff --git a/NEWS b/NEWS
index 0dbcb44..80b4892 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+4.10.1
+==
+- Bugfix in icon/pixbuf resizing code.
+- Fix icons not probably resizing when requested.
+- Autotools updates.
+- Ignore GVarueArray compiler warning.
+- Use G_ENABLE_DEBUG to set fatal messages.
+- Fixed DnD markers with non-square small items.
+- Actions: Fix logic of session saving (bug #8857).
+- Panel: Emit save signal for plugins.
+- Libxfce4-panel: Fix typo in the API docs.
+- Translation updates: Arabic, Bulgarian, German, Croatian, Polish,
+  Serbian, Swedish, Turkish, Uyghur.
+
 4.10.0
 ==
 - Use correct LGPL licenses in the libs.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:master Updates for the release

2014-02-15 Thread Andrzej
Updating branch refs/heads/master
 to 885441318beea8e77f7112cc243365e36c3a1db2 (commit)
   from 45629db32cf26a3cd10dc5eb69fe07d7634b28c6 (commit)

commit 885441318beea8e77f7112cc243365e36c3a1db2
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Feb 16 03:16:43 2014 +

Updates for the release

 NEWS|   21 +
 configure.ac.in |4 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 80b4892..b73e407 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+4.11.0
+==
+- Window Buttons: Improve the tasklist multimonitor handling.
+- Scroll the items list in the config dialog box (bug #10582)
+- Set EWMH client type to WNCK_CLIENT_TYPE_PAGER (bug #10508).
+- Fixed transparency issues with Gtk3 plugins.
+- Workspace Switcher: fixed aspect ratio in deskbar mode.
+- Added --enable-gtk3 configure flag. Note: it produces gtk2/gtk3 versions
+  of libxfce4panel and wrapper binary so that both gtk2 and gtk3 plugins can
+  be embedded. The panel and stock plugins are still using gtk2.
+- Applications Menu: Use new GarconGtkMenu.
+- Window Buttons: middle-click action configurable (nothing, close, minimize).
+- Drectory Menu: Pass path to argument (bug #10270).
+- Window Buttons: close a window on middle click (bug #8096).
+- Applications Menu: support for non-square icons and layout fixes.
+- Install XfcePanelPlugin properties at once.
+- Clock: added support for timezone selection.
+- Put each window in a new window group.
+- Window Buttons: Show urgent windows from other workspaces (bug #5167).
+- Clock: calendar popup.
+
 4.10.1
 ==
 - Bugfix in icon/pixbuf resizing code.
diff --git a/configure.ac.in b/configure.ac.in
index 9357577..980abaa 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -12,11 +12,11 @@ m4_define([libxfce4panel_verinfo], [4:0:0]) dnl 
current:revision:age
 m4_define([libxfce4panel_version_api], [1.0])
 m4_define([xfce4_panel_config_version], [2])
 m4_define([xfce4_panel_version_major], [4])
-m4_define([xfce4_panel_version_minor], [10])
+m4_define([xfce4_panel_version_minor], [11])
 m4_define([xfce4_panel_version_micro], [0])
 m4_define([xfce4_panel_version_nano],  []) dnl leave this empty to have no 
nano version
 m4_define([xfce4_panel_version_build], [@REVISION@])
-m4_define([xfce4_panel_version_tag],   [git])
+m4_define([xfce4_panel_version_tag],   [])
 m4_define([xfce4_panel_version], 
[xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(),
 [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [git], 
[xfce4_panel_version_tag()-xfce4_panel_version_build()], 
[xfce4_panel_version_tag()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:master Back to development.

2014-02-15 Thread Andrzej
Updating branch refs/heads/master
 to 65c810c24c4363ef06ccf2ba60ed5aaee0200eb0 (commit)
   from 885441318beea8e77f7112cc243365e36c3a1db2 (commit)

commit 65c810c24c4363ef06ccf2ba60ed5aaee0200eb0
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Feb 16 03:20:01 2014 +

Back to development.

 configure.ac.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 980abaa..cd873fa 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -13,10 +13,10 @@ m4_define([libxfce4panel_version_api], [1.0])
 m4_define([xfce4_panel_config_version], [2])
 m4_define([xfce4_panel_version_major], [4])
 m4_define([xfce4_panel_version_minor], [11])
-m4_define([xfce4_panel_version_micro], [0])
+m4_define([xfce4_panel_version_micro], [1])
 m4_define([xfce4_panel_version_nano],  []) dnl leave this empty to have no 
nano version
 m4_define([xfce4_panel_version_build], [@REVISION@])
-m4_define([xfce4_panel_version_tag],   [])
+m4_define([xfce4_panel_version_tag],   [git])
 m4_define([xfce4_panel_version], 
[xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(),
 [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [git], 
[xfce4_panel_version_tag()-xfce4_panel_version_build()], 
[xfce4_panel_version_tag()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Depend on xfce4-panel 4.11.0

2014-02-15 Thread Andrzej
Updating branch refs/heads/master
 to 24fb6adfb07ae242abbaf4ab1051eadd43b4ebe0 (commit)
   from 019468d56f12682f26b1c136bb0099aa9e4041bf (commit)

commit 24fb6adfb07ae242abbaf4ab1051eadd43b4ebe0
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Feb 16 03:29:22 2014 +

Depend on xfce4-panel 4.11.0

 configure.ac.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index 3bb97df..f2fe77f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -81,7 +81,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.6.0])
 dnl XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.11.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], 
[libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.10.0git])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], 
[libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.11.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
 INDICATOR_PKGNAME=indicator3-0.4
 XDT_CHECK_PACKAGE([INDICATOR], [${INDICATOR_PKGNAME}], [12.10.1])
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Updates for the release

2014-02-15 Thread Andrzej
Updating branch refs/heads/master
 to 620b8e72a106c62311415749d662aa91b0cbc368 (commit)
   from 24fb6adfb07ae242abbaf4ab1051eadd43b4ebe0 (commit)

commit 620b8e72a106c62311415749d662aa91b0cbc368
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Feb 16 03:35:56 2014 +

Updates for the release

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

diff --git a/ChangeLog b/ChangeLog
index 4de567b..c6563f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+# created with git log --pretty=format:%ad %h %s %aN %aE --no-merges 
--date=short
+2014-02-16 24fb6ad Depend on xfce4-panel 4.11.0 Andrzej ndrwr...@gmail.com
+2014-02-14 019468d dialog: do not use deprecated gtk stock items Andrzej 
ndrwr...@gmail.com
+2014-02-08 29e4b7d I18n: Add new translation sv (100%). PavelNicklasson 
pavelnicklas...@bahnhof.se
+2014-01-26 9bea734 I18n: Update translation id (100%). padmawan 
andhika.padma...@gmail.com
+2014-01-22 9003be9 Improved handling of popup menus Andrzej 
ndrwr...@gmail.com
+2014-01-22 11fbd8c Do not ref/unref widgets and let libindicator manage them 
Andrzej ndrwr...@gmail.com
+2014-01-21 6eec40b Fixed button sizing when icon/image storage type == 
GTK_IMAGE_EMPTY Andrzej ndrwr...@gmail.com
+2014-01-21 723a2db Fixed a randomly missing icon in sound indicator Andrzej 
ndrwr...@gmail.com
+2014-01-04 2c252c2 I18n: Update translation zh_TW (97%). Walter Cheuk 
wwych...@gmail.com
+2014-01-03 54fb801 I18n: Update translation de (100%). Anonymous 
nore...@xfce.org
+2013-12-30 823f19c I18n: Update translation de (94%). Anonymous 
nore...@xfce.org
+2013-12-30 412b23e I18n: Update translation de (89%). Anonymous 
nore...@xfce.org
+2013-12-18 0ee1b17 Check if labels are visible. Andrzej ndrwr...@gmail.com
+2013-12-18 f7ad97a Ellipsize labels only in deskbar mode. Andrzej 
ndrwr...@gmail.com
+2013-12-11 d046d4b Check for empty labels to optimize layout Andrzej 
ndrwr...@gmail.com
+2013-12-06 bb66797 I18n: Add new translation oc (100%). Cedric31 
cvalm...@yahoo.fr
+2013-12-04 887fe33 I18n: Update translation sl (100%). anthonmanix 
anthon.ma...@gmail.com
+2013-12-03 7f1fd24 I18n: Add new translation sl (86%). anthonmanix 
anthon.ma...@gmail.com
+2013-12-01 ec0a224 Back to development Andrzej ndrwr...@gmail.com
+2013-12-01 7a07e81 Preparing for a release Andrzej ndrwr...@gmail.com
 2013-12-01 4971cc4 Changed required version of libxfce4panel Andrzej 
ndrwr...@gmail.com
 2013-11-18 b992563 I18n: Update translation da (100%). cedeel 
ch...@cedeel.com
 2013-11-16 bc7f4df I18n: Update translation zh_TW (78%). sofyalai 
sofya...@gmail.com
@@ -339,4 +360,4 @@
 2009-05-27 67c060d indicator is the one we need to check for Mark Trompell 
m...@foresightlinux.org
 2009-05-26 646fe35 Fix build issue with libtool 2.x Mark Trompell 
m...@foresightlinux.org
 2009-05-15 aa9f8f0 some random changes Mark Trompell m...@foresightlinux.org
-2009-05-15 ac4fe3f initial checkin Mark Trompell m...@foresightlinux.org
\ No newline at end of file
+2009-05-15 ac4fe3f initial checkin Mark Trompell m...@foresightlinux.org
diff --git a/configure.ac.in b/configure.ac.in
index f2fe77f..3d0a90a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -7,11 +7,11 @@ dnl ***
 dnl *** Version information ***
 dnl ***
 m4_define([indicator_version_major], [2])
-m4_define([indicator_version_minor], [2])
+m4_define([indicator_version_minor], [3])
 m4_define([indicator_version_micro], [0])
 m4_define([indicator_version_nano],  []) dnl leave this empty to have no nano 
version
 m4_define([indicator_version_build], [@REVISION@])
-m4_define([indicator_version_tag],   [git])
+m4_define([indicator_version_tag],   [])
 m4_define([indicator_version], 
[indicator_version_major().indicator_version_minor().indicator_version_micro()ifelse(indicator_version_nano(),
 [], [], [.indicator_version_nano()])ifelse(indicator_version_tag(), [git], 
[indicator_version_tag()-indicator_version_build()], 
[indicator_version_tag()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin|xfce4-indicator-plugin-2.3.0 Creating annotated tag xfce4-indicator-plugin-2.3.0

2014-02-15 Thread Andrzej
Updating annotated tag refs/tags/xfce4-indicator-plugin-2.3.0
 as new annotated tag
 to b1edf5c854d340a36b4b4b9fb5801059afd69e17 (tag)
   succeeds xfce4-indicator-plugin-2.2.0-19-g24fb6ad
  tagged by Andrzej ndrwr...@gmail.com
 on 2014-02-16 04:36 +0100

Andrzej (1):
  Updates for the release

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Back to development.

2014-02-15 Thread Andrzej
Updating branch refs/heads/master
 to fed00f82571c3f05f35c424af1098d2578bc57d0 (commit)
   from 620b8e72a106c62311415749d662aa91b0cbc368 (commit)

commit fed00f82571c3f05f35c424af1098d2578bc57d0
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Feb 16 03:37:18 2014 +

Back to development.

 configure.ac.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 3d0a90a..ef872eb 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -7,11 +7,11 @@ dnl ***
 dnl *** Version information ***
 dnl ***
 m4_define([indicator_version_major], [2])
-m4_define([indicator_version_minor], [3])
+m4_define([indicator_version_minor], [4])
 m4_define([indicator_version_micro], [0])
 m4_define([indicator_version_nano],  []) dnl leave this empty to have no nano 
version
 m4_define([indicator_version_build], [@REVISION@])
-m4_define([indicator_version_tag],   [])
+m4_define([indicator_version_tag],   [git])
 m4_define([indicator_version], 
[indicator_version_major().indicator_version_minor().indicator_version_micro()ifelse(indicator_version_nano(),
 [], [], [.indicator_version_nano()])ifelse(indicator_version_tag(), [git], 
[indicator_version_tag()-indicator_version_build()], 
[indicator_version_tag()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel|xfce4-panel-4.11.0 Creating annotated tag xfce4-panel-4.11.0

2014-02-15 Thread Andrzej
Updating annotated tag refs/tags/xfce4-panel-4.11.0
 as new annotated tag
 to 06820e75e6dd2378bf38ac64284e752701e87ff1 (tag)
   succeeds xfce4-panel-4.10.0-302-g45629db
  tagged by Andrzej ndrwr...@gmail.com
 on 2014-02-16 04:18 +0100

Andrzej (1):
  Updates for the release

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master dialog: do not use deprecated gtk stock items

2014-02-14 Thread Andrzej
Updating branch refs/heads/master
 to 019468d56f12682f26b1c136bb0099aa9e4041bf (commit)
   from 29e4b7dec0aa44036f4756b079ea71b7a9596753 (commit)

commit 019468d56f12682f26b1c136bb0099aa9e4041bf
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Feb 14 22:26:51 2014 +

dialog: do not use deprecated gtk stock items

 panel-plugin/indicator-dialog.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel-plugin/indicator-dialog.c b/panel-plugin/indicator-dialog.c
index 846aa5e..849b467 100644
--- a/panel-plugin/indicator-dialog.c
+++ b/panel-plugin/indicator-dialog.c
@@ -446,7 +446,7 @@ indicator_dialog_clear_clicked (GtkWidget   *button,
   g_return_if_fail (GTK_IS_LIST_STORE (dialog-store));
 
   if (xfce_dialog_confirm (GTK_WINDOW (gtk_widget_get_toplevel (button)),
-   GTK_STOCK_CLEAR, NULL, NULL,
+   edit-clear, NULL, NULL,
_(Are you sure you want to clear the list of 
  known indicators?)))
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:master Fix transparency with alpha being 100 (Bug 10658)

2014-02-14 Thread Andrzej
Updating branch refs/heads/master
 to 1b1749d5cb7421101dcbf43d085e835516d5bb8f (commit)
   from 86a1b73c0a5ac1760e6978ee2dca9da47adc05c5 (commit)

commit 1b1749d5cb7421101dcbf43d085e835516d5bb8f
Author: Eric Koegel eric.koe...@gmail.com
Date:   Wed Feb 12 19:03:34 2014 +0300

Fix transparency with alpha being 100 (Bug 10658)

A panel with style set to 'none (use system style)' and alpha to
100 is still affected by the problem which can be triggered manually
by launching another indicator after the initial panel start. This
patch removes an unneeded check that was causing the issue. Thanks
to Thaddäus Tintenfisch for reporting the issue and finding the
exact part of the code that needed to be corrected.

 wrapper/wrapper-plug.c |   34 +++---
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c
index 6832a35..e3c3d61 100644
--- a/wrapper/wrapper-plug.c
+++ b/wrapper/wrapper-plug.c
@@ -222,28 +222,24 @@ wrapper_plug_draw (GtkWidget *widget,
   else
 {
   alpha = gtk_widget_is_composited (GTK_WIDGET (plug)) ? 
plug-background_alpha : 1.00;
+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
-  if (alpha  1.00 || plug-background_color != NULL)
+  /* get the background gdk color */
+  if (plug-background_color != NULL)
 {
-  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-
-  /* get the background gdk color */
-  if (plug-background_color != NULL)
-{
-  color = plug-background_color;
-  cairo_set_source_rgba (cr, PANEL_GDKCOLOR_TO_DOUBLE (color), 
alpha);
-}
-  else
-{
-  style = gtk_widget_get_style_context (widget);
-  gtk_style_context_get_background_color (style, 
GTK_STATE_FLAG_NORMAL, rgba);
-  rgba.alpha = alpha;
-  gdk_cairo_set_source_rgba (cr, rgba);
-}
-
-  /* draw the background color */
-  cairo_paint (cr);
+  color = plug-background_color;
+  cairo_set_source_rgba (cr, PANEL_GDKCOLOR_TO_DOUBLE (color), alpha);
 }
+  else
+{
+  style = gtk_widget_get_style_context (widget);
+  gtk_style_context_get_background_color (style, 
GTK_STATE_FLAG_NORMAL, rgba);
+  rgba.alpha = alpha;
+  gdk_cairo_set_source_rgba (cr, rgba);
+}
+
+  /* draw the background color */
+  cairo_paint (cr);
 }
 
   cairo_restore(cr);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Improved handling of popup menus

2014-01-22 Thread Andrzej
Updating branch refs/heads/master
 to 9003be9a2ba233c68c706e691741c3dea09a44c2 (commit)
   from 11fbd8c67c272706dbde3ca9fa0722b4691ec817 (commit)

commit 9003be9a2ba233c68c706e691741c3dea09a44c2
Author: Andrzej ndrwr...@gmail.com
Date:   Wed Jan 22 21:44:00 2014 +

Improved handling of popup menus

_set_menu should clean up/disactivate previous menu,
Menus should only be attached once (and detached when needed),
_deactivate function should only be called once.

 panel-plugin/indicator-box.c|3 +--
 panel-plugin/indicator-button.c |   48 ++-
 panel-plugin/indicator-button.h |2 +-
 panel-plugin/indicator.c|6 +++--
 4 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/panel-plugin/indicator-box.c b/panel-plugin/indicator-box.c
index c0fa328..66523d6 100644
--- a/panel-plugin/indicator-box.c
+++ b/panel-plugin/indicator-box.c
@@ -595,8 +595,7 @@ xfce_indicator_box_remove_entry (XfceIndicatorBox *box,
   button = XFCE_INDICATOR_BUTTON (li_tmp-data);
   if (xfce_indicator_button_get_entry (button) == entry)
 {
-  xfce_indicator_button_disconnect_signals (button);
-  gtk_widget_destroy (GTK_WIDGET (button));
+  xfce_indicator_button_destroy (button);
   return;
 }
 }
diff --git a/panel-plugin/indicator-button.c b/panel-plugin/indicator-button.c
index 2963e84..8440c62 100644
--- a/panel-plugin/indicator-button.c
+++ b/panel-plugin/indicator-button.c
@@ -43,7 +43,6 @@
 //#define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED scroll-entry
 //#endif
 
-static void xfce_indicator_button_finalize(GObject 
   *object);
 static gboolean xfce_indicator_button_button_press(GtkWidget   
   *widget,

GdkEventButton *event);
 static gboolean xfce_indicator_button_button_release  (GtkWidget   
   *widget,
@@ -73,6 +72,7 @@ struct _XfceIndicatorButton
 
   GtkWidget*align_box;
   GtkWidget*box;
+  gulongdeactivate_id;
 };
 
 struct _XfceIndicatorButtonClass
@@ -88,12 +88,8 @@ G_DEFINE_TYPE (XfceIndicatorButton, xfce_indicator_button, 
GTK_TYPE_TOGGLE_BUTTO
 static void
 xfce_indicator_button_class_init (XfceIndicatorButtonClass *klass)
 {
-  GObjectClass  *gobject_class;
   GtkWidgetClass*widget_class;
 
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class-finalize = xfce_indicator_button_finalize;
-
   widget_class = GTK_WIDGET_CLASS (klass);
   widget_class-button_press_event = xfce_indicator_button_button_press;
   widget_class-button_release_event = xfce_indicator_button_button_release;
@@ -122,6 +118,7 @@ xfce_indicator_button_init (XfceIndicatorButton *button)
   button-plugin = NULL;
   button-config = NULL;
   button-menu = NULL;
+  button-deactivate_id = 0;
 
   button-align_box = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
   gtk_container_add (GTK_CONTAINER (button), button-align_box);
@@ -130,18 +127,6 @@ xfce_indicator_button_init (XfceIndicatorButton *button)
 
 
 
-static void
-xfce_indicator_button_finalize (GObject *object)
-{
-  XfceIndicatorButton *button = XFCE_INDICATOR_BUTTON (object);
-
-  xfce_indicator_button_disconnect_signals (button);
-
-  G_OBJECT_CLASS (xfce_indicator_button_parent_class)-finalize (object);
-}
-
-
-
 void
 xfce_indicator_button_set_label (XfceIndicatorButton *button,
  GtkLabel*label)
@@ -174,13 +159,15 @@ xfce_indicator_button_set_menu (XfceIndicatorButton 
*button,
   g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (button));
   g_return_if_fail (GTK_IS_MENU (menu));
 
-  if (button-menu != menu)
+  if (button-menu != NULL)
 {
-  button-menu = menu;
-  g_signal_connect_swapped (G_OBJECT (button-menu), deactivate,
-G_CALLBACK 
(xfce_indicator_button_menu_deactivate), button);
-  gtk_menu_attach_to_widget(menu, GTK_WIDGET (button), NULL);
+  gtk_menu_detach (button-menu);
+  gtk_menu_popdown (button-menu);
+  button-menu = NULL;
 }
+
+  button-menu = menu;
+  gtk_menu_attach_to_widget(menu, GTK_WIDGET (button), NULL);
 }
 
 
@@ -297,14 +284,17 @@ xfce_indicator_button_new (IndicatorObject  *io,
 
 
 void
-xfce_indicator_button_disconnect_signals (XfceIndicatorButton *button)
+xfce_indicator_button_destroy (XfceIndicatorButton *button)
 {
   g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (button));
 
-  if (button-menu != 0)
+  if (button-menu != NULL)
 {
+  gtk_menu_detach (button-menu);
   gtk_menu_popdown (button-menu);
+  button-menu = NULL;
 }
+  gtk_widget_destroy (GTK_WIDGET (button));
 }
 
 
@@ -316,13 +306,14 @@ xfce_indicator_button_button_press (GtkWidget  
*widget,
 
   if(event-button == 1  button-menu != NULL) /* left click only

[Xfce4-commits] xfce4-indicator-plugin:master Fixed a randomly missing icon in sound indicator

2014-01-21 Thread Andrzej
Updating branch refs/heads/master
 to 723a2dbf8253ee3bc84c599c587839167bd9b011 (commit)
   from 2c252c25a26459531a37abe0a953a7efa31673b5 (commit)

commit 723a2dbf8253ee3bc84c599c587839167bd9b011
Author: Andrzej ndrwr...@gmail.com
Date:   Tue Jan 21 20:51:27 2014 +

Fixed a randomly missing icon in sound indicator

Sound indicator sometimes adds an image with a GTK_IMAGE_EMPTY
storage type and updates it later.

 panel-plugin/indicator-button-box.c |6 --
 1 file changed, 6 deletions(-)

diff --git a/panel-plugin/indicator-button-box.c 
b/panel-plugin/indicator-button-box.c
index f3abb6a..041b083 100644
--- a/panel-plugin/indicator-button-box.c
+++ b/panel-plugin/indicator-button-box.c
@@ -289,12 +289,6 @@ indicator_button_box_set_image (IndicatorButtonBox  *box,
   g_object_unref (G_OBJECT (box-icon));
 }
 
-  if(gtk_image_get_storage_type(image) == GTK_IMAGE_EMPTY)
-{
-  box-icon = NULL;
-  return;
-}
-
   box-icon = GTK_WIDGET (image);
   g_object_ref (G_OBJECT (box-icon));
   g_signal_connect(G_OBJECT(box-icon), notify::pixbuf,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Fixed button sizing when icon/image storage type == GTK_IMAGE_EMPTY

2014-01-21 Thread Andrzej
Updating branch refs/heads/master
 to 6eec40b9771d3bc430e62ab9a0c0c92b643d56ae (commit)
   from 723a2dbf8253ee3bc84c599c587839167bd9b011 (commit)

commit 6eec40b9771d3bc430e62ab9a0c0c92b643d56ae
Author: Andrzej ndrwr...@gmail.com
Date:   Tue Jan 21 21:52:03 2014 +

Fixed button sizing when icon/image storage type == GTK_IMAGE_EMPTY

 panel-plugin/indicator-button-box.c |   16 
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/panel-plugin/indicator-button-box.c 
b/panel-plugin/indicator-button-box.c
index 041b083..2cb0c24 100644
--- a/panel-plugin/indicator-button-box.c
+++ b/panel-plugin/indicator-button-box.c
@@ -423,7 +423,9 @@ indicator_button_box_get_preferred_width (GtkWidget *widget,
 {
   gtk_widget_get_preferred_width (box-label, min_size, nat_size);
 
-  if (box-icon != NULL  box-orientation == GTK_ORIENTATION_HORIZONTAL)
+  if (box-icon != NULL 
+  gtk_image_get_storage_type (GTK_IMAGE (box-icon)) != 
GTK_IMAGE_EMPTY 
+  box-orientation == GTK_ORIENTATION_HORIZONTAL)
 {
   min_size = min_size + ICON_SIZE + SPACING;
   nat_size = nat_size + ICON_SIZE + SPACING;
@@ -476,7 +478,9 @@ indicator_button_box_get_preferred_height (GtkWidget 
*widget,
 {
   gtk_widget_get_preferred_height (box-label, min_size, nat_size);
 
-  if (box-icon != NULL  box-orientation == GTK_ORIENTATION_VERTICAL)
+  if (box-icon != NULL 
+  gtk_image_get_storage_type (GTK_IMAGE (box-icon)) != 
GTK_IMAGE_EMPTY 
+  box-orientation == GTK_ORIENTATION_VERTICAL)
 {
   min_size = min_size + ICON_SIZE + SPACING;
   nat_size = nat_size + ICON_SIZE + SPACING;
@@ -530,7 +534,10 @@ indicator_button_box_size_allocate (GtkWidget *widget,
 
   indicator_button_box_is_small (box); // refresh cache
 
-  if (box-icon != NULL  box-label != NULL  !box-is_small)
+  if (box-icon != NULL 
+  gtk_image_get_storage_type (GTK_IMAGE (box-icon)) != GTK_IMAGE_EMPTY 
+  box-label != NULL 
+  !box-is_small)
 {
   if (box-orientation == GTK_ORIENTATION_HORIZONTAL)
 {
@@ -547,7 +554,8 @@ indicator_button_box_size_allocate (GtkWidget *widget,
   gtk_widget_size_allocate (box-icon, icon_alloc);
   gtk_widget_size_allocate (box-label, label_alloc);
 }
-  else if (box-icon != NULL)
+  else if (box-icon != NULL 
+   gtk_image_get_storage_type (GTK_IMAGE (box-icon)) != 
GTK_IMAGE_EMPTY)
 {
   gtk_widget_size_allocate (box-icon, icon_alloc);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Do not ref/unref widgets and let libindicator manage them

2014-01-21 Thread Andrzej
Updating branch refs/heads/master
 to 11fbd8c67c272706dbde3ca9fa0722b4691ec817 (commit)
   from 6eec40b9771d3bc430e62ab9a0c0c92b643d56ae (commit)

commit 11fbd8c67c272706dbde3ca9fa0722b4691ec817
Author: Andrzej ndrwr...@gmail.com
Date:   Wed Jan 22 01:43:35 2014 +

Do not ref/unref widgets and let libindicator manage them

 panel-plugin/indicator-button-box.c |   17 ++---
 panel-plugin/indicator-button.c |   18 ++
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/panel-plugin/indicator-button-box.c 
b/panel-plugin/indicator-button-box.c
index 2cb0c24..d4cf065 100644
--- a/panel-plugin/indicator-button-box.c
+++ b/panel-plugin/indicator-button-box.c
@@ -148,11 +148,6 @@ indicator_button_box_finalize (GObject *object)
 
   indicator_button_box_disconnect_signals (box);
 
-  if (box-label != NULL)
-g_object_unref (G_OBJECT (box-label));
-  if (box-icon != NULL)
-g_object_unref (G_OBJECT (box-icon));
-
   G_OBJECT_CLASS (indicator_button_box_parent_class)-finalize (object);
 }
 
@@ -237,12 +232,8 @@ indicator_button_box_set_label (IndicatorButtonBox  *box,
   g_return_if_fail (GTK_IS_LABEL (label));
 
   if (box-label != NULL)
-{
-  gtk_container_remove (GTK_CONTAINER (box), box-label);
-  g_object_unref (G_OBJECT (box-label));
-}
+gtk_container_remove (GTK_CONTAINER (box), box-label);
   box-label = GTK_WIDGET (label);
-  g_object_ref (G_OBJECT (box-label));
   g_signal_connect(G_OBJECT(box-label), notify::label,
G_CALLBACK(indicator_button_box_label_changed), box);
   g_signal_connect(G_OBJECT(box-label), notify::visible,
@@ -284,13 +275,9 @@ indicator_button_box_set_image (IndicatorButtonBox  *box,
   /* g_debug (indicator-button-box set image, image=%x, (uint) image); */
 
   if (box-icon != NULL)
-{
-  gtk_container_remove (GTK_CONTAINER (box), box-icon);
-  g_object_unref (G_OBJECT (box-icon));
-}
+gtk_container_remove (GTK_CONTAINER (box), box-icon);
 
   box-icon = GTK_WIDGET (image);
-  g_object_ref (G_OBJECT (box-icon));
   g_signal_connect(G_OBJECT(box-icon), notify::pixbuf,
G_CALLBACK(indicator_button_box_icon_changed), box);
 
diff --git a/panel-plugin/indicator-button.c b/panel-plugin/indicator-button.c
index 6b5fd92..2963e84 100644
--- a/panel-plugin/indicator-button.c
+++ b/panel-plugin/indicator-button.c
@@ -137,14 +137,6 @@ xfce_indicator_button_finalize (GObject *object)
 
   xfce_indicator_button_disconnect_signals (button);
 
-  if (button-menu != NULL)
-g_object_unref (G_OBJECT (button-menu));
-  /* IndicatorObjectEntry is not GObject */
-  /* if (button-entry != NULL) */
-  /*   g_object_unref (G_OBJECT (button-entry)); */
-  if (button-io != NULL)
-g_object_unref (G_OBJECT (button-io));
-
   G_OBJECT_CLASS (xfce_indicator_button_parent_class)-finalize (object);
 }
 
@@ -184,10 +176,7 @@ xfce_indicator_button_set_menu (XfceIndicatorButton 
*button,
 
   if (button-menu != menu)
 {
-  if (button-menu != NULL)
-g_object_unref (G_OBJECT (button-menu));
   button-menu = menu;
-  g_object_ref (G_OBJECT (button-menu));
   g_signal_connect_swapped (G_OBJECT (button-menu), deactivate,
 G_CALLBACK 
(xfce_indicator_button_menu_deactivate), button);
   gtk_menu_attach_to_widget(menu, GTK_WIDGET (button), NULL);
@@ -302,11 +291,6 @@ xfce_indicator_button_new (IndicatorObject  *io,
   gtk_container_add (GTK_CONTAINER (button-align_box), button-box);
   gtk_widget_show (button-box);
 
-  if (button-io != NULL)
-g_object_ref (G_OBJECT (button-io));
-  /* IndicatorObjectEntry is not GObject */
-  /* g_object_ref (G_OBJECT (button-entry)); */
-
   return GTK_WIDGET (button);
 }
 
@@ -332,11 +316,13 @@ xfce_indicator_button_button_press (GtkWidget  
*widget,
 
   if(event-button == 1  button-menu != NULL) /* left click only */
 {
+  //gtk_menu_attach_to_widget(button-menu, GTK_WIDGET (button), NULL);
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),TRUE);
   gtk_menu_reposition (GTK_MENU (button-menu));
   gtk_menu_popup (button-menu, NULL, NULL,
   xfce_panel_plugin_position_menu, button-plugin,
   event-button, event-time);
+  //gtk_menu_detach(button-menu);
   return TRUE;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:master Improve the tasklist multimonitor handling.

2014-01-16 Thread Andrzej
Updating branch refs/heads/master
 to 0e6c0208130a868f512264375c8e67eddbd5f6c8 (commit)
   from de1a2ce457e851d225a40d7e2f14073012bcd988 (commit)

commit 0e6c0208130a868f512264375c8e67eddbd5f6c8
Author: Alistair Buxton a.j.bux...@gmail.com
Date:   Fri Jan 17 00:21:17 2014 +

Improve the tasklist multimonitor handling.

The tasklist widget has an option to only show windows from the
current monitor. This previously worked by calculating the centre
pixel of the window, and then testing that against the monitor.
However, it is possible to position a window such that the centre
pixel does not appear on any monitor.

Instead, find the monitor which has the largest intersection with
the window and display the window button there.

 plugins/tasklist/tasklist-widget.c |   57 
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/plugins/tasklist/tasklist-widget.c 
b/plugins/tasklist/tasklist-widget.c
index 9d35d85..923466c 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -71,13 +71,8 @@
 #define xfce_tasklist_horizontal(tasklist) ((tasklist)-mode == 
XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
 #define xfce_tasklist_vertical(tasklist) ((tasklist)-mode == 
XFCE_PANEL_PLUGIN_MODE_VERTICAL)
 #define xfce_tasklist_deskbar(tasklist) ((tasklist)-mode == 
XFCE_PANEL_PLUGIN_MODE_DESKBAR)
-#define xfce_tasklist_filter_monitors(tasklist) (!(tasklist)-all_monitors  
(tasklist)-monitor_geometry.width != -1)
-#define xfce_tasklist_geometry_set_invalid(tasklist) 
((tasklist)-monitor_geometry.width = -1)
-#define xfce_tasklist_geometry_has_point(tasklist, x, y) ( \
-  (x) = ((tasklist)-monitor_geometry.x) \
-   (x)  ((tasklist)-monitor_geometry.x + 
(tasklist)-monitor_geometry.width) \
-   (y) = ((tasklist)-monitor_geometry.y) \
-   (y)  ((tasklist)-monitor_geometry.y + 
(tasklist)-monitor_geometry.height))
+#define xfce_tasklist_filter_monitors(tasklist) (!(tasklist)-all_monitors  
(tasklist)-n_monitors  1)
+#define xfce_tasklist_geometry_set_invalid(tasklist) ((tasklist)-n_monitors = 
0)
 
 
 
@@ -167,7 +162,9 @@ struct _XfceTasklist
   /* whether we only show windows that are in the geometry of
* the monitor the tasklist is on */
   guint all_monitors : 1;
-  GdkRectangle  monitor_geometry;
+  guint n_monitors;
+  guint my_monitor;
+  GdkRectangle *all_monitors_geometry;
 
   /* whether we show wireframes when hovering a button in
* the tasklist */
@@ -560,6 +557,8 @@ xfce_tasklist_init (XfceTasklist *tasklist)
   tasklist-show_wireframes = FALSE;
   tasklist-show_handle = TRUE;
   tasklist-all_monitors = TRUE;
+  tasklist-n_monitors = 0;
+  tasklist-all_monitors_geometry = NULL;
   tasklist-window_scrolling = TRUE;
   tasklist-all_blinking = TRUE;
   tasklist-middle_click = XFCE_TASKLIST_MIDDLE_CLICK_DEFAULT;
@@ -1904,6 +1903,7 @@ xfce_tasklist_update_monitor_geometry_idle (gpointer data)
   GdkScreen*screen;
   gboolean  geometry_set = FALSE;
   GdkWindow*window;
+  guint tmp;
 
   panel_return_val_if_fail (XFCE_IS_TASKLIST (tasklist), FALSE);
 
@@ -1916,12 +1916,25 @@ xfce_tasklist_update_monitor_geometry_idle (gpointer 
data)
 
   if (G_LIKELY (screen != NULL
window != NULL
-   gdk_screen_get_n_monitors (screen)  1))
+   (tasklist-n_monitors = gdk_screen_get_n_monitors (screen))  1))
 {
   /* set the monitor geometry */
-  gdk_screen_get_monitor_geometry (screen,
-  gdk_screen_get_monitor_at_window (screen, window),
-  tasklist-monitor_geometry);
+  tasklist-my_monitor = gdk_screen_get_monitor_at_window (screen, 
window);
+
+  if (tasklist-all_monitors_geometry)
+  {
+  tasklist-all_monitors_geometry = g_renew (GdkRectangle, 
tasklist-all_monitors_geometry, tasklist-n_monitors);
+  }
+  else
+  {
+  tasklist-all_monitors_geometry = g_new (GdkRectangle, 
tasklist-n_monitors);
+  }
+
+  for(tmp=0;tmptasklist-n_monitors;tmp++)
+  {
+  gdk_screen_get_monitor_geometry (screen, tmp,
+  tasklist-all_monitors_geometry[tmp]);
+  }
 
   geometry_set = TRUE;
 }
@@ -2242,7 +2255,8 @@ xfce_tasklist_button_visible (XfceTasklistChild *child,
   WnckWorkspace *active_ws)
 {
   XfceTasklist *tasklist = XFCE_TASKLIST (child-tasklist);
-  gint  x, y, w, h;
+  GdkRectangle  window, intersection;
+  guint best_size=0, best_monitor=0, size, tmp;
 
   panel_return_val_if_fail (active_ws == NULL || WNCK_IS_WORKSPACE 
(active_ws), FALSE);
   panel_return_val_if_fail (XFCE_IS_TASKLIST (tasklist), FALSE);
@@ -2251,12 +2265,17 @@ xfce_tasklist_button_visible (XfceTasklistChild *child,
   if (xfce_tasklist_filter_monitors (tasklist))
 {
   /* 

[Xfce4-commits] xfce4-panel:master tasklist: Indentation and whitespace fixes

2014-01-16 Thread Andrzej
Updating branch refs/heads/master
 to 5d9fa0b48115e8b989cfc6015205c1aa70a1fd46 (commit)
   from 0e6c0208130a868f512264375c8e67eddbd5f6c8 (commit)

commit 5d9fa0b48115e8b989cfc6015205c1aa70a1fd46
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Jan 17 02:13:12 2014 +

tasklist: Indentation and whitespace fixes

 plugins/tasklist/tasklist-widget.c |   32 ++--
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/plugins/tasklist/tasklist-widget.c 
b/plugins/tasklist/tasklist-widget.c
index 923466c..1a1755b 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -164,7 +164,7 @@ struct _XfceTasklist
   guint all_monitors : 1;
   guint n_monitors;
   guint my_monitor;
-  GdkRectangle *all_monitors_geometry;
+  GdkRectangle *all_monitors_geometry;
 
   /* whether we show wireframes when hovering a button in
* the tasklist */
@@ -1922,19 +1922,12 @@ xfce_tasklist_update_monitor_geometry_idle (gpointer 
data)
   tasklist-my_monitor = gdk_screen_get_monitor_at_window (screen, 
window);
 
   if (tasklist-all_monitors_geometry)
-  {
-  tasklist-all_monitors_geometry = g_renew (GdkRectangle, 
tasklist-all_monitors_geometry, tasklist-n_monitors);
-  }
+tasklist-all_monitors_geometry = g_renew (GdkRectangle, 
tasklist-all_monitors_geometry, tasklist-n_monitors);
   else
-  {
-  tasklist-all_monitors_geometry = g_new (GdkRectangle, 
tasklist-n_monitors);
-  }
+tasklist-all_monitors_geometry = g_new (GdkRectangle, 
tasklist-n_monitors);
 
-  for(tmp=0;tmptasklist-n_monitors;tmp++)
-  {
-  gdk_screen_get_monitor_geometry (screen, tmp,
-  tasklist-all_monitors_geometry[tmp]);
-  }
+  for(tmp = 0; tmp  tasklist-n_monitors; tmp++)
+gdk_screen_get_monitor_geometry (screen, tmp, 
tasklist-all_monitors_geometry[tmp]);
 
   geometry_set = TRUE;
 }
@@ -2256,7 +2249,7 @@ xfce_tasklist_button_visible (XfceTasklistChild *child,
 {
   XfceTasklist *tasklist = XFCE_TASKLIST (child-tasklist);
   GdkRectangle  window, intersection;
-  guint best_size=0, best_monitor=0, size, tmp;
+  guint best_size = 0, best_monitor = 0, size, tmp;
 
   panel_return_val_if_fail (active_ws == NULL || WNCK_IS_WORKSPACE 
(active_ws), FALSE);
   panel_return_val_if_fail (XFCE_IS_TASKLIST (tasklist), FALSE);
@@ -2267,15 +2260,18 @@ xfce_tasklist_button_visible (XfceTasklistChild *child,
   /* center of the window must be on this screen */
   wnck_window_get_geometry (child-window, window.x, window.y, 
window.width, window.height);
 
-  for(tmp=0;tmptasklist-n_monitors;tmp++) {
+  for (tmp = 0; tmp  tasklist-n_monitors; tmp++)
+{
   gdk_rectangle_intersect(tasklist-all_monitors_geometry[tmp], 
window, intersection);
   size = intersection.width * intersection.height;
-  if(size  best_size) {
+  if (size  best_size)
+{
   best_size = size;
   best_monitor = tmp;
-  }
-  }
-  if (best_monitor != tasklist-my_monitor) return FALSE;
+}
+}
+  if (best_monitor != tasklist-my_monitor)
+return FALSE;
 }
 
   if (tasklist-all_workspaces
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:master Preserve the current item selection when rebuilding the item store.

2014-01-06 Thread Andrzej
Updating branch refs/heads/master
 to 71fe77c4c5c433721854c88c1fa1667f880b38f2 (commit)
   from d296ca76507bc5ffdbb8e77745568cf5063e069d (commit)

commit 71fe77c4c5c433721854c88c1fa1667f880b38f2
Author: Andrzej ndrwr...@gmail.com
Date:   Tue Jan 7 02:17:49 2014 +

Preserve the current item selection when rebuilding the item store.

 panel/panel-preferences-dialog.c |   27 ++-
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/panel/panel-preferences-dialog.c b/panel/panel-preferences-dialog.c
index 865d7f3..2721157 100644
--- a/panel/panel-preferences-dialog.c
+++ b/panel/panel-preferences-dialog.c
@@ -930,15 +930,22 @@ static void
 panel_preferences_dialog_item_store_rebuild (GtkWidget  *itembar,
  PanelPreferencesDialog *dialog)
 {
-  GList   *items, *li;
-  guinti;
-  PanelModule *module;
-  gchar   *tooltip, *display_name;
+  GList   *items, *li;
+  guinti;
+  PanelModule *module;
+  gchar   *tooltip, *display_name;
+  XfcePanelPluginProvider *selected_provider;
+  GtkTreeIter  iter;
+  GtkTreePath *path;
+  GObject *treeview;
 
   panel_return_if_fail (PANEL_IS_PREFERENCES_DIALOG (dialog));
   panel_return_if_fail (GTK_IS_LIST_STORE (dialog-store));
   panel_return_if_fail (PANEL_IS_ITEMBAR (itembar));
 
+  /* memorize selected item */
+  selected_provider = panel_preferences_dialog_item_get_selected (dialog, 
NULL);
+
   gtk_list_store_clear (dialog-store);
 
   g_signal_handlers_block_by_func (G_OBJECT (dialog-store),
@@ -977,7 +984,7 @@ panel_preferences_dialog_item_store_rebuild (GtkWidget  
*itembar,
  xfce_panel_plugin_provider_get_unique_id 
(li-data));
 }
 
-  gtk_list_store_insert_with_values (dialog-store, NULL, i,
+  gtk_list_store_insert_with_values (dialog-store, iter, i,
  ITEM_COLUMN_ICON_NAME,
  panel_module_get_icon_name (module),
  ITEM_COLUMN_DISPLAY_NAME,
@@ -986,6 +993,16 @@ panel_preferences_dialog_item_store_rebuild (GtkWidget 
 *itembar,
  tooltip,
  ITEM_COLUMN_PROVIDER, li-data, -1);
 
+  /* reconstruct selection */
+  if (selected_provider == li-data)
+{
+  path = gtk_tree_model_get_path (GTK_TREE_MODEL (dialog-store), 
iter);
+  treeview = gtk_builder_get_object (GTK_BUILDER (dialog), 
item-treeview);
+  if (GTK_IS_WIDGET (treeview))
+gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview), path, NULL, 
FALSE);
+  gtk_tree_path_free (path);
+}
+
   g_free (tooltip);
   g_free (display_name);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:master Bug #10582 scroll the items list automatically to keep the moved item visible at the new position

2014-01-06 Thread Andrzej
Updating branch refs/heads/master
 to 5551513dbb18c73809cc945c1d1649f041d29511 (commit)
   from 71fe77c4c5c433721854c88c1fa1667f880b38f2 (commit)

commit 5551513dbb18c73809cc945c1d1649f041d29511
Author: Andrzej ndrwr...@gmail.com
Date:   Tue Jan 7 02:26:50 2014 +

Bug #10582 scroll the items list automatically to keep the moved item
visible at the new position

(Raphael Groner projects.rg{at}smart.ms)

+ some cleanup.

 panel/panel-preferences-dialog.c |   15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/panel/panel-preferences-dialog.c b/panel/panel-preferences-dialog.c
index 2721157..e756dd5 100644
--- a/panel/panel-preferences-dialog.c
+++ b/panel/panel-preferences-dialog.c
@@ -1042,6 +1042,7 @@ panel_preferences_dialog_item_move (GtkWidget 
 *button,
   itembar = gtk_bin_get_child (GTK_BIN (dialog-active));
   position = panel_itembar_get_child_index (PANEL_ITEMBAR (itembar),
 GTK_WIDGET (provider));
+  path = gtk_tree_model_get_path (GTK_TREE_MODEL (dialog-store), iter_a);
 
   if (G_LIKELY (position != -1))
 {
@@ -1067,20 +1068,20 @@ panel_preferences_dialog_item_move (GtkWidget   
   *button,
   /* swap the items in the list */
   iter_b = iter_a;
   if (gtk_tree_model_iter_next (GTK_TREE_MODEL (dialog-store), 
iter_b))
-gtk_list_store_swap (dialog-store, iter_a, iter_b);
+{
+  gtk_list_store_swap (dialog-store, iter_a, iter_b);
+  gtk_tree_path_next (path);
+}
 }
   else
 {
   /* get the previous item in the list */
-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (dialog-store), 
iter_a);
   if (gtk_tree_path_prev (path))
 {
   /* swap the items in the list */
   gtk_tree_model_get_iter (GTK_TREE_MODEL (dialog-store), 
iter_b, path);
   gtk_list_store_swap (dialog-store, iter_a, iter_b);
 }
-
-  gtk_tree_path_free (path);
 }
 
   /* fake update the selection */
@@ -1088,7 +1089,13 @@ panel_preferences_dialog_item_move (GtkWidget
  *button,
   panel_return_if_fail (GTK_IS_WIDGET (treeview));
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
   panel_preferences_dialog_item_selection_changed (selection, dialog);
+
+  /* make the new selected position visible if moved out of area */
+  gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (treeview), path, NULL, 
FALSE, 0, 0);
+  gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview), path, NULL, 
FALSE);
+
 }
+  gtk_tree_path_free (path);
 }
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-mailwatch-plugin:master Added support for multi-row/column panels in xfce4-panel 4.9

2014-01-04 Thread Andrzej
Updating branch refs/heads/master
 to 07875cdfe5612a6d43e9d3eae79820d50b00024a (commit)
   from e32d86bd6ce6e4ce84af862015ce54cbd039e055 (commit)

commit 07875cdfe5612a6d43e9d3eae79820d50b00024a
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Dec 27 23:20:30 2013 +

Added support for multi-row/column panels in xfce4-panel  4.9

 panel-plugin/mailwatch-plugin.c |   14 ++
 1 file changed, 14 insertions(+)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 53c3b37..69e2063 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -75,6 +75,12 @@
 #define MOUSE_BUTTON_LEFT  1
 #define MOUSE_BUTTON_MIDDLE2
 
+#ifdef LIBXFCE4PANEL_CHECK_VERSION
+#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
+#define HAS_PANEL_49
+#endif
+#endif
+
 typedef struct
 {
 XfcePanelPlugin *plugin;
@@ -351,6 +357,10 @@ mailwatch_set_size(XfcePanelPlugin *plugin,
 GdkPixbuf *pb;
 GtkIconTheme *itheme;
 GtkIconInfo *info = NULL;
+
+#ifdef HAS_PANEL_49
+wsize /= xfce_panel_plugin_get_nrows (plugin);
+#endif
 
 /* this is such lame lame voodoo magic.  the x/ythickness stuff
  * shouldn't be needed, since i think the panel button convienence
@@ -1290,6 +1300,10 @@ mailwatch_construct(XfcePanelPlugin *plugin)
 g_signal_connect(plugin, size-changed,
  G_CALLBACK(mailwatch_set_size), mwp);
 
+#ifdef HAS_PANEL_49
+xfce_panel_plugin_set_small (plugin, TRUE);
+#endif
+
 mi = gtk_image_menu_item_new_with_label(_(Update Now));
 img = gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU);
 gtk_widget_show(img);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] thunar:master thunar-tpa: fix libxfce4panel version checking macros

2013-12-27 Thread Andrzej
Updating branch refs/heads/master
 to fc4a4b61e4f1777944fea298f8a7413a06b5093d (commit)
   from 92d1e47fd0230efc1e8dd9796c794e6756a275f5 (commit)

commit fc4a4b61e4f1777944fea298f8a7413a06b5093d
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Dec 27 23:10:59 2013 +

thunar-tpa: fix libxfce4panel version checking macros

 plugins/thunar-tpa/thunar-tpa.c |   20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/plugins/thunar-tpa/thunar-tpa.c b/plugins/thunar-tpa/thunar-tpa.c
index afb02c1..63c60d9 100644
--- a/plugins/thunar-tpa/thunar-tpa.c
+++ b/plugins/thunar-tpa/thunar-tpa.c
@@ -35,7 +35,11 @@
 
 #include thunar-tpa/thunar-tpa-bindings.h
 
-
+#ifdef LIBXFCE4PANEL_CHECK_VERSION
+#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
+#define HAS_PANEL_49
+#endif
+#endif
 
 typedef struct _ThunarTpaClass ThunarTpaClass;
 typedef struct _ThunarTpa  ThunarTpa;
@@ -56,7 +60,7 @@ voidthunar_tpa_register_type   
(XfcePanelTypeModule *type_module
 static void thunar_tpa_finalize(GObject *object);
 static void thunar_tpa_construct   (XfcePanelPlugin 
*panel_plugin);
 
-#if defined (LIBXFCE4PANEL_CHECK_VERSION)  LIBXFCE4PANEL_CHECK_VERSION 
(4,9,0)
+#ifdef HAS_PANEL_49
 static gboolean thunar_tpa_size_changed(XfcePanelPlugin 
*panel_plugin,
 gint size);
 #endif
@@ -154,11 +158,9 @@ thunar_tpa_class_init (ThunarTpaClass *klass)
   plugin_class = XFCE_PANEL_PLUGIN_CLASS (klass);
   plugin_class-construct = thunar_tpa_construct;
 
-#ifdef LIBXFCE4PANEL_CHECK_VERSION
-#if LIBXFCE4PANEL_CHECK_VERSION (4, 9, 0)
+#ifdef HAS_PANEL_49
   plugin_class-size_changed = thunar_tpa_size_changed;
 #endif
-#endif
 }
 
 
@@ -244,12 +246,10 @@ thunar_tpa_construct (XfcePanelPlugin *panel_plugin)
 {
   ThunarTpa *plugin = THUNAR_TPA (panel_plugin);
 
-#ifdef LIBXFCE4PANEL_CHECK_VERSION
-#if LIBXFCE4PANEL_CHECK_VERSION (4, 9, 0)
+#ifdef HAS_PANEL_49
   /* make the plugin fit a single row */
   xfce_panel_plugin_set_small (panel_plugin, TRUE);
 #endif
-#endif
 
   /* add the Empty Trash menu item */
   xfce_panel_plugin_menu_insert_item (panel_plugin, GTK_MENU_ITEM 
(plugin-mi));
@@ -260,8 +260,7 @@ thunar_tpa_construct (XfcePanelPlugin *panel_plugin)
 
 
 
-#ifdef LIBXFCE4PANEL_CHECK_VERSION
-#if LIBXFCE4PANEL_CHECK_VERSION (4, 9, 0)
+#ifdef HAS_PANEL_49
 static gboolean
 thunar_tpa_size_changed (XfcePanelPlugin *panel_plugin,
  gint size)
@@ -275,7 +274,6 @@ thunar_tpa_size_changed (XfcePanelPlugin *panel_plugin,
   return TRUE;
 }
 #endif
-#endif
 
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:master Fix transparency issues with GTK3 plugins

2013-12-23 Thread Andrzej
Updating branch refs/heads/master
 to cdc3737f971d48d57dae15875f416ba772d0a8bf (commit)
   from 964741f5b67e5f4fa97bab338d980c5eea0fa09b (commit)

commit cdc3737f971d48d57dae15875f416ba772d0a8bf
Author: Eric Koegel eric.koe...@gmail.com
Date:   Mon Dec 23 11:53:02 2013 +0300

Fix transparency issues with GTK3 plugins

This patch uses some GTK3 CSS magic written by Simon Steinbeiß to
make the GtkPlug button in the panel transparent. Small changes
were made to the wrapper_plug_draw code as well, i.e. no need to
check GTK_WIDGET_IS_DRAWABLE since gtk does this before calling
the draw signal. It also transforms the draw coordinates from
widget-relative back to window-relative.

 libxfce4panel/xfce-panel-plugin.c |5 +-
 wrapper/wrapper-plug.c|  115 +
 2 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/libxfce4panel/xfce-panel-plugin.c 
b/libxfce4panel/xfce-panel-plugin.c
index df417fe..9fb43d1 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -715,10 +715,7 @@ xfce_panel_plugin_init (XfcePanelPlugin *plugin)
 #endif
 
   /* hide the event box window to make the plugin transparent */
-  // FIXME
-  // Temporarily disabled to workaround plugin transparency issues.
-  // It breaks background transparency and color support.
-  //gtk_event_box_set_visible_window (GTK_EVENT_BOX (plugin), FALSE);
+  gtk_event_box_set_visible_window (GTK_EVENT_BOX (plugin), FALSE);
 }
 
 
diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c
index 6dc4432..6832a35 100644
--- a/wrapper/wrapper-plug.c
+++ b/wrapper/wrapper-plug.c
@@ -94,6 +94,8 @@ wrapper_plug_init (WrapperPlug *plug)
   GdkVisual   *visual = NULL;
   GdkScreen   *screen;
   GtkStyleContext *context;
+  GtkCssProvider  *provider = gtk_css_provider_new();
+  gchar   *css_string;
 #else
   GdkColormap *colormap = NULL;
   GdkScreen   *screen;
@@ -135,6 +137,17 @@ wrapper_plug_init (WrapperPlug *plug)
   context = gtk_widget_get_style_context (GTK_WIDGET (plug));
   gtk_style_context_add_class (context, panel);
   gtk_style_context_add_class (context, xfce4-panel);
+
+  /* We need to set the plugin button to transparent and let everything else
+   * be in the theme or panel's color */
+  css_string = g_strdup_printf (.xfce4-panel .button { background-color: 
transparent; });
+  gtk_css_provider_load_from_data (provider, css_string, -1, NULL);
+  gtk_style_context_add_provider (context,
+  GTK_STYLE_PROVIDER (provider),
+  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+  g_free (css_string);
+  g_object_unref (provider);
 #endif
 }
 
@@ -163,72 +176,78 @@ wrapper_plug_draw (GtkWidget *widget,
   GdkPixbuf   *pixbuf;
   GError  *error = NULL;
 
-  if (gtk_widget_is_drawable (widget))
+  cairo_save (cr);
+
+  /* The draw signal is in widget coordinates, transform back to window */
+  gtk_cairo_transform_to_window (cr,
+ GTK_WIDGET (plug),
+ gtk_widget_get_window 
(gtk_widget_get_toplevel (GTK_WIDGET (plug;
+
+  if (G_UNLIKELY (plug-background_image != NULL))
 {
-  if (G_UNLIKELY (plug-background_image != NULL))
+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+
+  if (G_LIKELY (plug-background_image_cache != NULL))
 {
-  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+  cairo_set_source (cr, plug-background_image_cache);
+  cairo_paint (cr);
+}
+  else
+{
+  /* load the image in a pixbuf */
+  pixbuf = gdk_pixbuf_new_from_file (plug-background_image, error);
 
-  if (G_LIKELY (plug-background_image_cache != NULL))
+  if (G_LIKELY (pixbuf != NULL))
 {
-  cairo_set_source (cr, plug-background_image_cache);
+  gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
+  g_object_unref (G_OBJECT (pixbuf));
+
+  plug-background_image_cache = cairo_get_source (cr);
+  cairo_pattern_reference (plug-background_image_cache);
+  cairo_pattern_set_extend (plug-background_image_cache, 
CAIRO_EXTEND_REPEAT);
   cairo_paint (cr);
 }
   else
 {
-  /* load the image in a pixbuf */
-  pixbuf = gdk_pixbuf_new_from_file (plug-background_image, 
error);
-
-  if (G_LIKELY (pixbuf != NULL))
-{
-  gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
-  g_object_unref (G_OBJECT (pixbuf));
-
-  plug-background_image_cache = cairo_get_source (cr);
-  cairo_pattern_reference (plug-background_image_cache);
-  cairo_pattern_set_extend (plug-background_image_cache, 
CAIRO_EXTEND_REPEAT);
-  cairo_paint (cr);
-}
-

[Xfce4-commits] xfce4-panel:master pager: fallback for case when pager is not yet set

2013-12-20 Thread Andrzej
Updating branch refs/heads/master
 to 08643272caef08634773b3074de7b2cadffb0926 (commit)
   from c42ab58051aaf30ade4496de05fc27e4540eb961 (commit)

commit 08643272caef08634773b3074de7b2cadffb0926
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Dec 20 09:35:58 2013 +

pager: fallback for case when pager is not yet set

Just in case. Not needed on my system.

 plugins/pager/pager.c |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index 7b716a2..149e19e 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -580,9 +580,14 @@ pager_plugin_size_request (GtkWidget  *widget,
   requisition-height = (gint) (requisition-width / n_cols / 
plugin-ratio * plugin-rows);
 }
 }
-  else
+  else if (plugin-pager)
 {
   gtk_widget_size_request (plugin-pager, requisition);
 }
+  else // initial fallback
+{
+  requisition-width = 1;
+  requisition-height = 1;
+}
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:master pager: recalculate size when panel size changes

2013-12-20 Thread Andrzej
Updating branch refs/heads/master
 to 964741f5b67e5f4fa97bab338d980c5eea0fa09b (commit)
   from 08643272caef08634773b3074de7b2cadffb0926 (commit)

commit 964741f5b67e5f4fa97bab338d980c5eea0fa09b
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Dec 20 10:02:07 2013 +

pager: recalculate size when panel size changes

 plugins/pager/pager.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index 149e19e..3ff65a2 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -401,6 +401,8 @@ static gboolean
 pager_plugin_size_changed (XfcePanelPlugin *panel_plugin,
gint size)
 {
+  gtk_widget_queue_resize (GTK_WIDGET (panel_plugin));
+
   /* do not set fixed size */
   return TRUE;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:master pager: fixed wnck pager aspect ratio in deskbar mode

2013-12-19 Thread Andrzej
Updating branch refs/heads/master
 to c42ab58051aaf30ade4496de05fc27e4540eb961 (commit)
   from 862db2d44aed25e8a397f5314f9daab374c4e9fa (commit)

commit c42ab58051aaf30ade4496de05fc27e4540eb961
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Dec 20 03:38:39 2013 +

pager: fixed wnck pager aspect ratio in deskbar mode

Previously we were relying on new api added in libwnck-2.31.
Unfortunately, stable version of libwnck was never released and the API
was not added to libwnck-3.

This commit changes the method of setting the aspect ratio.
Aspect ratio is now calculated in the plugin using screen dimensions.

One minor limitation of this method is that we are not accounting
for wnck pager frames, so the aspect ratio may be slightly inaccurate.

 plugins/pager/pager.c |   64 ++---
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index 6f0a378..7b716a2 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -53,6 +53,8 @@ static void pager_plugin_set_property 
(GObject   *ob
guint  
prop_id,
const GValue  
*value,
GParamSpec
*pspec);
+static void pager_plugin_size_request (GtkWidget 
*widget,
+   GtkRequisition
*requisition);
 static gboolean pager_plugin_scroll_event (GtkWidget 
*widget,
GdkEventScroll
*event);
 static void pager_plugin_screen_changed   (GtkWidget 
*widget,
@@ -86,6 +88,7 @@ struct _PagerPlugin
   guint  scrolling : 1;
   guint  miniature_view : 1;
   gint   rows;
+  gfloat ratio;
 };
 
 enum
@@ -117,6 +120,7 @@ pager_plugin_class_init (PagerPluginClass *klass)
 
   widget_class = GTK_WIDGET_CLASS (klass);
   widget_class-scroll_event = pager_plugin_scroll_event;
+  widget_class-size_request = pager_plugin_size_request;
 
   plugin_class = XFCE_PANEL_PLUGIN_CLASS (klass);
   plugin_class-construct = pager_plugin_construct;
@@ -156,6 +160,7 @@ pager_plugin_init (PagerPlugin *plugin)
   plugin-scrolling = TRUE;
   plugin-miniature_view = TRUE;
   plugin-rows = 1;
+  plugin-ratio = 1.0;
   plugin-pager = NULL;
 }
 
@@ -303,15 +308,8 @@ pager_plugin_screen_layout_changed (PagerPlugin *plugin)
   if (!wnck_pager_set_n_rows (WNCK_PAGER (plugin-pager), plugin-rows))
 g_message (Setting the pager rows returned false. Maybe the setting 
is not applied.);
 
-#ifdef WNCK_CHECK_VERSION
-#if WNCK_CHECK_VERSION (2,31,0)
-  wnck_pager_set_layout_policy (WNCK_PAGER (plugin-pager),
-(mode == 
XFCE_PANEL_PLUGIN_MODE_HORIZONTAL) ?
-WNCK_PAGER_LAYOUT_POLICY_WIDTH_FOR_HEIGHT :
-WNCK_PAGER_LAYOUT_POLICY_HEIGHT_FOR_WIDTH);
-#endif
-#endif
   wnck_pager_set_orientation (WNCK_PAGER (plugin-pager), orientation);
+  plugin-ratio = (gfloat) gdk_screen_width () / (gfloat) 
gdk_screen_height ();
 }
   else
 {
@@ -421,17 +419,7 @@ pager_plugin_mode_changed (XfcePanelPlugin 
*panel_plugin,
 GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
 
   if (plugin-miniature_view)
-{
-#ifdef WNCK_CHECK_VERSION
-#if WNCK_CHECK_VERSION (2,31,0)
-  wnck_pager_set_layout_policy (WNCK_PAGER (plugin-pager),
-(mode == 
XFCE_PANEL_PLUGIN_MODE_HORIZONTAL) ?
-WNCK_PAGER_LAYOUT_POLICY_WIDTH_FOR_HEIGHT :
-WNCK_PAGER_LAYOUT_POLICY_HEIGHT_FOR_WIDTH);
-#endif
-#endif
-  wnck_pager_set_orientation (WNCK_PAGER (plugin-pager), orientation);
-}
+wnck_pager_set_orientation (WNCK_PAGER (plugin-pager), orientation);
   else
 pager_buttons_set_orientation (XFCE_PAGER_BUTTONS (plugin-pager), 
orientation);
 }
@@ -560,3 +548,41 @@ pager_plugin_configure_plugin (XfcePanelPlugin 
*panel_plugin)
 
   gtk_widget_show (GTK_WIDGET (dialog));
 }
+
+
+
+static void
+pager_plugin_size_request (GtkWidget  *widget,
+   GtkRequisition *requisition)
+{
+  PagerPlugin *plugin = XFCE_PAGER_PLUGIN (widget);
+  XfcePanelPluginMode  mode;
+  gint n_workspaces, n_cols;
+
+  if (plugin-miniature_view)
+{
+  mode   = xfce_panel_plugin_get_mode (XFCE_PANEL_PLUGIN (plugin));
+  n_workspaces = wnck_screen_get_workspace_count (plugin-wnck_screen);
+  n_cols = MAX (1, (n_workspaces + plugin-rows - 1) / plugin-rows);
+  if (mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
+{
+  requisition-height

[Xfce4-commits] xfce4-panel:master Make sure version API is set.

2013-12-18 Thread Andrzej
Updating branch refs/heads/master
 to 862db2d44aed25e8a397f5314f9daab374c4e9fa (commit)
   from b2b8dc7005eeebf2fc4f6d85b66423d73da04648 (commit)

commit 862db2d44aed25e8a397f5314f9daab374c4e9fa
Author: Andrzej ndrwr...@gmail.com
Date:   Wed Dec 18 19:55:28 2013 +

Make sure version API is set.

Start-up crashes of external plugins resulted in API being not set properly,
Then, the panel was trying to use a non-existing wrapper binary.
This prevented normal crash reporting mechanism from working and resulted
in an empty plugin being inserted into the panel.

 panel/panel-module.c |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/panel/panel-module.c b/panel/panel-module.c
index dc947ba..0be7096 100644
--- a/panel/panel-module.c
+++ b/panel/panel-module.c
@@ -148,7 +148,7 @@ panel_module_init (PanelModule *module)
   module-library = NULL;
   module-construct_func = NULL;
   module-plugin_type = G_TYPE_NONE;
-  module-api = NULL;
+  module-api = g_strdup (LIBXFCE4PANEL_VERSION_API);
 }
 
 
@@ -220,6 +220,7 @@ panel_module_load (GTypeModule *type_module)
 
   /* from now on, run this plugin in a wrapper */
   module-mode = WRAPPER;
+  g_free (module-api);
   module-api = g_strdup (LIBXFCE4PANEL_VERSION_API);
 
   return FALSE;
@@ -368,7 +369,8 @@ panel_module_new_from_desktop_file (const gchar *filename,
   if (force_external || !xfce_rc_read_bool_entry (rc, 
X-XFCE-Internal, FALSE))
 {
   module-mode = WRAPPER;
-  module-api = g_strdup (xfce_rc_read_entry (rc, X-XFCE-API, 
1.0));
+  g_free (module-api);
+  module-api = g_strdup (xfce_rc_read_entry (rc, X-XFCE-API, 
LIBXFCE4PANEL_VERSION_API));
 }
   else
 module-mode = INTERNAL;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Ellipsize labels only in deskbar mode.

2013-12-18 Thread Andrzej
Updating branch refs/heads/master
 to f7ad97a8cb36fadd205a3d78f55d9bdaad9fb43e (commit)
   from d046d4b341f2194d52dbd8408740789ca7be0063 (commit)

commit f7ad97a8cb36fadd205a3d78f55d9bdaad9fb43e
Author: Andrzej ndrwr...@gmail.com
Date:   Wed Dec 18 21:53:33 2013 +

Ellipsize labels only in deskbar mode.

 panel-plugin/indicator-button-box.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/panel-plugin/indicator-button-box.c 
b/panel-plugin/indicator-button-box.c
index e99df98..c3d00fe 100644
--- a/panel-plugin/indicator-button-box.c
+++ b/panel-plugin/indicator-button-box.c
@@ -244,7 +244,6 @@ indicator_button_box_set_label (IndicatorButtonBox  *box,
   g_signal_connect(G_OBJECT(box-label), notify::label,
G_CALLBACK(indicator_button_box_label_changed), box);
 
-  gtk_label_set_ellipsize (GTK_LABEL (box-label), PANGO_ELLIPSIZE_END);
   box-is_small = FALSE;
 
   gtk_container_add (GTK_CONTAINER (box), box-label);
@@ -372,10 +371,12 @@ indicator_button_box_is_small (IndicatorButtonBox *box)
{
  box-orientation = GTK_ORIENTATION_HORIZONTAL;
  gtk_misc_set_alignment (GTK_MISC (box-label), 0.0, 0.5);
+ gtk_label_set_ellipsize (GTK_LABEL (box-label), PANGO_ELLIPSIZE_END);
}
   else
{
  gtk_misc_set_alignment (GTK_MISC (box-label), 0.5, 0.5);
+ gtk_label_set_ellipsize (GTK_LABEL (box-label), 
PANGO_ELLIPSIZE_NONE);
}
   gtk_label_set_angle (GTK_LABEL (box-label),
   (indicator_config_get_orientation (box-config) == 
GTK_ORIENTATION_VERTICAL) ?
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Check if labels are visible.

2013-12-18 Thread Andrzej
Updating branch refs/heads/master
 to 0ee1b170be11c1706e40dd3a4760f8f8eb6c0925 (commit)
   from f7ad97a8cb36fadd205a3d78f55d9bdaad9fb43e (commit)

commit 0ee1b170be11c1706e40dd3a4760f8f8eb6c0925
Author: Andrzej ndrwr...@gmail.com
Date:   Wed Dec 18 22:39:21 2013 +

Check if labels are visible.

 panel-plugin/indicator-button-box.c |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/panel-plugin/indicator-button-box.c 
b/panel-plugin/indicator-button-box.c
index c3d00fe..f3abb6a 100644
--- a/panel-plugin/indicator-button-box.c
+++ b/panel-plugin/indicator-button-box.c
@@ -222,6 +222,8 @@ indicator_button_box_label_changed (GtkLabel
*label,
   g_return_if_fail (XFCE_IS_INDICATOR_BUTTON_BOX (box));
   g_return_if_fail (GTK_IS_LABEL (label));
 
+  box-cached = FALSE;
+
   gtk_widget_queue_resize (GTK_WIDGET (box));
 }
 
@@ -243,9 +245,13 @@ indicator_button_box_set_label (IndicatorButtonBox  *box,
   g_object_ref (G_OBJECT (box-label));
   g_signal_connect(G_OBJECT(box-label), notify::label,
G_CALLBACK(indicator_button_box_label_changed), box);
+  g_signal_connect(G_OBJECT(box-label), notify::visible,
+   G_CALLBACK(indicator_button_box_label_changed), box);
 
   box-is_small = FALSE;
 
+  box-cached = FALSE;
+
   gtk_container_add (GTK_CONTAINER (box), box-label);
   gtk_widget_show (box-label);
 }
@@ -362,6 +368,7 @@ indicator_button_box_is_small (IndicatorButtonBox *box)
   box-orientation = indicator_config_get_panel_orientation (box-config);
 
   if (box-label != NULL 
+  gtk_widget_get_visible (box-label) 
   g_strcmp0 (gtk_label_get_label (GTK_LABEL (box-label)), ) != 0)
 {
   box-is_small = FALSE;
@@ -529,7 +536,7 @@ indicator_button_box_size_allocate (GtkWidget *widget,
 
   indicator_button_box_is_small (box); // refresh cache
 
-  if (box-icon != NULL  box-label != NULL)
+  if (box-icon != NULL  box-label != NULL  !box-is_small)
 {
   if (box-orientation == GTK_ORIENTATION_HORIZONTAL)
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] thunar:master Fallback to image surface, workaround for bug in Cairo/RENDER

2013-12-18 Thread Andrzej
Updating branch refs/heads/master
 to 78a3cba27cecbc13d078c127aa2acabae6048904 (commit)
   from cc115338beaa532f6dbee43e444ab25b046831bb (commit)

commit 78a3cba27cecbc13d078c127aa2acabae6048904
Author: Andrzej ndrwr...@gmail.com
Date:   Thu Dec 19 02:08:26 2013 +

Fallback to image surface, workaround for bug in Cairo/RENDER

Only in _color_selected. _color_lighten works fine with CAIRO_OPERATOR_ADD.

Introduced a temporary/dummy preprocessor macro - to be replaced with
an actual version check, once fixed Cairo is available.

Implementation likely slower than direct XRender path but no performance
problems detected during testing.

 thunar/thunar-icon-renderer.c |   34 ++
 1 file changed, 34 insertions(+)

diff --git a/thunar/thunar-icon-renderer.c b/thunar/thunar-icon-renderer.c
index 33ebbe0..2b91800 100644
--- a/thunar/thunar-icon-renderer.c
+++ b/thunar/thunar-icon-renderer.c
@@ -315,18 +315,52 @@ thunar_icon_renderer_color_selected (cairo_t   *cr,
   cairo_pattern_t *source;
   GtkStateType state;
 
+#ifdef CAIRO_BUG_72551_FIXED
   cairo_save (cr);
 
   source = cairo_pattern_reference (cairo_get_source (cr));
   state = gtk_widget_has_focus (widget) ? GTK_STATE_SELECTED : 
GTK_STATE_ACTIVE;
   gdk_cairo_set_source_color (cr, widget-style-base[state]);
   cairo_set_operator (cr, CAIRO_OPERATOR_MULTIPLY);
+  cairo_mask (cr, source);
+#else /* fallback for RENDER error */
 
   /* CAIRO_OPERATOR_MULTIPLY */
   /* causes libx11 error: error_code 2 request_code 155 minor_code 8 */
   /* with x11 1.0.3, xrender 0.9.1, cairo 1.12.2 */
   /* cairo_mask (cr, source); */
 
+  cairo_surface_t *target, *image_surface;
+  cairo_t *image_cr;
+  double   x1, y1, x2, y2;
+
+  cairo_save (cr);
+
+  /* copy xlib surface to an image surface */
+  cairo_clip_extents(cr, x1, y1, x2, y2);
+  target = cairo_get_target (cr);
+  image_surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, x2, y2);
+  image_cr = cairo_create (image_surface);
+  cairo_set_source_surface(image_cr, target, 0, 0);
+  cairo_set_operator(image_cr, CAIRO_OPERATOR_SOURCE);
+  cairo_paint(image_cr);
+
+  /* render on the image surface */
+  source = cairo_pattern_reference (cairo_get_source (cr));
+  state = gtk_widget_has_focus (widget) ? GTK_STATE_SELECTED : 
GTK_STATE_ACTIVE;
+  gdk_cairo_set_source_color (image_cr, widget-style-base[state]);
+  cairo_set_operator (image_cr, CAIRO_OPERATOR_MULTIPLY);
+  cairo_mask (image_cr, source);
+
+  /* copy the image surface back to xlib one and clean up */
+  cairo_set_source_surface (cr, image_surface, 0, 0);
+  cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+  cairo_paint(cr);
+
+  cairo_destroy (image_cr);
+  cairo_surface_destroy (image_surface);
+#endif
+
   cairo_pattern_destroy (source);
   cairo_restore (cr);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Check for empty labels to optimize layout

2013-12-10 Thread Andrzej
Updating branch refs/heads/master
 to d046d4b341f2194d52dbd8408740789ca7be0063 (commit)
   from bb667977d8fa17a8620e437d3a755832d0b91390 (commit)

commit d046d4b341f2194d52dbd8408740789ca7be0063
Author: Andrzej ndrwr...@gmail.com
Date:   Wed Dec 11 01:18:16 2013 +

Check for empty labels to optimize layout

 panel-plugin/indicator-button-box.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/panel-plugin/indicator-button-box.c 
b/panel-plugin/indicator-button-box.c
index 1174260..e99df98 100644
--- a/panel-plugin/indicator-button-box.c
+++ b/panel-plugin/indicator-button-box.c
@@ -362,7 +362,8 @@ indicator_button_box_is_small (IndicatorButtonBox *box)
 
   box-orientation = indicator_config_get_panel_orientation (box-config);
 
-  if (box-label != NULL)
+  if (box-label != NULL 
+  g_strcmp0 (gtk_label_get_label (GTK_LABEL (box-label)), ) != 0)
 {
   box-is_small = FALSE;
   if (box-orientation == GTK_ORIENTATION_VERTICAL 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] thunar:master Fixed missing inode-directory/folder icons on old systems.

2013-12-06 Thread Andrzej
Updating branch refs/heads/master
 to 38e528cfe03d39ce6de3e82c3a338853352e21f4 (commit)
   from 6843caf9afdef2ffa8eeb170938f565699280ec5 (commit)

commit 38e528cfe03d39ce6de3e82c3a338853352e21f4
Author: Andrzej ndrwr...@gmail.com
Date:   Sat Dec 7 03:32:27 2013 +

Fixed missing inode-directory/folder icons on old systems.

This error was seen on RHEL5 with custom-built Gtk stack.
The system was distributed with a folder icon but was missing
an inode-directory icon expected by new glib/gtk.

 thunar/thunar-file.c |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index dc31654..c45cf81 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -3656,9 +3656,12 @@ thunar_file_get_icon_name (ThunarFile  *file,
 g_object_unref (icon);
 }
 
-  /* store new name, or empty string to avoid recursion */
+  /* store new name, fallback to legacy names, or empty string to avoid 
recursion */
   if (G_LIKELY (icon_name != NULL))
 file-icon_name = icon_name;
+  else if (file-kind == G_FILE_TYPE_DIRECTORY
+gtk_icon_theme_has_icon (icon_theme, folder))
+icon_name = g_strdup (folder);
   else
 file-icon_name = g_strdup ();
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Back to development

2013-12-01 Thread Andrzej
Updating branch refs/heads/master
 to ec0a224b66eced595e9385d5c0b50daad10a74b1 (commit)
   from 7a07e8159e921b9bf49eaff23431cca8ebd69ab4 (commit)

commit ec0a224b66eced595e9385d5c0b50daad10a74b1
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Dec 1 22:32:16 2013 +

Back to development

 configure.ac.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index a4f10de..3bb97df 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,7 +11,7 @@ m4_define([indicator_version_minor], [2])
 m4_define([indicator_version_micro], [0])
 m4_define([indicator_version_nano],  []) dnl leave this empty to have no nano 
version
 m4_define([indicator_version_build], [@REVISION@])
-m4_define([indicator_version_tag],   [])
+m4_define([indicator_version_tag],   [git])
 m4_define([indicator_version], 
[indicator_version_major().indicator_version_minor().indicator_version_micro()ifelse(indicator_version_nano(),
 [], [], [.indicator_version_nano()])ifelse(indicator_version_tag(), [git], 
[indicator_version_tag()-indicator_version_build()], 
[indicator_version_tag()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin|xfce4-indicator-plugin-2.2.0 Creating annotated tag xfce4-indicator-plugin-2.2.0

2013-12-01 Thread Andrzej
Updating annotated tag refs/tags/xfce4-indicator-plugin-2.2.0
 as new annotated tag
 to 2b09cc21f726620f0df5c539f50d0420ed58f320 (tag)
   succeeds xfce4-indicator-plugin-2.1.0-54-g4971cc4
  tagged by Andrzej ndrwr...@gmail.com
 on 2013-12-01 23:31 +0100

Andrzej (1):
  Preparing for a release

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Preparing for a release

2013-12-01 Thread Andrzej
Updating branch refs/heads/master
 to 7a07e8159e921b9bf49eaff23431cca8ebd69ab4 (commit)
   from 4971cc43b95f2539db8502ab53a6e469ab39b19c (commit)

commit 7a07e8159e921b9bf49eaff23431cca8ebd69ab4
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Dec 1 22:30:45 2013 +

Preparing for a release

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

diff --git a/ChangeLog b/ChangeLog
index 8e40a75..4de567b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,57 @@
-# created with git log --pretty=format:%ad %h %s %aN %aE --no-merges 
--date=short
+2013-12-01 4971cc4 Changed required version of libxfce4panel Andrzej 
ndrwr...@gmail.com
+2013-11-18 b992563 I18n: Update translation da (100%). cedeel 
ch...@cedeel.com
+2013-11-16 bc7f4df I18n: Update translation zh_TW (78%). sofyalai 
sofya...@gmail.com
+2013-11-16 57b525b I18n: Update translation zh_TW (62%). sofyalai 
sofya...@gmail.com
+2013-11-07 35c2697 Ignore empty icons set by indicators. Alistair Buxton 
a.j.bux...@gmail.com
+2013-11-07 b7a42ad Remove the old icon, not the label, when icon is updated. 
Alistair Buxton a.j.bux...@gmail.com
+2013-10-27 c551c14 Check if indicator-ng.h exists Andrzej ndrwr...@gmail.com
+2013-10-27 4689cb3 Updated dependencies Andrzej ndrwr...@gmail.com
+2013-10-26 4f22aed I18n: Update translation cs (100%). Michal Várady 
miko.v...@gmail.com
+2013-10-20 235254b I18n: Update translation zh_CN (100%). Chipong 
chipong@yahoo.com
+2013-10-19 03506c3 I18n: Update translation pl (100%). OSWorld 
michal.ol...@osworld.pl
+2013-10-14 5d670b4 I18n: Update translation ru (100%). shlyapugin 
shlyapu...@gmail.com
+2013-09-30 d9b56a2 I18n: Update translation ar (100%). mohammad alhargan 
malh...@hotmail.com
+2013-09-29 c38f9d6 I18n: Update translation pt (100%). nunom 
nunom...@gmail.com
+2013-09-24 53df5ad Require libxfce4ui-4.11 Andrzej ndrwr...@gmail.com
+2013-09-23 32df0d4 I18n: Update translation hr (72%). Ivica  Kolić 
ik...@yahoo.com
+2013-09-21 833616f I18n: Update translation ko (100%). Darkcircle 
darkcircle.0...@gmail.com
+2013-09-19 243049c Indicator-button: Pass secondary-activate event Andrzej 
ndrwr...@gmail.com
+2013-09-17 82fa77e XfceIndicatorButton: add gdk_scroll_mask Andrzej 
ndrwr...@gmail.com
+2013-09-15 25f6fef I18n: Update translation hu (100%). Nucleo 
nuc...@indamail.hu
+2013-09-13 711f458 I18n: Update translation cs (86%). fri pavelf...@seznam.cz
+2013-09-12 d3a46b1 I18n: Update translation zh_CN (91%). 玉堂白鹤 yjw...@qq.com
+2013-09-12 a8afd3f I18n: Update translation tr (86%). farukuzun 
faruku...@mail.com
+2013-09-11 c977fa1 I18n: Update translation tr (83%). Necdet Yücel 
necdetyu...@gmail.com
+2013-09-11 2ac34bc I18n: Update translation pl (91%). Piotr Sokół 
pso...@jabster.pl
+2013-09-08 0616d0e I18n: Update translation es (100%). Pablo Lezaeta 
prfl...@gmail.com
+2013-09-07 7fd1efa I18n: Update translation uk (100%). Yarema aka Knedlyk 
yupad...@gmail.com
+2013-09-07 ed2200d I18n: Update translation nl (100%). Pjotr123 
pjotrverta...@gmail.com
+2013-09-07 a7ae932 I18n: Update translation fr (100%). jc1 
jc1.quebe...@gmail.com
+2013-09-07 68abde0 I18n: Update translation pt_BR (100%). Rafael Ferreira 
rafael.f...@gmail.com
+2013-09-06 c665938 Fixed typo. Andrzej ndrwr...@gmail.com
+2013-09-06 f6b84ee I18n: Update translation tr (72%). Necdet Yücel 
necdetyu...@gmail.com
+2013-09-06 0da1de0 I18n: Update translation it (100%). cri 
cri.pe...@gmail.com
+2013-09-06 45273e5 I18n: Update translation sr (100%). salepetronije 
salepetron...@gmail.com
+2013-09-06 0f78dd9 I18n: Update translation en_AU (100%). k3lt01 
keltoi...@gmail.com
+2013-09-06 5356231 I18n: Update translation bg (100%). cybercop 
cybercop_mont...@abv.bg
+2013-09-06 becd486 Update translations Andrzej ndrwr...@gmail.com
+2013-09-06 47267bb More layout fixes. Andrzej ndrwr...@gmail.com
+2013-09-06 cdfc5e4 Allow rectangular or slightly oversized icons Andrzej 
ndrwr...@gmail.com
+2013-09-06 990593b indicator layout fixes Andrzej ndrwr...@gmail.com
+2013-09-06 7187abb Use single-row property Andrzej ndrwr...@gmail.com
+2013-09-06 2df49bb Fix type of a single-row property Andrzej 
ndrwr...@gmail.com
+2013-09-06 c619253 I18n: Update translation ca (100%). sandandmercury 
sandandmerc...@gmail.com
+2013-09-05 a53baf1 Removed row-size property and added a single-row one 
Andrzej ndrwr...@gmail.com
+2013-09-05 e0b1ed0 I18n: Update translation ca (91%). sandandmercury 
sandandmerc...@gmail.com
+2013-09-05 c556271 I18n: Update translation ko (100%). Darkcircle 
darkcircle.0...@gmail.com
+2013-09-04 49d3090 I18n: Update translation en_AU (100%). k3lt01 
keltoi...@gmail.com
+2013-09-03 1930a20 I18n: Update translation sr (100%). salepetronije 
salepetron...@gmail.com
+2013-09-03 d9f073d I18n: Update translation es (100%). Pablo Lezaeta 
prfl...@gmail.com
+2013-09-02 123f657 I18n: Update translation pt (100%). nunom 
nunom...@gmail.com

[Xfce4-commits] xfce4-indicator-plugin:master Changed required version of libxfce4panel

2013-12-01 Thread Andrzej
Updating branch refs/heads/master
 to 4971cc43b95f2539db8502ab53a6e469ab39b19c (commit)
   from b9925630909800e3910020b08a067e4bdea0db72 (commit)

commit 4971cc43b95f2539db8502ab53a6e469ab39b19c
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Dec 1 22:21:00 2013 +

Changed required version of libxfce4panel

xfce4-panel from master branch now contains necessary functionality.

 configure.ac.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index 1be4cc1..d0de186 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -81,7 +81,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.6.0])
 dnl XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.11.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], 
[libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.10.0git-6da51ed])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], 
[libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.10.0git])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
 INDICATOR_PKGNAME=indicator3-0.4
 XDT_CHECK_PACKAGE([INDICATOR], [${INDICATOR_PKGNAME}], [12.10.1])
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-places-plugin:master Preparing for release

2013-11-23 Thread Andrzej
Updating branch refs/heads/master
 to 5c2515a8996a37624cfa06d9d8e23408b149b47f (commit)
   from 3d8b1a440c4e5542dfaa0ea86192ad73d01cccdd (commit)

commit 5c2515a8996a37624cfa06d9d8e23408b149b47f
Author: Andrzej ndrwr...@gmail.com
Date:   Sat Nov 23 22:15:24 2013 +

Preparing for release

 AUTHORS |1 +
 NEWS|7 +++
 configure.in.in |2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 467407c..db0a536 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
 Diego Ongaro (ongar...@gmail.com)
 Andrzej (ndrwr...@gmail.com)
+Alistair Buxton (a.j.bux...@gmail.com)
 Christoph Wickert (cwick...@fedoraproject.org)
diff --git a/NEWS b/NEWS
index 663c5aa..f3727d8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+2013-11-23
+
+xfce4-places-plugin v1.6.0 released
+
+ * Added support for network devices in ~/.gtk-bookmarks
+ * Updated translations
+
 2012-09-28
 

 xfce4-places-plugin v1.5.0 released
diff --git a/configure.in.in b/configure.in.in
index ad0a947..f256a2c 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,7 +1,7 @@
 dnl xfce4-places-plugin
 
 dnl version info
-m4_define([places_version], [1.5.0])
+m4_define([places_version], [1.6.0])
 
 dnl initialize autoconf
 AC_COPYRIGHT([Copyright (c) 2007-2009 Diego Ongaro ongar...@gmail.com])
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-places-plugin|1.6.0 Creating annotated tag 1.6.0

2013-11-23 Thread Andrzej
Updating annotated tag refs/tags/1.6.0
 as new annotated tag
 to be441544eebb573db961141adf8365de76f3ce41 (tag)
   succeeds 1.5.0-58-g3d8b1a4
  tagged by Andrzej ndrwr...@gmail.com
 on 2013-11-23 23:19 +0100

Andrzej (1):
  Preparing for release

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-places-plugin:master Add support for network devices in ~/.gtk-bookmarks

2013-11-10 Thread Andrzej
Updating branch refs/heads/master
 to ce1bcac0d1d019a5a3447afb66ab50ccc39057cb (commit)
   from 41dd544d4bda99c3dda8cb0b2c4ae1f14e8cb53b (commit)

commit ce1bcac0d1d019a5a3447afb66ab50ccc39057cb
Author: Alistair Buxton a.j.bux...@gmail.com
Date:   Sun Nov 10 07:56:37 2013 +

Add support for network devices in ~/.gtk-bookmarks

Most of this code comes from Thunar.

 panel-plugin/model.h  |3 +-
 panel-plugin/model_user.c |  157 +++--
 2 files changed, 126 insertions(+), 34 deletions(-)

diff --git a/panel-plugin/model.h b/panel-plugin/model.h
index cbbee3d..06d9d6f 100644
--- a/panel-plugin/model.h
+++ b/panel-plugin/model.h
@@ -51,7 +51,8 @@ typedef enum
 {
 PLACES_URI_SCHEME_NONE=0,
 PLACES_URI_SCHEME_FILE, 
-PLACES_URI_SCHEME_TRASH
+PLACES_URI_SCHEME_TRASH,
+PLACES_URI_SCHEME_REMOTE
 } places_uri_scheme;
 
 typedef struct _PlacesBookmark PlacesBookmark;
diff --git a/panel-plugin/model_user.c b/panel-plugin/model_user.c
index f3fc290..6d25fa1 100644
--- a/panel-plugin/model_user.c
+++ b/panel-plugin/model_user.c
@@ -114,14 +114,19 @@ pbuser_destroy_bookmarks(PlacesBookmarkGroup 
*bookmark_group)
 static void
 pbuser_build_bookmarks(PlacesBookmarkGroup *bookmark_group)
 {
-/* As of 2007-04-06, this is pretty much taken from/analogous to Thunar */
+/* As of 2013-11-09, this is pretty much taken from/analogous to Thunar */
 
 GList  *bookmarks = NULL;
 PlacesBookmark *bookmark;
+places_uri_scheme p_uri;
 gchar  *name;
-gchar  *path;
+gchar  *space;
+gchar  *uri;
 gchar   line[2048];
 FILE   *fp;
+GFile  *file;
+GFileInfo *fileinfo;
+GIcon  *icon;
  
 pbuser_destroy_bookmarks(bookmark_group);
 
@@ -135,44 +140,127 @@ pbuser_build_bookmarks(PlacesBookmarkGroup 
*bookmark_group)
 
 while( fgets(line, sizeof(line), fp) != NULL )
 {
-/* strip leading/trailing whitespace */
-g_strstrip(line);
-
-/* skip over the URI */
-for (name = line; *name != '\0'  !g_ascii_isspace (*name); ++name)
-/* pass */;
-
-/* zero-terminate the URI */
-*name++ = '\0';
-
-/* check if we have a name */
-for (; g_ascii_isspace (*name); ++name)
-/* pass */;
-
-/* parse the URI */ /* TODO: trash:// URI's */
-path = g_filename_from_uri(line, NULL, NULL);
-if (G_UNLIKELY(path == NULL || *path == '\0'))
+/* remove trailing spaces */
+g_strchomp (line);
+
+/* skip over empty lines */
+if (*line == '\0' || *line == ' ')
 continue;
 
-/* if we don't have a name, find it in the path */
-if(*name == '\0'){
-name = g_filename_display_basename(path);
-if(*name == '\0'){
-g_free(path);
-continue;
+/* check if there is a custom name in the line */
+name = NULL;
+space = strchr (line, ' ');
+if (space != NULL){
+/* break line */
+*space++ = '\0';
+
+/* get the custom name */
+if (G_LIKELY (*space != '\0'))
+name = g_strdup(space);
+}
+
+file = g_file_new_for_uri (line);
+
+if(g_file_is_native(file)){
+
+uri = g_filename_from_uri(line, NULL, NULL);
+
+fileinfo = g_file_query_info(file,
+  G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+  G_FILE_ATTRIBUTE_STANDARD_ICON,
+  0, NULL, NULL);
+
+icon = g_file_info_get_icon(fileinfo);
+if(icon == NULL)
+icon = g_themed_icon_new (folder);
+g_object_ref(icon);
+p_uri = PLACES_URI_SCHEME_FILE;
+
+if(name == NULL) {
+name = g_strdup(g_file_info_get_attribute_string(fileinfo,
+  G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME));
+if(name == NULL)
+name = g_strdup(g_filename_display_basename(uri));
 }
+
+g_object_unref (G_OBJECT (fileinfo));
+
 }else{
-name = g_strdup(name);
+
+uri = g_strdup(line);
+icon = g_themed_icon_new (folder-remote);
+g_object_ref(icon);
+p_uri = PLACES_URI_SCHEME_REMOTE;
+
+if(name == NULL) {
+/* I tried to make this into a separate function
+   but it crashes evrytim... */
+gchar   *scheme;
+gchar   *parse_name;
+const gchar *p;
+const gchar *path;
+gchar   *hostname;
+gchar   *display_name = NULL;
+const gchar *skip;
+const gchar *firstdot;
+const gchar  skip_chars[] = :@;
+guintn;

[Xfce4-commits] xfce4-indicator-plugin:master Updated dependencies

2013-10-26 Thread Andrzej
Updating branch refs/heads/master
 to 4689cb32aaa835d9b80ebf573a91f0da2f19cc84 (commit)
   from 4f22aede0744bde6a44d69a09bf09da8933eb83a (commit)

commit 4689cb32aaa835d9b80ebf573a91f0da2f19cc84
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Oct 27 01:09:45 2013 +0100

Updated dependencies

 configure.ac.in |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 45ee296..e9ddc74 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -81,9 +81,10 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.6.0])
 dnl XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.11.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], 
[libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.10.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], 
[libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.10.0git-6da51ed])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
-XDT_CHECK_PACKAGE([INDICATOR], [indicator3], [0.4.0], 
[indicator_pkgname=indicator], [XDT_CHECK_PACKAGE([INDICATOR], 
[indicator3-0.4], [0.3.90], [indicator_pkgname=indicator3-0.4], [])])
+INDICATOR_PKGNAME=indicator3-0.4
+XDT_CHECK_PACKAGE([INDICATOR], [${INDICATOR_PKGNAME}], [12.10.1])
 
 dnl 
 dnl *** Optional IDO library ***
@@ -98,8 +99,8 @@ XDT_FEATURE_DEBUG()
 dnl ***
 dnl *** Indicator info ***
 dnl ***
-INDICATORDIR=`$PKG_CONFIG --variable=indicatordir $indicator_pkgname`
-INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir $indicator_pkgname`
+INDICATORDIR=`$PKG_CONFIG --variable=indicatordir ${INDICATOR_PKGNAME}`
+INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir ${INDICATOR_PKGNAME}`
 
 AC_SUBST([INDICATORDIR])
 AC_SUBST([INDICATORICONSDIR])
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Check if indicator-ng.h exists

2013-10-26 Thread Andrzej
Updating branch refs/heads/master
 to c551c14a5c415d7bcb67975a3ca013a9318a71e7 (commit)
   from 4689cb32aaa835d9b80ebf573a91f0da2f19cc84 (commit)

commit c551c14a5c415d7bcb67975a3ca013a9318a71e7
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Oct 27 01:25:31 2013 +

Check if indicator-ng.h exists

It is a workaround for incorrect/lack of versioning in libindicator.
To be removed when libindicator with indicator-ng API is released.

 configure.ac.in  |   16 +---
 panel-plugin/indicator.c |   12 +---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index e9ddc74..1be4cc1 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -86,6 +86,15 @@ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
 INDICATOR_PKGNAME=indicator3-0.4
 XDT_CHECK_PACKAGE([INDICATOR], [${INDICATOR_PKGNAME}], [12.10.1])
 
+dnl 
+dnl *** Check if libindicator has indicator-ng.h headery ***
+dnl *** At the moment this cannot be derived from the version number ***
+dnl 
+AC_LANG_PUSH([C])
+CPPFLAGS=`$PKG_CONFIG --cflags ${INDICATOR_PKGNAME}`
+AC_CHECK_HEADERS([libindicator/indicator-ng.h], [HAVE_INDICATOR_NG_H=yes], 
[HAVE_INDICATOR_NG_H=no])
+AC_LANG_POP
+
 dnl 
 dnl *** Optional IDO library ***
 dnl 
@@ -134,10 +143,11 @@ dnl ***
 echo
 echo Build Configuration:
 echo
-echo * Debug Support:$enable_debug
+echo * Debug Support:$enable_debug
+echo * Use IndicatorNg API:  $HAVE_INDICATOR_NG_H
 if test x$IDO_FOUND = xyes; then
-echo * Use IDO library:  yes
+echo * Use IDO library:  yes
 else
-echo * Use IDO library:  no
+echo * Use IDO library:  no
 fi
 echo
diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
index e812b48..f4b60cb 100644
--- a/panel-plugin/indicator.c
+++ b/panel-plugin/indicator.c
@@ -38,7 +38,9 @@
 #include libxfce4util/libxfce4util.h
 #include libxfce4panel/xfce-panel-plugin.h
 #include libindicator/indicator-object.h
+#ifdef HAVE_LIBINDICATOR_INDICATOR_NG_H
 #include libindicator/indicator-ng.h
+#endif
 
 #include indicator.h
 #include indicator-box.h
@@ -63,9 +65,11 @@ static gboolean indicator_load_indicator 
  (IndicatorPlu
 const 
gchar   *name);
 static gboolean indicator_load_module  
(IndicatorPlugin   *indicator,
 const 
gchar   *name);
+#ifdef HAVE_LIBINDICATOR_INDICATOR_NG_H
 static gboolean indicator_load_service 
(IndicatorPlugin   *indicator,
 const 
gchar   *name);
 static void indicator_load_services
(IndicatorPlugin   *indicator);
+#endif
 static void indicator_load_modules 
(IndicatorPlugin   *indicator);
 
 
@@ -300,7 +304,9 @@ indicator_construct (XfcePanelPlugin *plugin)
 
   /* load 'em */
   indicator_load_modules (indicator);
+#ifdef HAVE_LIBINDICATOR_INDICATOR_NG_H
   indicator_load_services (indicator);
+#endif
 
   if (indicator-indicator_count == 0) {
 /* A label to allow for click through */
@@ -375,7 +381,7 @@ indicator_load_indicator (IndicatorPlugin *indicator,
 
   g_return_val_if_fail (XFCE_IS_INDICATOR_PLUGIN (indicator), 0);
   g_return_val_if_fail(name != NULL, FALSE);
-  g_debug (Load indicator_ng: %s, name);
+  g_debug (Load indicator: %s, name);
 
   indicator_config_add_known_indicator (indicator-config, name);
 
@@ -427,7 +433,7 @@ indicator_load_module (IndicatorPlugin *indicator,
   return indicator_load_indicator (indicator, io, name);
 }
 
-
+#ifdef HAVE_LIBINDICATOR_INDICATOR_NG_H
 static gboolean
 indicator_load_service (IndicatorPlugin *indicator,
 const gchar *name)
@@ -499,7 +505,7 @@ indicator_load_services (IndicatorPlugin *indicator)
 
   g_dir_close (indicators_ng_dir);
 }
-
+#endif
 
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Require libxfce4ui-4.11

2013-09-24 Thread Andrzej
Updating branch refs/heads/master
 to 53df5ad19169be3c9929e9c267a4a28d80c324da (commit)
   from 32df0d41a398a1e27864569c358189ad60ae7947 (commit)

commit 53df5ad19169be3c9929e9c267a4a28d80c324da
Author: Andrzej ndrwr...@gmail.com
Date:   Tue Sep 24 22:22:07 2013 +0100

Require libxfce4ui-4.11

 configure.ac.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index f605117..45ee296 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -80,7 +80,7 @@ AC_SUBST([LIBXFCE4PANEL_VERSION_API])
 XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.6.0])
 dnl XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.9.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.11.0])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], 
[libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.10.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
 XDT_CHECK_PACKAGE([INDICATOR], [indicator3], [0.4.0], 
[indicator_pkgname=indicator], [XDT_CHECK_PACKAGE([INDICATOR], 
[indicator3-0.4], [0.3.90], [indicator_pkgname=indicator3-0.4], [])])
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Indicator-button: Pass secondary-activate event

2013-09-19 Thread Andrzej
Updating branch refs/heads/master
 to 243049c116fb8e239580dac0bbaa9bfeb3545ce6 (commit)
   from 82fa77eac573b8610f413587231075a5d83cf253 (commit)

commit 243049c116fb8e239580dac0bbaa9bfeb3545ce6
Author: Andrzej ndrwr...@gmail.com
Date:   Thu Sep 19 23:35:25 2013 +0100

Indicator-button: Pass secondary-activate event

e.g. for muting audio with middle click in sound indicator

 panel-plugin/indicator-button.c |   20 
 1 file changed, 20 insertions(+)

diff --git a/panel-plugin/indicator-button.c b/panel-plugin/indicator-button.c
index 16504ee..6b5fd92 100644
--- a/panel-plugin/indicator-button.c
+++ b/panel-plugin/indicator-button.c
@@ -46,6 +46,8 @@
 static void xfce_indicator_button_finalize(GObject 
   *object);
 static gboolean xfce_indicator_button_button_press(GtkWidget   
   *widget,

GdkEventButton *event);
+static gboolean xfce_indicator_button_button_release  (GtkWidget   
   *widget,
+   
GdkEventButton *event);
 static gboolean xfce_indicator_button_scroll_event(GtkWidget   
   *widget,

GdkEventScroll *event);
 static void xfce_indicator_button_menu_deactivate 
(XfceIndicatorButton*button,
@@ -94,6 +96,7 @@ xfce_indicator_button_class_init (XfceIndicatorButtonClass 
*klass)
 
   widget_class = GTK_WIDGET_CLASS (klass);
   widget_class-button_press_event = xfce_indicator_button_button_press;
+  widget_class-button_release_event = xfce_indicator_button_button_release;
   widget_class-scroll_event = xfce_indicator_button_scroll_event;
   widget_class-get_preferred_width = 
xfce_indicator_button_get_preferred_width;
   widget_class-get_preferred_height = 
xfce_indicator_button_get_preferred_height;
@@ -342,6 +345,23 @@ xfce_indicator_button_button_press (GtkWidget  *widget,
 
 
 static gboolean
+xfce_indicator_button_button_release (GtkWidget  *widget,
+ GdkEventButton *event)
+{
+  XfceIndicatorButton *button = XFCE_INDICATOR_BUTTON (widget);
+
+  if(event-button == 2) /* middle button */
+{
+  g_signal_emit_by_name(button-io, 
INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE, 
+   button-entry, event-time);
+  return TRUE;
+}
+
+  return FALSE;
+}
+
+
+static gboolean
 xfce_indicator_button_scroll_event (GtkWidget *widget, GdkEventScroll *event)
 {
   XfceIndicatorButton *button = XFCE_INDICATOR_BUTTON (widget);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master XfceIndicatorButton: add gdk_scroll_mask

2013-09-16 Thread Andrzej
Updating branch refs/heads/master
 to 82fa77eac573b8610f413587231075a5d83cf253 (commit)
   from 25f6fef8209d2caf1d16f32500e74e2fbf1b2fac (commit)

commit 82fa77eac573b8610f413587231075a5d83cf253
Author: Andrzej ndrwr...@gmail.com
Date:   Tue Sep 17 04:32:53 2013 +0100

XfceIndicatorButton: add gdk_scroll_mask

Fixes scroll events on indicator buttons.

 panel-plugin/indicator-button.c |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/panel-plugin/indicator-button.c b/panel-plugin/indicator-button.c
index 88161a4..16504ee 100644
--- a/panel-plugin/indicator-button.c
+++ b/panel-plugin/indicator-button.c
@@ -46,7 +46,7 @@
 static void xfce_indicator_button_finalize(GObject 
   *object);
 static gboolean xfce_indicator_button_button_press(GtkWidget   
   *widget,

GdkEventButton *event);
-static gboolean xfce_indicator_button_scroll  (GtkWidget   
   *widget,
+static gboolean xfce_indicator_button_scroll_event(GtkWidget   
   *widget,

GdkEventScroll *event);
 static void xfce_indicator_button_menu_deactivate 
(XfceIndicatorButton*button,
GtkMenu 
   *menu);
@@ -94,7 +94,7 @@ xfce_indicator_button_class_init (XfceIndicatorButtonClass 
*klass)
 
   widget_class = GTK_WIDGET_CLASS (klass);
   widget_class-button_press_event = xfce_indicator_button_button_press;
-  widget_class-scroll_event = xfce_indicator_button_scroll;
+  widget_class-scroll_event = xfce_indicator_button_scroll_event;
   widget_class-get_preferred_width = 
xfce_indicator_button_get_preferred_width;
   widget_class-get_preferred_height = 
xfce_indicator_button_get_preferred_height;
 }
@@ -112,6 +112,8 @@ xfce_indicator_button_init (XfceIndicatorButton *button)
   gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
   gtk_widget_set_name (GTK_WIDGET (button), indicator-button);
 
+  gtk_widget_add_events (GTK_WIDGET (button), GDK_SCROLL_MASK);
+
   button-io = NULL;
   button-entry = NULL;
   button-plugin = NULL;
@@ -340,7 +342,7 @@ xfce_indicator_button_button_press (GtkWidget  *widget,
 
 
 static gboolean
-xfce_indicator_button_scroll (GtkWidget *widget, GdkEventScroll *event)
+xfce_indicator_button_scroll_event (GtkWidget *widget, GdkEventScroll *event)
 {
   XfceIndicatorButton *button = XFCE_INDICATOR_BUTTON (widget);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Fixed typo.

2013-09-06 Thread Andrzej
Updating branch refs/heads/master
 to c6659384823b55b209c424fec7f781cc5641007f (commit)
   from f6b84eed94fa0c9ce082bc15c0255e91f9055bc4 (commit)

commit c6659384823b55b209c424fec7f781cc5641007f
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Sep 6 23:58:38 2013 +0100

Fixed typo.

 panel-plugin/indicator-button-box.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel-plugin/indicator-button-box.c 
b/panel-plugin/indicator-button-box.c
index eb2604a..1118a52 100644
--- a/panel-plugin/indicator-button-box.c
+++ b/panel-plugin/indicator-button-box.c
@@ -532,7 +532,7 @@ indicator_button_box_size_allocate (GtkWidget *widget,
 {
   icon_alloc.height  = ICON_SIZE;
   label_alloc.height = MAX (1, height - icon_alloc.height - SPACING);
-  label_alloc.y = x + icon_alloc.height + SPACING;
+  label_alloc.y = y + icon_alloc.height + SPACING;
 }
   gtk_widget_size_allocate (box-icon, icon_alloc);
   gtk_widget_size_allocate (box-label, label_alloc);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Removed row-size property and added a single-row one

2013-09-05 Thread Andrzej
Updating branch refs/heads/master
 to a53baf18cf80b2f89a4caac31ccf08f6eff095ba (commit)
   from e0b1ed0e47444d152319261e8b59f3db32c27d8d (commit)

commit a53baf18cf80b2f89a4caac31ccf08f6eff095ba
Author: Andrzej ndrwr...@gmail.com
Date:   Thu Sep 5 23:25:14 2013 +0100

Removed row-size property and added a single-row one

 panel-plugin/indicator-config.c |   43 ---
 panel-plugin/indicator-config.h |2 +-
 panel-plugin/indicator-dialog.c |8 +++
 panel-plugin/indicator-dialog.glade |   43 ++-
 4 files changed, 31 insertions(+), 65 deletions(-)

diff --git a/panel-plugin/indicator-config.c b/panel-plugin/indicator-config.c
index 78a42f2..fb5d505 100644
--- a/panel-plugin/indicator-config.c
+++ b/panel-plugin/indicator-config.c
@@ -45,7 +45,7 @@
 
 
 
-#define DEFAULT_ROW_SIZE_MAX   24
+#define DEFAULT_SINGLE_ROW FALSE
 #define DEFAULT_ALIGN_LEFT FALSE
 #define DEFAULT_EXCLUDED_MODULES   NULL
 #define DEFAULT_ORIENTATIONGTK_ORIENTATION_HORIZONTAL
@@ -77,7 +77,7 @@ struct _IndicatorConfig
 {
   GObject  __parent__;
 
-  gint row_size_max;
+  gboolean single_row;
   gboolean align_left;
   gboolean mode_whitelist;
   GHashTable  *blacklist;
@@ -98,7 +98,7 @@ struct _IndicatorConfig
 enum
 {
   PROP_0,
-  PROP_ROW_SIZE_MAX,
+  PROP_SINGLE_ROW,
   PROP_ALIGN_LEFT,
   PROP_MODE_WHITELIST,
   PROP_BLACKLIST,
@@ -150,14 +150,11 @@ indicator_config_class_init (IndicatorConfigClass *klass)
   gobject_class-set_property = indicator_config_set_property;
 
   g_object_class_install_property (gobject_class,
-   PROP_ROW_SIZE_MAX,
-   g_param_spec_uint (row-size-max,
-  NULL, NULL,
-  1,
-  128,
-  DEFAULT_ROW_SIZE_MAX,
-  G_PARAM_READWRITE |
-  G_PARAM_STATIC_STRINGS));
+   PROP_SINGLE_ROW,
+   g_param_spec_boolean (single-row, NULL, 
NULL,
+ DEFAULT_SINGLE_ROW,
+ G_PARAM_READWRITE |
+ 
G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (gobject_class,
PROP_ALIGN_LEFT,
@@ -221,7 +218,7 @@ indicator_config_class_init (IndicatorConfigClass *klass)
 static void
 indicator_config_init (IndicatorConfig *config)
 {
-  config-row_size_max = DEFAULT_ROW_SIZE_MAX;
+  config-single_row   = DEFAULT_SINGLE_ROW;
   config-align_left   = DEFAULT_ALIGN_LEFT;
   config-mode_whitelist   = DEFAULT_MODE_WHITELIST;
   config-blacklist= g_hash_table_new_full (g_str_hash, 
g_str_equal, g_free, NULL);
@@ -281,8 +278,8 @@ indicator_config_get_property (GObject*object,
 
   switch (prop_id)
 {
-case PROP_ROW_SIZE_MAX:
-  g_value_set_uint (value, config-row_size_max);
+case PROP_SINGLE_ROW:
+  g_value_set_boolean (value, config-single_row);
   break;
 
 case PROP_ALIGN_LEFT:
@@ -343,11 +340,11 @@ indicator_config_set_property (GObject  *object,
 
   switch (prop_id)
 {
-case PROP_ROW_SIZE_MAX:
-  val = g_value_get_uint (value);
-  if (config-row_size_max != val)
+case PROP_SINGLE_ROW:
+  val = g_value_get_boolean (value);
+  if (config-single_row != val)
 {
-  config-row_size_max = val;
+  config-single_row = val;
   g_signal_emit (G_OBJECT (config), indicator_config_signals 
[CONFIGURATION_CHANGED], 0);
 }
   break;
@@ -430,11 +427,11 @@ indicator_config_set_property (GObject  *object,
 
 
 gint
-indicator_config_get_row_size_max (IndicatorConfig *config)
+indicator_config_get_single_row (IndicatorConfig *config)
 {
-  g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), 
DEFAULT_ROW_SIZE_MAX);
+  g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), DEFAULT_SINGLE_ROW);
 
-  return config-row_size_max;
+  return config-single_row;
 }
 
 
@@ -757,8 +754,8 @@ indicator_config_new (const gchar *property_base)
 {
   channel = xfconf_channel_get (xfce4-panel);
 
-  property = g_strconcat (property_base, /row-size-max, NULL);
-  xfconf_g_property_bind (channel, property, G_TYPE_INT, config, 
row-size-max);
+  property = g_strconcat (property_base, /single-row, NULL);
+  xfconf_g_property_bind (channel, property, G_TYPE_BOOLEAN, config, 
single-row);
   g_free (property);
 
   property = g_strconcat (property_base, /align-left, NULL);
diff

[Xfce4-commits] xfce4-indicator-plugin:master indicator layout fixes

2013-09-05 Thread Andrzej
Updating branch refs/heads/master
 to 990593b51cd5fc025b9f6afb13ff15b82fbe6df6 (commit)
   from 7187abbc56d80a790a6dd9df518dd62184e2387e (commit)

commit 990593b51cd5fc025b9f6afb13ff15b82fbe6df6
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Sep 6 00:55:00 2013 +0100

indicator layout fixes

 panel-plugin/indicator-button-box.c |  105 ---
 1 file changed, 34 insertions(+), 71 deletions(-)

diff --git a/panel-plugin/indicator-button-box.c 
b/panel-plugin/indicator-button-box.c
index d20840e..f4364f5 100644
--- a/panel-plugin/indicator-button-box.c
+++ b/panel-plugin/indicator-button-box.c
@@ -353,17 +353,25 @@ indicator_button_box_is_small (IndicatorButtonBox *box)
   box-pixbuf_w = -1;
   box-pixbuf_h = -1;
 
+  box-orientation = indicator_config_get_panel_orientation (box-config);
+
   if (box-label != NULL)
 {
   box-is_small = FALSE;
-  box-orientation = indicator_config_get_panel_orientation (box-config);
   if (box-orientation == GTK_ORIENTATION_VERTICAL 
   indicator_config_get_orientation (box-config) == 
GTK_ORIENTATION_HORIZONTAL 
   indicator_config_get_align_left (box-config))
-box-orientation = GTK_ORIENTATION_HORIZONTAL;
+   {
+ box-orientation = GTK_ORIENTATION_HORIZONTAL;
+ gtk_misc_set_alignment (GTK_MISC (box-label), 0.0, 0.5);
+   }
+  else
+   {
+ gtk_misc_set_alignment (GTK_MISC (box-label), 0.5, 0.5);
+   }
   gtk_label_set_angle (GTK_LABEL (box-label),
-   (indicator_config_get_orientation (box-config) == 
GTK_ORIENTATION_VERTICAL)
-   ? -90 : 0);
+  (indicator_config_get_orientation (box-config) == 
GTK_ORIENTATION_VERTICAL) ?
+  -90 : 0);
 }
   else if (box-icon != NULL 
gtk_image_get_storage_type (GTK_IMAGE (box-icon)) == 
GTK_IMAGE_PIXBUF)
@@ -373,7 +381,7 @@ indicator_button_box_is_small (IndicatorButtonBox *box)
   box-pixbuf_w = gdk_pixbuf_get_width (pixbuf);
   box-pixbuf_h = gdk_pixbuf_get_height (pixbuf);
 
-  box-is_small = (box-pixbuf_w == box-pixbuf_h);
+  box-is_small = (box-pixbuf_w == box-pixbuf_h  box-pixbuf_w = 
ICON_SIZE);
 }
   else
 {
@@ -501,82 +509,37 @@ indicator_button_box_size_allocate (GtkWidget *widget,
   IndicatorButtonBox  *box = XFCE_INDICATOR_BUTTON_BOX (widget);
   gint label_width, label_height;
   gint x, y, width, height;
+  gint icon_width, icon_height;
   GtkAllocationchild_allocation;
 
   gtk_widget_set_allocation (widget, allocation);
 
-  x = allocation-x;
-  y = allocation-y;
-  width  = allocation-width;
-  height = allocation-height;
+  child_allocation.x  = x  = allocation-x;
+  child_allocation.y  = y  = allocation-y;
+  child_allocation.width  = width  = allocation-width;
+  child_allocation.height = height = allocation-height;
 
-  if (indicator_button_box_is_small (box)  box-icon != NULL) // check  
cache
-{
-  child_allocation.x = x + (width - ICON_SIZE + 1) / 2;
-  child_allocation.y = y + (height - ICON_SIZE + 1) / 2;
-  child_allocation.width = ICON_SIZE;
-  child_allocation.height = ICON_SIZE;
-  gtk_widget_size_allocate (box-icon, child_allocation);
-}
-  else if (box-icon != NULL)
+  indicator_button_box_is_small (box); // refresh cache
+
+  if (box-icon != NULL)
 {
-  /* allocate icon */
-  child_allocation.width = MAX (ICON_SIZE, box-pixbuf_w);
-  child_allocation.height = MAX (ICON_SIZE, box-pixbuf_h);
-  if (box-orientation == GTK_ORIENTATION_HORIZONTAL)
-{
-  if (box-label != NULL)
-child_allocation.x = x;
-  else
-child_allocation.x = x + (width - child_allocation.width + 1) / 2;
-  child_allocation.y = y + (height - child_allocation.height + 1) / 2;
-}
-  else
-{
-  if (box-label != NULL)
-child_allocation.y = y;
-  else
-child_allocation.y = y + (height - child_allocation.height + 1) / 
2;
-  child_allocation.x = x + (width - child_allocation.width + 1) / 2;
-}
   gtk_widget_size_allocate (box-icon, child_allocation);
 }
   if (box-label != NULL)
 {
-  /* allocate label */
-  gtk_widget_get_preferred_width  (box-label, NULL, label_width);
-  gtk_widget_get_preferred_height (box-label, NULL, label_height);
-
-  if (box-orientation == GTK_ORIENTATION_HORIZONTAL)
-{
-  if (box-icon != NULL)
-{
-  child_allocation.x = x + ICON_SIZE + SPACING;
-  child_allocation.width  = MAX (1, MIN (width - ICON_SIZE - 
SPACING, label_width));
-}
-  else
-{
-  child_allocation.x = x;
-  child_allocation.width  = MAX (ICON_SIZE, MIN (width, 
label_width

[Xfce4-commits] xfce4-indicator-plugin:master Fix type of a single-row property

2013-09-05 Thread Andrzej
Updating branch refs/heads/master
 to 2df49bb8778cc823dc4bb3147e152d777dce53bd (commit)
   from a53baf18cf80b2f89a4caac31ccf08f6eff095ba (commit)

commit 2df49bb8778cc823dc4bb3147e152d777dce53bd
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Sep 6 00:53:45 2013 +0100

Fix type of a single-row property

 panel-plugin/indicator-config.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel-plugin/indicator-config.c b/panel-plugin/indicator-config.c
index fb5d505..440b593 100644
--- a/panel-plugin/indicator-config.c
+++ b/panel-plugin/indicator-config.c
@@ -426,7 +426,7 @@ indicator_config_set_property (GObject  *object,
 
 
 
-gint
+gboolean
 indicator_config_get_single_row (IndicatorConfig *config)
 {
   g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), DEFAULT_SINGLE_ROW);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Use single-row property

2013-09-05 Thread Andrzej
Updating branch refs/heads/master
 to 7187abbc56d80a790a6dd9df518dd62184e2387e (commit)
   from 2df49bb8778cc823dc4bb3147e152d777dce53bd (commit)

commit 7187abbc56d80a790a6dd9df518dd62184e2387e
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Sep 6 00:54:31 2013 +0100

Use single-row property

 panel-plugin/indicator-box.c |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/indicator-box.c b/panel-plugin/indicator-box.c
index 7dc744c..c0fa328 100644
--- a/panel-plugin/indicator-box.c
+++ b/panel-plugin/indicator-box.c
@@ -324,6 +324,7 @@ xfce_indicator_box_get_preferred_length (GtkWidget *widget,
   GtkStyleContext *ctx;
   GtkBorderpadding, border;
   gint border_thickness;
+  gboolean allow_small;
 
   /* check border thickness of the first button */
   li = gtk_container_get_children (GTK_CONTAINER (box));
@@ -340,6 +341,7 @@ xfce_indicator_box_get_preferred_length (GtkWidget *widget,
   size = ICON_SIZE + border_thickness;
   panel_size = indicator_config_get_panel_size (box-config);
   nrows = MAX (1, panel_size / size);
+  allow_small = !((nrows == 1) || indicator_config_get_single_row 
(box-config));
 
   panel_orientation = indicator_config_get_panel_orientation (box-config);
 
@@ -361,7 +363,7 @@ xfce_indicator_box_get_preferred_length (GtkWidget *widget,
 
   gtk_widget_get_preferred_size (GTK_WIDGET (button), NULL, 
child_req);
 
-  is_small = xfce_indicator_button_is_small (button);
+  is_small = allow_small  xfce_indicator_button_is_small (button);
 
   /* wrap rows if column is overflowing or a label is encountered */
   if (row  0  (row = nrows || !is_small))
@@ -469,6 +471,7 @@ xfce_indicator_box_size_allocate (GtkWidget *widget,
   GtkStyleContext *ctx;
   GtkBorderpadding, border;
   gint border_thickness;
+  gboolean allow_small;
 
   row = 0;
   length = 0;
@@ -496,6 +499,7 @@ xfce_indicator_box_size_allocate (GtkWidget *widget,
   nrows = panel_size / size;
   //full_size = ((nrows-1)*panel_size + nrows*size) / nrows; // regular pitch, 
margins
   full_size = panel_size; // irregular pitch, no margins
+  allow_small = !((nrows == 1) || indicator_config_get_single_row 
(box-config));
 
   panel_orientation = indicator_config_get_panel_orientation (box-config);
 
@@ -513,7 +517,7 @@ xfce_indicator_box_size_allocate (GtkWidget *widget,
 
   gtk_widget_get_preferred_size (GTK_WIDGET (button), NULL, 
child_req);
 
-  is_small = xfce_indicator_button_is_small (button);
+  is_small = allow_small  xfce_indicator_button_is_small (button);
 
   /* wrap rows if column is overflowing or a label is encountered */
   if (row  0  (row = nrows || !is_small))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Merge branch 'master' of ssh://git.xfce.org/panel-plugins/xfce4-indicator-plugin

2013-09-05 Thread Andrzej
Updating branch refs/heads/master
 to 61f8a50e64c24bbaa0b7b8e53f659b4881e131bb (commit)
   from 990593b51cd5fc025b9f6afb13ff15b82fbe6df6 (commit)

commit 61f8a50e64c24bbaa0b7b8e53f659b4881e131bb
Merge: 990593b c619253
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Sep 6 00:55:16 2013 +0100

Merge branch 'master' of 
ssh://git.xfce.org/panel-plugins/xfce4-indicator-plugin

commit c6192531f40fde5bd316a8ff5425f16d0ee8d13f
Author: sandandmercury sandandmerc...@gmail.com
Date:   Fri Sep 6 00:31:32 2013 +0200

I18n: Update translation ca (100%).

37 translated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/ca.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index bded381..9a32ee6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgstr 
 Project-Id-Version: Xfce Panel Plugins\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-09-02 06:31+0200\n
-PO-Revision-Date: 2013-09-05 16:31+\n
+PO-Revision-Date: 2013-09-05 16:33+\n
 Last-Translator: sandandmercury sandandmerc...@gmail.com\n
 Language-Team: Catalan 
(http://www.transifex.com/projects/p/xfce/language/ca/)\n
 MIME-Version: 1.0\n
@@ -31,7 +31,7 @@ msgstr Proporciona una àrea del panell per indicadors 
d'Unity. Els indicadors
 
 #: ../panel-plugin/indicator.c:176
 msgid Copyright (c) 2009-2013\n
-msgstr 
+msgstr Copyright (c) 2009-2013\n
 
 #: ../panel-plugin/indicator.c:312
 msgid No Indicators
@@ -93,7 +93,7 @@ msgstr Xarxa
 
 #: ../panel-plugin/indicator-dialog.c:76
 msgid Workrave
-msgstr 
+msgstr Workrave
 
 #: ../panel-plugin/indicator-dialog.c:450
 msgid Are you sure you want to clear the list of known indicators?
@@ -168,7 +168,7 @@ msgstr iSi us plau, reinicieu el panell per tal que 
tinguin efecte els canvis
 
 #: ../panel-plugin/indicator-dialog.glade.h:15
 msgid C_lear known indicators
-msgstr 
+msgstr Netejar indicadors coneguts
 
 #: ../panel-plugin/indicator-dialog.glade.h:16
 msgid Resets the list of indicators and their visibility settings.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Allow rectangular or slightly oversized icons

2013-09-05 Thread Andrzej
Updating branch refs/heads/master
 to cdfc5e4ee954a527892a250027b2454a238d941b (commit)
   from 61f8a50e64c24bbaa0b7b8e53f659b4881e131bb (commit)

commit cdfc5e4ee954a527892a250027b2454a238d941b
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Sep 6 01:17:33 2013 +0100

Allow rectangular or slightly oversized icons

 panel-plugin/indicator-button-box.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/panel-plugin/indicator-button-box.c 
b/panel-plugin/indicator-button-box.c
index f4364f5..5bfb658 100644
--- a/panel-plugin/indicator-button-box.c
+++ b/panel-plugin/indicator-button-box.c
@@ -381,7 +381,8 @@ indicator_button_box_is_small (IndicatorButtonBox *box)
   box-pixbuf_w = gdk_pixbuf_get_width (pixbuf);
   box-pixbuf_h = gdk_pixbuf_get_height (pixbuf);
 
-  box-is_small = (box-pixbuf_w == box-pixbuf_h  box-pixbuf_w = 
ICON_SIZE);
+  // allow some wiggle room for small nearly square icons
+  box-is_small = (box-pixbuf_w = ICON_SIZE+4  box-pixbuf_h = 
ICON_SIZE+4);
 }
   else
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master More layout fixes.

2013-09-05 Thread Andrzej
Updating branch refs/heads/master
 to 47267bb0fd14aa13e5ba0d450342bd1fb6e8a0b1 (commit)
   from cdfc5e4ee954a527892a250027b2454a238d941b (commit)

commit 47267bb0fd14aa13e5ba0d450342bd1fb6e8a0b1
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Sep 6 01:42:23 2013 +0100

More layout fixes.

Previous commit broke icon+label indicators.
Assume icon size 22x22 in such combinations.

 panel-plugin/indicator-button-box.c |   50 ++-
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/panel-plugin/indicator-button-box.c 
b/panel-plugin/indicator-button-box.c
index 5bfb658..eb2604a 100644
--- a/panel-plugin/indicator-button-box.c
+++ b/panel-plugin/indicator-button-box.c
@@ -508,40 +508,42 @@ indicator_button_box_size_allocate (GtkWidget *widget,
 GtkAllocation *allocation)
 {
   IndicatorButtonBox  *box = XFCE_INDICATOR_BUTTON_BOX (widget);
-  gint label_width, label_height;
   gint x, y, width, height;
-  gint icon_width, icon_height;
-  GtkAllocationchild_allocation;
+  GtkAllocationicon_alloc, label_alloc;
 
   gtk_widget_set_allocation (widget, allocation);
 
-  child_allocation.x  = x  = allocation-x;
-  child_allocation.y  = y  = allocation-y;
-  child_allocation.width  = width  = allocation-width;
-  child_allocation.height = height = allocation-height;
+  icon_alloc.x  = label_alloc.x  = x  = allocation-x;
+  icon_alloc.y  = label_alloc.y  = y  = allocation-y;
+  icon_alloc.width  = label_alloc.width  = width  = allocation-width;
+  icon_alloc.height = label_alloc.height = height = allocation-height;
 
   indicator_button_box_is_small (box); // refresh cache
 
-  if (box-icon != NULL)
+  if (box-icon != NULL  box-label != NULL)
+{
+  if (box-orientation == GTK_ORIENTATION_HORIZONTAL)
+{
+  icon_alloc.width  = ICON_SIZE;
+  label_alloc.width = MAX (1, width - icon_alloc.width - SPACING);
+  label_alloc.x = x + icon_alloc.width + SPACING;
+}
+  else
+{
+  icon_alloc.height  = ICON_SIZE;
+  label_alloc.height = MAX (1, height - icon_alloc.height - SPACING);
+  label_alloc.y = x + icon_alloc.height + SPACING;
+}
+  gtk_widget_size_allocate (box-icon, icon_alloc);
+  gtk_widget_size_allocate (box-label, label_alloc);
+}
+  else if (box-icon != NULL)
 {
-  gtk_widget_size_allocate (box-icon, child_allocation);
+  gtk_widget_size_allocate (box-icon, icon_alloc);
 }
-  if (box-label != NULL)
+  else if (box-label != NULL)
 {
-  if (box-icon != NULL)
-   {
- if (box-orientation == GTK_ORIENTATION_HORIZONTAL)
-   {
- child_allocation.width  = MAX (1, width - ICON_SIZE - SPACING);
- child_allocation.x = x + width - child_allocation.width;
-   }
- else
-   {
- child_allocation.height = MAX (1, height - ICON_SIZE - SPACING);
- child_allocation.y = y + height - child_allocation.height;
-   }
-   }
-  gtk_widget_size_allocate (box-label, child_allocation);
+  gtk_widget_size_allocate (box-label, label_alloc);
 }
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Call ido_init()

2013-09-01 Thread Andrzej
Updating branch refs/heads/master
 to f949719fafbd50744e3697470eef08177e386fea (commit)
   from 99f974b8b15448b7091b7eb86fea572aabb85aae (commit)

commit f949719fafbd50744e3697470eef08177e386fea
Author: Alistair Buxton a.j.bux...@gmail.com
Date:   Sun Sep 1 05:07:30 2013 +0100

Call ido_init()

This is required to make ido register itself with Gtk+.

 panel-plugin/indicator.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
index 74d542e..164fc0a 100644
--- a/panel-plugin/indicator.c
+++ b/panel-plugin/indicator.c
@@ -285,6 +285,8 @@ indicator_construct (XfcePanelPlugin *plugin)
   gint  indicators_loaded = 0;
   GtkWidget*label;
 
+  ido_init();
+
   xfce_panel_plugin_menu_show_configure (plugin);
   xfce_panel_plugin_menu_show_about (plugin);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Update the friendly name table.

2013-09-01 Thread Andrzej
Updating branch refs/heads/master
 to 99f974b8b15448b7091b7eb86fea572aabb85aae (commit)
   from 8d26ab0d348cd6c969d575a9196b2d2aaa37c05e (commit)

commit 99f974b8b15448b7091b7eb86fea572aabb85aae
Author: Alistair Buxton a.j.bux...@gmail.com
Date:   Sun Sep 1 04:41:23 2013 +0100

Update the friendly name table.

 panel-plugin/indicator-dialog.c |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/panel-plugin/indicator-dialog.c b/panel-plugin/indicator-dialog.c
index e769628..9048246 100644
--- a/panel-plugin/indicator-dialog.c
+++ b/panel-plugin/indicator-dialog.c
@@ -53,18 +53,18 @@
 /* known indicator names */
 static const gchar *pretty_names[][3] =
 {
-  /* raw name,  pretty name, 
icon-name(?) */
-  { libapplication.so,N_(Application Indicators),   
application-default-icon },
-  { libsoundmenu.so,  N_(Sound Menu),   
preferences-desktop-sound },
-  { libprintersmenu.so,   N_(Printers Menu),
printer },
-  { libpower.so,  N_(Power Management), 
NULL },
-  { libappmenu.so,N_(Application Menus (Global Menu)),  
menu-editor },
-  { libsession.so,N_(Session Management),   
NULL },
-  { libmessaging.so,  N_(Messaging Menu),   
indicator-messages-new },
-  { libdatetime.so,   N_(Date and Time),
time-admin },
-  { libbluetooth.so,  N_(Bluetooth),
bluetooth-active },
-  { libsyncindicator.so,  N_(Sync Menu),
sync-client-updating },
-  { libworkrave.so,   N_(Workrave), 
workrave },
+  /* raw name,   pretty name,  
   icon-name(?) */
+  { libapplication.so, N_(Application Indicators), 
  application-default-icon },
+  { com.canonical.indicator.sound, N_(Sound Menu), 
  preferences-desktop-sound },
+  { libprintersmenu.so,N_(Printers Menu),  
  printer },
+  { com.canonical.indicator.power, N_(Power Management),   
  NULL },
+  { libappmenu.so, N_(Application Menus (Global 
Menu)),  menu-editor },
+  { com.canonical.indicator.session,   N_(Session Management), 
  NULL },
+  { com.canonical.indicator.messages,  N_(Messaging Menu), 
  indicator-messages-new },
+  { com.canonical.indicator.datetime,  N_(Date and Time),  
  time-admin },
+  { com.canonical.indicator.bluetooth, N_(Bluetooth),  
  bluetooth-active },
+  { libsyncindicator.so,   N_(Sync Menu),  
  sync-client-updating },
+  { libworkrave.so,N_(Workrave),   
  workrave },
 };
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Add libido to the build rules.

2013-09-01 Thread Andrzej
Updating branch refs/heads/master
 to 8d26ab0d348cd6c969d575a9196b2d2aaa37c05e (commit)
   from 48edafdc08b869bed74695ef257c0bd23c3cb3e3 (commit)

commit 8d26ab0d348cd6c969d575a9196b2d2aaa37c05e
Author: Alistair Buxton a.j.bux...@gmail.com
Date:   Sat Aug 31 23:55:03 2013 +0100

Add libido to the build rules.

 configure.ac.in  |1 +
 panel-plugin/Makefile.am |4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index d1f7532..4fd7b66 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -84,6 +84,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.9.0])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], 
[libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.10.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
 XDT_CHECK_PACKAGE([INDICATOR], [indicator3], [0.4.0], 
[indicator_pkgname=indicator], [XDT_CHECK_PACKAGE([INDICATOR], 
[indicator3-0.4], [0.3.90], [indicator_pkgname=indicator3-0.4], [])])
+XDT_CHECK_PACKAGE([IDO], [libido3-0.1], [13.10.0])
 
 dnl ***
 dnl *** Check for debugging support ***
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 3acf147..ea7f27d 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -39,6 +39,7 @@ libindicator_plugin_la_CFLAGS = \
$(LIBXFCE4PANEL_CFLAGS) \
$(XFCONF_CFLAGS) \
$(INDICATOR_CFLAGS) \
+   $(IDO_CFLAGS) \
$(PLATFORM_CFLAGS) \
-DDATADIR=\$(datadir)\ \
-DINDICATOR_ICONS_DIR=\$(INDICATORICONSDIR)\ \
@@ -57,7 +58,8 @@ libindicator_plugin_la_LIBADD = \
$(LIBXFCE4UI_LIBS) \
$(LIBXFCE4PANEL_LIBS) \
$(XFCONF_LIBS) \
-   $(INDICATOR_LIBS)
+   $(INDICATOR_LIBS) \
+   $(IDO_LIBS)
 
 #
 # Desktop file
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Make IDO library optional

2013-09-01 Thread Andrzej
Updating branch refs/heads/master
 to c86bf2cdd3e6112c562f1d77929ea724aa1e6097 (commit)
   from f949719fafbd50744e3697470eef08177e386fea (commit)

commit c86bf2cdd3e6112c562f1d77929ea724aa1e6097
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Sep 1 21:01:28 2013 +0100

Make IDO library optional

 configure.ac.in  |   11 ++-
 panel-plugin/indicator.c |6 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index 4fd7b66..7b90506 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -84,7 +84,11 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.9.0])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], 
[libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.10.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
 XDT_CHECK_PACKAGE([INDICATOR], [indicator3], [0.4.0], 
[indicator_pkgname=indicator], [XDT_CHECK_PACKAGE([INDICATOR], 
[indicator3-0.4], [0.3.90], [indicator_pkgname=indicator3-0.4], [])])
-XDT_CHECK_PACKAGE([IDO], [libido3-0.1], [13.10.0])
+
+dnl 
+dnl *** Optional IDO library ***
+dnl 
+XDT_CHECK_OPTIONAL_PACKAGE([IDO], [libido3-0.1], [13.10.0], [ido], [IDO 
library])
 
 dnl ***
 dnl *** Check for debugging support ***
@@ -130,4 +134,9 @@ echo
 echo Build Configuration:
 echo
 echo * Debug Support:$enable_debug
+if test x$IDO_FOUND = xyes; then
+echo * Use IDO library:  yes
+else
+echo * Use IDO library:  no
+fi
 echo
diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
index 164fc0a..e634f05 100644
--- a/panel-plugin/indicator.c
+++ b/panel-plugin/indicator.c
@@ -43,6 +43,10 @@
 #include indicator-button.h
 #include indicator-dialog.h
 
+#ifdef HAVE_IDO
+#include libido/libido.h
+#endif
+
 #ifdef LIBXFCE4PANEL_CHECK_VERSION
 #if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
 #define HAS_PANEL_49
@@ -285,7 +289,9 @@ indicator_construct (XfcePanelPlugin *plugin)
   gint  indicators_loaded = 0;
   GtkWidget*label;
 
+  #ifdef HAVE_IDO
   ido_init();
+  #endif
 
   xfce_panel_plugin_menu_show_configure (plugin);
   xfce_panel_plugin_menu_show_about (plugin);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Remove panel version checking

2013-09-01 Thread Andrzej
Updating branch refs/heads/master
 to 0bcb7689136c448bd0ff42570435a19ac5c6ba0a (commit)
   from c86bf2cdd3e6112c562f1d77929ea724aa1e6097 (commit)

commit 0bcb7689136c448bd0ff42570435a19ac5c6ba0a
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Sep 1 21:06:25 2013 +0100

Remove panel version checking

Gtk3 version of the plugin requires a new panel.

 panel-plugin/indicator.c |   34 --
 1 file changed, 34 deletions(-)

diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
index e634f05..c5551c6 100644
--- a/panel-plugin/indicator.c
+++ b/panel-plugin/indicator.c
@@ -47,12 +47,6 @@
 #include libido/libido.h
 #endif
 
-#ifdef LIBXFCE4PANEL_CHECK_VERSION
-#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
-#define HAS_PANEL_49
-#endif
-#endif
-
 /* prototypes */
 static void indicator_construct
(XfcePanelPlugin   *plugin);
 static void indicator_free 
(XfcePanelPlugin   *plugin);
@@ -62,13 +56,8 @@ static void indicator_show_about 
  (XfcePanelPlu
 static void indicator_configure_plugin 
(XfcePanelPlugin   *plugin);
 static gboolean indicator_size_changed 
(XfcePanelPlugin   *plugin,
 gint   
size);
-#ifdef HAS_PANEL_49
 static void indicator_mode_changed 
(XfcePanelPlugin   *plugin,
 
XfcePanelPluginModemode);
-#else
-static void indicator_orientation_changed  
(XfcePanelPlugin   *plugin,
-
GtkOrientation orientation);
-#endif
 static gint indicator_load_indicators_ng   
(IndicatorPlugin   *indicator);
 
 
@@ -111,11 +100,7 @@ indicator_class_init (IndicatorPluginClass *klass)
   plugin_class-size_changed = indicator_size_changed;
   plugin_class-about = indicator_show_about;
   plugin_class-configure_plugin = indicator_configure_plugin;
-#ifdef HAS_PANEL_49
   plugin_class-mode_changed = indicator_mode_changed;
-#else
-  plugin_class-orientation_changed = indicator_orientation_changed;
-#endif
 }
 
 
@@ -190,7 +175,6 @@ indicator_configure_plugin (XfcePanelPlugin *plugin)
 
 
 
-#ifdef HAS_PANEL_49
 static void
 indicator_mode_changed (XfcePanelPlugin *plugin,
 XfcePanelPluginMode  mode)
@@ -209,31 +193,13 @@ indicator_mode_changed (XfcePanelPlugin *plugin,
 
 
 
-#else
-static void
-indicator_orientation_changed (XfcePanelPlugin *plugin,
-   GtkOrientation   orientation)
-{
-  IndicatorPlugin *indicator = XFCE_INDICATOR_PLUGIN (plugin);
-
-  indicator_config_set_orientation (indicator-config, orientation, 
GTK_ORIENTATION_HORIZONTAL);
-
-  indicator_size_changed (plugin, xfce_panel_plugin_get_size (plugin));
-}
-#endif
-
-
 static gboolean
 indicator_size_changed (XfcePanelPlugin *plugin,
 gint size)
 {
   IndicatorPlugin *indicator = XFCE_INDICATOR_PLUGIN (plugin);
 
-#ifdef HAS_PANEL_49
   indicator_config_set_size (indicator-config, size, 
xfce_panel_plugin_get_nrows (plugin));
-#else
-  indicator_config_set_size (indicator-config, size, 1);
-#endif
 
   return TRUE;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Updated the friendly name table.

2013-09-01 Thread Andrzej
Updating branch refs/heads/master
 to e9934614f69f177a9f6e99216ede0717722b3d8f (commit)
   from 0bcb7689136c448bd0ff42570435a19ac5c6ba0a (commit)

commit e9934614f69f177a9f6e99216ede0717722b3d8f
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Sep 1 21:52:07 2013 +0100

Updated the friendly name table.

 panel-plugin/indicator-dialog.c |9 +
 1 file changed, 9 insertions(+)

diff --git a/panel-plugin/indicator-dialog.c b/panel-plugin/indicator-dialog.c
index 9048246..eb8bd50 100644
--- a/panel-plugin/indicator-dialog.c
+++ b/panel-plugin/indicator-dialog.c
@@ -55,15 +55,24 @@ static const gchar *pretty_names[][3] =
 {
   /* raw name,   pretty name,  
   icon-name(?) */
   { libapplication.so, N_(Application Indicators), 
  application-default-icon },
+  { libsoundmenu.so,   N_(Sound Menu), 
  preferences-desktop-sound },
   { com.canonical.indicator.sound, N_(Sound Menu), 
  preferences-desktop-sound },
   { libprintersmenu.so,N_(Printers Menu),  
  printer },
+  { libpower.so,   N_(Power Management),   
  NULL },
   { com.canonical.indicator.power, N_(Power Management),   
  NULL },
   { libappmenu.so, N_(Application Menus (Global 
Menu)),  menu-editor },
+  { libsession.so, N_(Session Management), 
  NULL },
   { com.canonical.indicator.session,   N_(Session Management), 
  NULL },
+  { libmessaging.so,   N_(Messaging Menu), 
  indicator-messages-new },
   { com.canonical.indicator.messages,  N_(Messaging Menu), 
  indicator-messages-new },
+  { libdatetime.so,N_(Date and Time),  
  time-admin },
   { com.canonical.indicator.datetime,  N_(Date and Time),  
  time-admin },
+  { libbluetooth.so,   N_(Bluetooth),  
  bluetooth-active },
   { com.canonical.indicator.bluetooth, N_(Bluetooth),  
  bluetooth-active },
   { libsyncindicator.so,   N_(Sync Menu),  
  sync-client-updating },
+  { com.canonical.indicator.keyboard,  N_(Keyboard),   
  NULL },
+  { com.canonical.indicator.location,  N_(Location),   
  NULL },
+  { com.canonical.indicator.network,   N_(Network),
  NULL },
   { libworkrave.so,N_(Workrave),   
  workrave },
 };
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Refactored indicator loading functions.

2013-09-01 Thread Andrzej
Updating branch refs/heads/master
 to a90c20ede9871043dac90f2df6fd17cd37d446ce (commit)
   from e9934614f69f177a9f6e99216ede0717722b3d8f (commit)

commit a90c20ede9871043dac90f2df6fd17cd37d446ce
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Sep 1 23:06:40 2013 +0100

Refactored indicator loading functions.

Largely based on Alistair's code.

 panel-plugin/indicator.c |  257 --
 1 file changed, 133 insertions(+), 124 deletions(-)

diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
index c5551c6..3947c5f 100644
--- a/panel-plugin/indicator.c
+++ b/panel-plugin/indicator.c
@@ -24,6 +24,8 @@
  */
 
 
+#define INDICATOR_SERVICE_DIR /usr/share/unity/indicators
+
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -50,15 +52,21 @@
 /* prototypes */
 static void indicator_construct
(XfcePanelPlugin   *plugin);
 static void indicator_free 
(XfcePanelPlugin   *plugin);
-static gboolean load_module(const 
gchar   *name,
-
IndicatorPlugin   *indicator);
 static void indicator_show_about   
(XfcePanelPlugin   *plugin);
 static void indicator_configure_plugin 
(XfcePanelPlugin   *plugin);
 static gboolean indicator_size_changed 
(XfcePanelPlugin   *plugin,
 gint   
size);
 static void indicator_mode_changed 
(XfcePanelPlugin   *plugin,
 
XfcePanelPluginModemode);
-static gint indicator_load_indicators_ng   
(IndicatorPlugin   *indicator);
+static gboolean indicator_load_indicator   
(IndicatorPlugin   *indicator,
+
IndicatorObject   *io,
+const 
gchar   *name);
+static gboolean indicator_load_module  
(IndicatorPlugin   *indicator,
+const 
gchar   *name);
+static gboolean indicator_load_service 
(IndicatorPlugin   *indicator,
+const 
gchar   *name);
+static void indicator_load_services
(IndicatorPlugin   *indicator);
+static void indicator_load_modules 
(IndicatorPlugin   *indicator);
 
 
 struct _IndicatorPluginClass
@@ -71,6 +79,8 @@ struct _IndicatorPlugin
 {
   XfcePanelPlugin __parent__;
 
+  gint indicator_count;
+
   /* panel widgets */
   GtkWidget   *item;
   GtkWidget   *buttonbox;
@@ -114,10 +124,11 @@ indicator_init (IndicatorPlugin *indicator)
  The following lines makes only g_error critical. */
   g_log_set_always_fatal (G_LOG_LEVEL_ERROR);
 
-  indicator-item  = NULL;
-  indicator-buttonbox = NULL;
-  indicator-config= NULL;
-  indicator-logfile   = NULL;
+  indicator-indicator_count = 0;
+  indicator-item= NULL;
+  indicator-buttonbox   = NULL;
+  indicator-config  = NULL;
+  indicator-logfile = NULL;
 }
 
 
@@ -252,7 +263,6 @@ static void
 indicator_construct (XfcePanelPlugin *plugin)
 {
   IndicatorPlugin  *indicator = XFCE_INDICATOR_PLUGIN (plugin);
-  gint  indicators_loaded = 0;
   GtkWidget*label;
 
   #ifdef HAVE_IDO
@@ -282,35 +292,10 @@ indicator_construct (XfcePanelPlugin *plugin)
   gtk_widget_show(GTK_WIDGET(indicator-buttonbox));
 
   /* load 'em */
-  if (g_file_test(INDICATOR_DIR, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
-GDir * dir = g_dir_open(INDICATOR_DIR, 0, NULL);
-
-const gchar * name;
-if (indicator_config_get_mode_whitelist (indicator-config))
-  {
-while ((name = g_dir_read_name (dir)) != NULL)
-  if (indicator_config_is_whitelisted (indicator-config, name))
-{
-  g_debug (Loading whitelisted module: %s, name);
-  if (load_module(name, indicator))
-indicators_loaded++;
-}
-  }
-else
-  {
-while ((name = g_dir_read_name (dir)) != NULL)
-  if (indicator_config_is_blacklisted (indicator-config, name))
-g_debug (Excluding blacklisted module: %s, name);
-  else if (load_module(name, indicator))
-indicators_loaded++;
-  }
-
-g_dir_close (dir);
-  }
+  indicator_load_modules (indicator);
+  indicator_load_services (indicator);
 
-  indicators_loaded += indicator_load_indicators_ng (indicator

[Xfce4-commits] xfce4-indicator-plugin:master Updated description in the desktop file.

2013-09-01 Thread Andrzej
Updating branch refs/heads/master
 to 61a419b14233a7571c4f73c38bf66bf5ff3fea54 (commit)
   from 875e1368c231db19182f2813fec8f97a253ae81c (commit)

commit 61a419b14233a7571c4f73c38bf66bf5ff3fea54
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Sep 1 23:54:47 2013 +0100

Updated description in the desktop file.

 panel-plugin/indicator.desktop.in.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel-plugin/indicator.desktop.in.in 
b/panel-plugin/indicator.desktop.in.in
index fd706e9..1088949 100644
--- a/panel-plugin/indicator.desktop.in.in
+++ b/panel-plugin/indicator.desktop.in.in
@@ -2,7 +2,7 @@
 Type=X-XFCE-PanelPlugin
 Encoding=UTF-8
 _Name=Indicator Plugin
-_Comment=An indicator of something that needs your attention on the desktop
+_Comment=Provides a panel area for Unity indicators. Indicators allow 
applications and system services to display their status and interact with the 
user.
 Icon=xfce4-indicator-plugin
 X-XFCE-Module=indicator-plugin
 X-XFCE-Internal=FALSE
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Merge branch 'master' of ssh://git.xfce.org/panel-plugins/xfce4-indicator-plugin

2013-09-01 Thread Andrzej
Updating branch refs/heads/master
 to 875e1368c231db19182f2813fec8f97a253ae81c (commit)
   from 19b21aa33d6bb38c4456d506da8b2cdc75114c09 (commit)

commit 875e1368c231db19182f2813fec8f97a253ae81c
Merge: 19b21aa 919f8d8
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Sep 1 23:45:53 2013 +0100

Merge branch 'master' of 
ssh://git.xfce.org/panel-plugins/xfce4-indicator-plugin

commit 919f8d88547599b90db0209e3e08f0bdab040793
Author: Anonymous nore...@xfce.org
Date:   Mon Sep 2 00:31:37 2013 +0200

I18n: Update translation it (100%).

34 translated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/it.po |  126 +++---
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/po/it.po b/po/it.po
index da830af..45f551b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,34 +1,31 @@
-# Italian translations for xfce4-indicator-plugin
-# Traductions françaises de xfce4-indicator-plugin
-# Copyright (C) 2009 Mark Trompell m...@foresightlinux.org
-# This file is distributed under the same license as the 
xfce4-indicator-plugin package.
-# Cristian Marchi cri.pe...@gmail.com, 2011
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# mitakpa, 2013
 msgid 
 msgstr 
-Project-Id-Version: xfce4-indicator-plugin\n
+Project-Id-Version: Xfce Panel Plugins\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-04-20 07:24+\n
-PO-Revision-Date: 2011-05-29 11:44+0100\n
-Last-Translator: Cristian Marchi cri.pe...@gmail.com\n
-Language-Team: Italian xfce-it-translat...@googlegroups.com\n
+POT-Creation-Date: 2013-08-27 00:31+0200\n
+PO-Revision-Date: 2013-09-01 20:53+\n
+Last-Translator: mitakpa\n
+Language-Team: Italian 
(http://www.transifex.com/projects/p/xfce/language/it/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 Language: it\n
-Plural-Forms: nplurals=2; plural=n != 1;\n
-X-Poedit-Language: Italian\n
-X-Poedit-SourceCharset: utf-8\n
-X-Poedit-Country: ITALY\n
+Plural-Forms: nplurals=2; plural=(n != 1);\n
 
-#: ../panel-plugin/indicator.desktop.in.in.h:1 ../panel-plugin/indicator.c:157
-msgid An indicator of something that needs your attention on the desktop
-msgstr Un indicatore per qualsiasi cosa richieda attenzione sulla scrivania
-
-#: ../panel-plugin/indicator.desktop.in.in.h:2
+#: ../panel-plugin/indicator.desktop.in.in.h:1
 msgid Indicator Plugin
 msgstr Plugin indicatore
 
+#: ../panel-plugin/indicator.desktop.in.in.h:2 ../panel-plugin/indicator.c:157
+msgid An indicator of something that needs your attention on the desktop
+msgstr Un indicatore per qualsiasi cosa richieda attenzione sulla scrivania
+
 #: ../panel-plugin/indicator.c:159
 msgid Copyright (c) 2009-2013\n
 msgstr Copyright (c) 2009-2013\n
@@ -57,7 +54,7 @@ msgstr Gestione dell'energia
 
 #: ../panel-plugin/indicator-dialog.c:61
 msgid Application Menus (Global Menu)
-msgstr Menu applicazione (menu globale)
+msgstr Menu Applicazione (Menu Globale)
 
 #: ../panel-plugin/indicator-dialog.c:62
 msgid Session Management
@@ -71,44 +68,54 @@ msgstr Menu messaggistica
 msgid Date and Time
 msgstr Data e ora
 
-#: ../panel-plugin/indicator-dialog.c:436
+#: ../panel-plugin/indicator-dialog.c:65
+msgid Bluetooth
+msgstr Bluetooth
+
+#: ../panel-plugin/indicator-dialog.c:66
+msgid Sync Menu
+msgstr Menu Sincronizzazione
+
+#: ../panel-plugin/indicator-dialog.c:67
+msgid Workrave
+msgstr Workrave
+
+#: ../panel-plugin/indicator-dialog.c:441
 msgid Are you sure you want to clear the list of known indicators?
 msgstr Svuotare davvero l'elenco degli indicatori conosciuti?
 
-#: ../panel-plugin/indicator-dialog.c:581
+#: ../panel-plugin/indicator-dialog.c:586
 #, c-format
 msgid Unable to open the following url: %s
 msgstr Impossibile aprire il seguente indirizzo: %s
 
 #: ../panel-plugin/indicator-dialog.glade.h:1
-msgid iPlease restart the panel for visibility changes to take effect./i
-msgstr 
-iRiavviare il pannello per rendere effettive le modifiche di visibilità/i
+msgid Indicators
+msgstr Indicatori
 
 #: ../panel-plugin/indicator-dialog.glade.h:2
-msgid Align left in deskbar mode
-msgstr Allinea a sinistra in modalità deskbar
+msgid _Maximum row size (px):
+msgstr Dimensione massima della _riga (px):
 
 #: ../panel-plugin/indicator-dialog.glade.h:3
-msgid Appearance
-msgstr Aspetto
+msgid 
+Icons are scaled to fit a single row of the panel. Use this option to 
+restrict the maximum size of the row.
+msgstr Le icone sono scalate per adattarsi a una singola riga del pannello. 
Usare questa opzione per diminuire la dimensione dell'icona
 
 #: ../panel-plugin/indicator-dialog.glade.h:4
-msgid C_lear known indicators
-msgstr Elimina gli indicatori conosci_uti
+msgid Align left in deskbar mode
+msgstr Allinea a sinistra in modalità deskbar
 
 #: ../panel-plugin/indicator

[Xfce4-commits] xfce4-indicator-plugin:master Updated list of authors and plugin description.

2013-09-01 Thread Andrzej
Updating branch refs/heads/master
 to 19b21aa33d6bb38c4456d506da8b2cdc75114c09 (commit)
   from a90c20ede9871043dac90f2df6fd17cd37d446ce (commit)

commit 19b21aa33d6bb38c4456d506da8b2cdc75114c09
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Sep 1 23:44:05 2013 +0100

Updated list of authors and plugin description.

 panel-plugin/indicator.c |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
index 3947c5f..e812b48 100644
--- a/panel-plugin/indicator.c
+++ b/panel-plugin/indicator.c
@@ -151,10 +151,17 @@ indicator_show_about (XfcePanelPlugin *plugin)
 {
GdkPixbuf *icon;
 
-   const gchar *auth[] = {
- Mark Trompell m...@foresightlinux.org, Andrzej Radecki 
ndrwr...@gmail.com,
- Lionel Le Folgoc lio...@lefolgoc.net, Jason Conti 
jco...@launchpad.net,
- Nick Schermer n...@xfce.org, Evgeni Golov evg...@debian.org, NULL 
};
+   const gchar *auth[] =
+ {
+   Mark Trompell m...@foresightlinux.org,
+   Andrzej Radecki ndrwr...@gmail.com,
+   Lionel Le Folgoc lio...@lefolgoc.net,
+   Alistair Buxton a.j.bux...@gmail.com,
+   Jason Conti jco...@launchpad.net,
+   Nick Schermer n...@xfce.org,
+   Evgeni Golov evg...@debian.org,
+   NULL
+ };
 
g_return_if_fail (XFCE_IS_INDICATOR_PLUGIN (plugin));
 
@@ -164,7 +171,7 @@ indicator_show_about (XfcePanelPlugin *plugin)
  license, xfce_get_license_text 
(XFCE_LICENSE_TEXT_GPL),
  version, PACKAGE_VERSION,
  program-name, PACKAGE_NAME,
- comments, _(An indicator of something that needs 
your attention on the desktop),
+ comments, _(Provides a panel area for Unity 
indicators. Indicators allow applications and system services to display their 
status and interact with the user.),
  website, 
http://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin;,
  copyright, _(Copyright (c) 2009-2013\n),
  authors, auth, NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master preparing for a release

2013-09-01 Thread Andrzej
Updating branch refs/heads/master
 to 877d979bc5f8ab6eab424f7849dc20100307e77b (commit)
   from 6dc7c2e545d851351acf53ed7748845db40cdbd7 (commit)

commit 877d979bc5f8ab6eab424f7849dc20100307e77b
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Sep 2 00:03:30 2013 +0100

preparing for a release

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

diff --git a/ChangeLog b/ChangeLog
index 9cde7f6..8e40a75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+# created with git log --pretty=format:%ad %h %s %aN %aE --no-merges 
--date=short
+2013-09-01 6dc7c2e Updated .po files Andrzej ndrwr...@gmail.com
+2013-09-01 61a419b Updated description in the desktop file. Andrzej 
ndrwr...@gmail.com
+2013-09-01 19b21aa Updated list of authors and plugin description. Andrzej 
ndrwr...@gmail.com
+2013-09-02 919f8d8 I18n: Update translation it (100%). Anonymous 
nore...@xfce.org
+2013-09-01 a90c20e Refactored indicator loading functions. Andrzej 
ndrwr...@gmail.com
+2013-09-01 e993461 Updated the friendly name table. Andrzej 
ndrwr...@gmail.com
+2013-09-01 0bcb768 Remove panel version checking Andrzej ndrwr...@gmail.com
+2013-09-01 c86bf2c Make IDO library optional Andrzej ndrwr...@gmail.com
+2013-09-01 f949719 Call ido_init() Alistair Buxton a.j.bux...@gmail.com
+2013-09-01 99f974b Update the friendly name table. Alistair Buxton 
a.j.bux...@gmail.com
+2013-08-31 8d26ab0 Add libido to the build rules. Alistair Buxton 
a.j.bux...@gmail.com
+2013-09-01 48edafd Initial support for IndicatorNg service files Andrzej 
ndrwr...@gmail.com
+2013-08-31 05fdb4d I18n: Update translation hu (100%). Nucleo 
nuc...@indamail.hu
+2013-08-31 0d48094 Added a log handler Andrzej ndrwr...@gmail.com
+2013-08-31 4eccf54 Cleanup Andrzej ndrwr...@gmail.com
+2013-08-30 4010e45 I18n: Update translation ko (100%). kentarch 
bkrh...@aol.com
+2013-08-30 56a2a08 Reworked button layout mechanism. Andrzej 
ndrwr...@gmail.com
+2013-08-30 f6b312b I18n: Update translation pt (100%). Sérgio Marques 
smarque...@gmail.com
+2013-08-28 5455bae I18n: Update translation pl (97%). Piotr Sokół 
pso...@jabster.pl
+2013-08-28 f669246 IndicatorButton: detect storage type Andrzej 
ndrwr...@gmail.com
+2013-08-27 01e0527 I18n: Update translation pt_BR (100%). Rafael Ferreira 
rafael.f...@gmail.com
+2013-08-27 c69bc0b I18n: Update translation nl (100%). Pjotr123 
pjotrverta...@gmail.com
+2013-08-27 e18290e I18n: Update translation fr (100%). jc1 
jc1.quebe...@gmail.com
+2013-08-27 0618450 I18n: Update translation bg (100%). cybercop 
cybercop_mont...@abv.bg
+2013-08-26 c19cf69 back to development Andrzej ndrwr...@gmail.com
+2013-08-26 6570cb8 preparing for a release Andrzej ndrwr...@gmail.com
 2013-08-26 f9608f5 make distcheck fix Andrzej ndrwr...@gmail.com
 2013-06-04 d0a61c0 make distcheck fixes Andrzej ndrwr...@gmail.com
 2013-08-26 e807eae Added more known indicators Andrzej ndrwr...@gmail.com
@@ -259,4 +286,4 @@
 2009-05-27 67c060d indicator is the one we need to check for Mark Trompell 
m...@foresightlinux.org
 2009-05-26 646fe35 Fix build issue with libtool 2.x Mark Trompell 
m...@foresightlinux.org
 2009-05-15 aa9f8f0 some random changes Mark Trompell m...@foresightlinux.org
-2009-05-15 ac4fe3f initial checkin Mark Trompell m...@foresightlinux.org
\ No newline at end of file
+2009-05-15 ac4fe3f initial checkin Mark Trompell m...@foresightlinux.org
diff --git a/configure.ac.in b/configure.ac.in
index 7b90506..3bc94e0 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -7,11 +7,11 @@ dnl ***
 dnl *** Version information ***
 dnl ***
 m4_define([indicator_version_major], [2])
-m4_define([indicator_version_minor], [0])
+m4_define([indicator_version_minor], [1])
 m4_define([indicator_version_micro], [0])
 m4_define([indicator_version_nano],  []) dnl leave this empty to have no nano 
version
 m4_define([indicator_version_build], [@REVISION@])
-m4_define([indicator_version_tag],   [git])
+m4_define([indicator_version_tag],   [])
 m4_define([indicator_version], 
[indicator_version_major().indicator_version_minor().indicator_version_micro()ifelse(indicator_version_nano(),
 [], [], [.indicator_version_nano()])ifelse(indicator_version_tag(), [git], 
[indicator_version_tag()-indicator_version_build()], 
[indicator_version_tag()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin|xfce4-indicator-plugin-2.1.0 Creating annotated tag xfce4-indicator-plugin-2.1.0

2013-09-01 Thread Andrzej
Updating annotated tag refs/tags/xfce4-indicator-plugin-2.1.0
 as new annotated tag
 to 9c8e0d932c3c79b083b5df0e0afaad456602518f (tag)
   succeeds xfce4-indicator-plugin-2.0.0-28-g6dc7c2e
  tagged by Andrzej ndrwr...@gmail.com
 on 2013-09-02 01:04 +0200

Andrzej (1):
  preparing for a release

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master back to development

2013-09-01 Thread Andrzej
Updating branch refs/heads/master
 to 2c3cac4b3aeeb13b5a53e9ac0d5a690060a91ab8 (commit)
   from 877d979bc5f8ab6eab424f7849dc20100307e77b (commit)

commit 2c3cac4b3aeeb13b5a53e9ac0d5a690060a91ab8
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Sep 2 01:15:46 2013 +0100

back to development

 configure.ac.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index 3bc94e0..f605117 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,7 +11,7 @@ m4_define([indicator_version_minor], [1])
 m4_define([indicator_version_micro], [0])
 m4_define([indicator_version_nano],  []) dnl leave this empty to have no nano 
version
 m4_define([indicator_version_build], [@REVISION@])
-m4_define([indicator_version_tag],   [])
+m4_define([indicator_version_tag],   [git])
 m4_define([indicator_version], 
[indicator_version_major().indicator_version_minor().indicator_version_micro()ifelse(indicator_version_nano(),
 [], [], [.indicator_version_nano()])ifelse(indicator_version_tag(), [git], 
[indicator_version_tag()-indicator_version_build()], 
[indicator_version_tag()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Force buttons to fit in the panel

2013-09-01 Thread Andrzej
Updating branch refs/heads/master
 to 8272c586561c90ff29eedf552099d7b7d701a575 (commit)
   from 2c3cac4b3aeeb13b5a53e9ac0d5a690060a91ab8 (commit)

commit 8272c586561c90ff29eedf552099d7b7d701a575
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Sep 2 02:35:31 2013 +0100

Force buttons to fit in the panel

 panel-plugin/indicator-box.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/indicator-box.c b/panel-plugin/indicator-box.c
index 4f0b98f..7dc744c 100644
--- a/panel-plugin/indicator-box.c
+++ b/panel-plugin/indicator-box.c
@@ -491,9 +491,9 @@ xfce_indicator_box_size_allocate (GtkWidget *widget,
   border_thickness = MAX (padding.left+padding.right+border.left+border.right,
   padding.top+padding.bottom+border.top+border.bottom);
 
-  size = ICON_SIZE + border_thickness;
   panel_size = indicator_config_get_panel_size (box-config);
-  nrows = MAX (1, panel_size / size);
+  size = MIN (ICON_SIZE + border_thickness, panel_size);
+  nrows = panel_size / size;
   //full_size = ((nrows-1)*panel_size + nrows*size) / nrows; // regular pitch, 
margins
   full_size = panel_size; // irregular pitch, no margins
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Initial support for IndicatorNg service files

2013-08-31 Thread Andrzej
Updating branch refs/heads/master
 to 48edafdc08b869bed74695ef257c0bd23c3cb3e3 (commit)
   from 05fdb4dd6c03d6c811448677973562cea51b5a83 (commit)

commit 48edafdc08b869bed74695ef257c0bd23c3cb3e3
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Sep 1 00:40:31 2013 +0100

Initial support for IndicatorNg service files

 panel-plugin/indicator-button-box.c |2 +-
 panel-plugin/indicator.c|  121 +++
 2 files changed, 122 insertions(+), 1 deletion(-)

diff --git a/panel-plugin/indicator-button-box.c 
b/panel-plugin/indicator-button-box.c
index 75285c1..d20840e 100644
--- a/panel-plugin/indicator-button-box.c
+++ b/panel-plugin/indicator-button-box.c
@@ -510,7 +510,7 @@ indicator_button_box_size_allocate (GtkWidget *widget,
   width  = allocation-width;
   height = allocation-height;
 
-  if (indicator_button_box_is_small (box)) // check  cache
+  if (indicator_button_box_is_small (box)  box-icon != NULL) // check  
cache
 {
   child_allocation.x = x + (width - ICON_SIZE + 1) / 2;
   child_allocation.y = y + (height - ICON_SIZE + 1) / 2;
diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
index 0e7b996..74d542e 100644
--- a/panel-plugin/indicator.c
+++ b/panel-plugin/indicator.c
@@ -36,6 +36,7 @@
 #include libxfce4util/libxfce4util.h
 #include libxfce4panel/xfce-panel-plugin.h
 #include libindicator/indicator-object.h
+#include libindicator/indicator-ng.h
 
 #include indicator.h
 #include indicator-box.h
@@ -64,6 +65,7 @@ static void indicator_mode_changed
 (XfcePanelPlu
 static void indicator_orientation_changed  
(XfcePanelPlugin   *plugin,
 
GtkOrientation orientation);
 #endif
+static gint indicator_load_indicators_ng   
(IndicatorPlugin   *indicator);
 
 
 struct _IndicatorPluginClass
@@ -332,6 +334,8 @@ indicator_construct (XfcePanelPlugin *plugin)
 g_dir_close (dir);
   }
 
+  indicators_loaded += indicator_load_indicators_ng (indicator);
+
   if (indicators_loaded == 0) {
 /* A label to allow for click through */
 indicator-item = xfce_indicator_button_new (NULL,
@@ -360,6 +364,8 @@ entry_added (IndicatorObject * io, IndicatorObjectEntry * 
entry, gpointer user_d
plugin,
indicator-config);
 
+  g_debug(Entry added for io=%s, io_name);
+
   /* remove placeholder item when there are real entries to be added */
   if (indicator-item != NULL)
 {
@@ -436,6 +442,121 @@ load_module (const gchar * name, IndicatorPlugin * 
indicator)
 }
 
 
+static void
+load_indicator (IndicatorPlugin *indicator,
+   IndicatorObject *io,
+   const gchar *name)
+{
+  GList*entries, *entry;
+  IndicatorObjectEntry *entrydata;
+
+  g_debug (Load indicator_ng: %s, name);
+
+  indicator_config_add_known_indicator (indicator-config, name);
+
+  g_object_set_data (G_OBJECT (io), io-name, g_strdup (name));
+
+  /* Connect to its signals */
+  g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,
+   G_CALLBACK(entry_added), indicator);
+  g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED,
+   G_CALLBACK(entry_removed), indicator-buttonbox);
+
+  /* Work on the entries */
+  entries = indicator_object_get_entries(io);
+  entry = NULL;
+
+  for (entry = entries; entry != NULL; entry = g_list_next(entry))
+{
+  entrydata = (IndicatorObjectEntry *)entry-data;
+  entry_added(io, entrydata, indicator);
+}
+
+  g_list_free(entries);
+}
+
+
+
+#define INDICATORS_NG_DIR /usr/share/unity/indicators
+
+static gint
+indicator_load_indicators_ng (IndicatorPlugin *indicator)
+{
+  GDir*indicators_ng_dir;
+  const gchar *io_name;
+  GError  *err = NULL;
+  gint indicators = 0;
+  gchar   *file_name = NULL;
+  IndicatorNg *indicator_ng = NULL;
+
+  g_return_val_if_fail (XFCE_IS_INDICATOR_PLUGIN (indicator), 0);
+
+  indicators_ng_dir = g_dir_open (INDICATORS_NG_DIR, 0, err);
+
+  if (!indicators_ng_dir)
+{
+  g_warning (%s, err-message);
+  g_error_free (err);
+
+  return 0;
+}
+
+  if (indicator_config_get_mode_whitelist (indicator-config))
+{
+  while ((io_name = g_dir_read_name (indicators_ng_dir)) != NULL)
+   {
+  if (indicator_config_is_whitelisted (indicator-config, io_name))
+{
+  g_debug (Loading whitelisted IndicatorNg: %s, io_name);
+ file_name = g_build_filename (INDICATORS_NG_DIR, io_name, NULL);
+ indicator_ng = indicator_ng_new_for_profile (file_name, 
desktop, err);
+ g_free (file_name);
+ if (indicator_ng)
+   {
+ load_indicator (indicator, INDICATOR_OBJECT (indicator_ng

[Xfce4-commits] xfce4-indicator-plugin:master Merge branch 'master' of ssh://git.xfce.org/panel-plugins/xfce4-indicator-plugin

2013-08-30 Thread Andrzej
Updating branch refs/heads/master
 to 2ce2d1f185c0abf1a270cc7024629b944cec9ea5 (commit)
   from 0d48094558b03f3d5c66708b0a919db996985f8f (commit)

commit 2ce2d1f185c0abf1a270cc7024629b944cec9ea5
Merge: 0d48094 4010e45
Author: Andrzej ndrwr...@gmail.com
Date:   Sat Aug 31 03:11:24 2013 +0100

Merge branch 'master' of 
ssh://git.xfce.org/panel-plugins/xfce4-indicator-plugin

commit 4010e45e0cb54d2b848f9d47d647cd144a7b7774
Author: kentarch bkrh...@aol.com
Date:   Fri Aug 30 06:31:28 2013 +0200

I18n: Update translation ko (100%).

34 translated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/ko.po |  125 +-
 1 file changed, 66 insertions(+), 59 deletions(-)

diff --git a/po/ko.po b/po/ko.po
index 44b98c1..beffdac 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,32 +1,32 @@
-# Korean translation for the xfce4-indicator-plugin package.
-# Copyright (C) 2009-2012 Mark Trompell et al.
-# This file is distributed under the same license as the 
xfce4-indicator-plugin package.
-# Seong-ho Cho darkcircle.0...@gmail.com, 2012, 2013
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# kentarch bkrh...@aol.com, 2013
+# Darkcircle darkcircle.0...@gmail.com, 2012-2013
 msgid 
 msgstr 
-Project-Id-Version: xfce4-indicator-plugin\n
+Project-Id-Version: Xfce Panel Plugins\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-05-12 03:51+\n
-PO-Revision-Date: 2013-05-12 15:56+0900\n
-Last-Translator: Seong-ho Cho darkcircle.0...@gmail.com\n
-Language-Team: xfce-i18n xfce-i...@xfce.org\n
-Language: ko\n
+POT-Creation-Date: 2013-08-27 00:31+0200\n
+PO-Revision-Date: 2013-08-30 00:41+\n
+Last-Translator: kentarch bkrh...@aol.com\n
+Language-Team: Korean 
(http://www.transifex.com/projects/p/xfce/language/ko/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: ko\n
 Plural-Forms: nplurals=1; plural=0;\n
-X-Poedit-SourceCharset: utf-8\n
-X-Generator: Poedit 1.5.5\n
-
-#: ../panel-plugin/indicator.desktop.in.in.h:1 ../panel-plugin/indicator.c:157
-msgid An indicator of something that needs your attention on the desktop
-msgstr 데스크톱에서 주목해야 하는 요소를 표시합니다
 
-#: ../panel-plugin/indicator.desktop.in.in.h:2
+#: ../panel-plugin/indicator.desktop.in.in.h:1
 msgid Indicator Plugin
 msgstr 표시기 플러그인
 
+#: ../panel-plugin/indicator.desktop.in.in.h:2 ../panel-plugin/indicator.c:157
+msgid An indicator of something that needs your attention on the desktop
+msgstr 데스크톱에서 주목해야 하는 요소를 표시합니다
+
 #: ../panel-plugin/indicator.c:159
 msgid Copyright (c) 2009-2013\n
 msgstr Copyright (c) 2009-2013\n
@@ -35,7 +35,8 @@ msgstr Copyright (c) 2009-2013\n
 msgid No Indicators
 msgstr 표시기 없음
 
-#. raw name,  pretty name, 
icon-name(?)
+#. raw name,  pretty name,
+#. icon-name(?)
 #: ../panel-plugin/indicator-dialog.c:57
 msgid Application Indicators
 msgstr 프로그램 표시기
@@ -68,42 +69,54 @@ msgstr 대화보내기 메뉴
 msgid Date and Time
 msgstr 날짜와 시간
 
-#: ../panel-plugin/indicator-dialog.c:436
+#: ../panel-plugin/indicator-dialog.c:65
+msgid Bluetooth
+msgstr 블루투스 
+
+#: ../panel-plugin/indicator-dialog.c:66
+msgid Sync Menu
+msgstr 메뉴 동기화 
+
+#: ../panel-plugin/indicator-dialog.c:67
+msgid Workrave
+msgstr 휴식 알림
+
+#: ../panel-plugin/indicator-dialog.c:441
 msgid Are you sure you want to clear the list of known indicators?
 msgstr 정말로 알려진 표시기 목록을 지우시렵니까?
 
-#: ../panel-plugin/indicator-dialog.c:581
+#: ../panel-plugin/indicator-dialog.c:586
 #, c-format
 msgid Unable to open the following url: %s
 msgstr 다음 URL을 열 수 없습니다: %s
 
 #: ../panel-plugin/indicator-dialog.glade.h:1
-msgid iPlease restart the panel for visibility changes to take effect./i
-msgstr i바뀐 가시성 설정을  적용하려면 패널을 다시 시작하십시오./i
+msgid Indicators
+msgstr 표시기
 
 #: ../panel-plugin/indicator-dialog.glade.h:2
-msgid Align left in deskbar mode
-msgstr 데스크 표시줄 모드에서 왼쪽으로 정렬
+msgid _Maximum row size (px):
+msgstr 최대 행 높이(px)(_M):
 
 #: ../panel-plugin/indicator-dialog.glade.h:3
-msgid Appearance
-msgstr 모양새
+msgid 
+Icons are scaled to fit a single row of the panel. Use this option to 
+restrict the maximum size of the row.
+msgstr 패널 한 줄에 맞추려 아이콘의 크기를 조절했습니다. 행의 최대 높이를 제한하려면 이 옵션을 사용하십시오.
 
 #: ../panel-plugin/indicator-dialog.glade.h:4
-msgid C_lear known indicators
-msgstr 알려진 표시기 지우기(_L)
+msgid Align left in deskbar mode
+msgstr 데스크 표시줄 모드에서 왼쪽으로 정렬
 
 #: ../panel-plugin/indicator-dialog.glade.h:5
 msgid 
 Controls the indicator button layout when the panel is in a Deskbar mode. 
 Possible choices are \centered\ or \aligned left\.
-msgstr 
-패널이 데스크 표시줄 모드일 때 표시기 단추 배치를 다룹니다. 가능한 선택은 
-\가운데 정렬\과 \왼쪽 정렬\이 있습니다.
+msgstr 패널이 데스크 표시줄 모드일 때 표시기 단추 배치를 다룹니다. 가능한 선택은 \가운데 정렬\과 \왼쪽 정렬\이 
있습니다.
 
 #: ../panel-plugin/indicator-dialog.glade.h:6
-msgid Hidden

[Xfce4-commits] xfce4-indicator-plugin:master Added a log handler

2013-08-30 Thread Andrzej
Updating branch refs/heads/master
 to 0d48094558b03f3d5c66708b0a919db996985f8f (commit)
   from 4eccf5405f8c7101c071110c54a108cdab9b3a48 (commit)

commit 0d48094558b03f3d5c66708b0a919db996985f8f
Author: Andrzej ndrwr...@gmail.com
Date:   Sat Aug 31 00:52:17 2013 +0100

Added a log handler

 panel-plugin/indicator.c |   54 ++
 1 file changed, 54 insertions(+)

diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
index 26d0ebb..0e7b996 100644
--- a/panel-plugin/indicator.c
+++ b/panel-plugin/indicator.c
@@ -82,6 +82,9 @@ struct _IndicatorPlugin
 
   /* indicator settings */
   IndicatorConfig *config;
+
+  /* log file */
+  FILE*logfile;
 };
 
 
@@ -119,6 +122,11 @@ indicator_init (IndicatorPlugin *indicator)
  plugin but not internal one (loaded by xfce4-panel itself).
  The following lines makes only g_error critical. */
   g_log_set_always_fatal (G_LOG_LEVEL_ERROR);
+
+  indicator-item  = NULL;
+  indicator-buttonbox = NULL;
+  indicator-config= NULL;
+  indicator-logfile   = NULL;
 }
 
 
@@ -225,6 +233,49 @@ indicator_size_changed (XfcePanelPlugin *plugin,
 }
 
 
+
+static void
+indicator_log_handler (const gchar*domain,
+   GLogLevelFlags  level,
+   const gchar*message,
+   gpointerdata)
+{
+  IndicatorPlugin *indicator = XFCE_INDICATOR_PLUGIN (data);
+  gchar   *path;
+  const gchar *prefix;
+
+  if (indicator-logfile == NULL)
+{
+  g_mkdir_with_parents (g_get_user_cache_dir (), 0755);
+  path = g_build_filename (g_get_user_cache_dir (), 
xfce4-indicator-plugin.log, NULL);
+  indicator-logfile = fopen (path, w);
+  g_free (path);
+}
+
+  if (indicator-logfile)
+{
+  switch (level  G_LOG_LEVEL_MASK)
+{
+case G_LOG_LEVEL_ERROR:prefix = ERROR;break;
+case G_LOG_LEVEL_CRITICAL: prefix = CRITICAL; break;
+case G_LOG_LEVEL_WARNING:  prefix = WARNING;  break;
+case G_LOG_LEVEL_MESSAGE:  prefix = MESSAGE;  break;
+case G_LOG_LEVEL_INFO: prefix = INFO; break;
+case G_LOG_LEVEL_DEBUG:prefix = DEBUG;break;
+default:   prefix = LOG;  break;
+}
+
+  fprintf (indicator-logfile, %-10s %-25s %s\n, prefix, domain, 
message);
+  fflush (indicator-logfile);
+}
+
+  /* print log to the stdout */
+  if (level  G_LOG_LEVEL_ERROR || level  G_LOG_LEVEL_CRITICAL)
+g_log_default_handler (domain, level, message, NULL);
+}
+
+
+
 static void
 indicator_construct (XfcePanelPlugin *plugin)
 {
@@ -238,6 +289,9 @@ indicator_construct (XfcePanelPlugin *plugin)
   /* setup transation domain */
   xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, UTF-8);
 
+  /* log messages to a file */
+  g_log_set_default_handler(indicator_log_handler, plugin);
+
   /* Init some theme/icon stuff */
   gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
   INDICATOR_ICONS_DIR);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Cleanup

2013-08-30 Thread Andrzej
Updating branch refs/heads/master
 to 4eccf5405f8c7101c071110c54a108cdab9b3a48 (commit)
   from 5a3fddd9491426337cb2e52bd4c537228ec0b0bb (commit)

commit 4eccf5405f8c7101c071110c54a108cdab9b3a48
Author: Andrzej ndrwr...@gmail.com
Date:   Sat Aug 31 00:51:59 2013 +0100

Cleanup

 panel-plugin/Makefile.am|   50 +--
 panel-plugin/indicator-box.c|   14 +-
 panel-plugin/indicator-button-box.c |7 ++---
 panel-plugin/indicator-button.c |1 -
 panel-plugin/indicator-config.c |2 +-
 5 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index f2d4f23..3acf147 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,8 +1,8 @@
 
-INCLUDES = 
\
-   -I$(top_srcdir) 
\
-   -DG_LOG_DOMAIN=\libindicator-plugin\  \
-   -DPACKAGE_LOCALE_DIR=\$(localedir)\   \
+INCLUDES = \
+   -I$(top_srcdir) \
+   -DG_LOG_DOMAIN=\libindicator-plugin\ \
+   -DPACKAGE_LOCALE_DIR=\$(localedir)\ \
$(PLATFORM_CPPFLAGS)
 
 #
@@ -19,28 +19,28 @@ libindicator_built_sources = \
 
 libindicator_plugin_la_SOURCES = \
$(libindicator_built_sources) \
-   indicator-config.c  
\
-   indicator-config.h  
\
-   indicator-button-box.c  
\
-   indicator-button-box.h  
\
-   indicator-button.c  
\
-   indicator-button.h  
\
-   indicator-box.c 
\
-   indicator-box.h 
\
+   indicator-config.c \
+   indicator-config.h \
+   indicator-button-box.c \
+   indicator-button-box.h \
+   indicator-button.c \
+   indicator-button.h \
+   indicator-box.c \
+   indicator-box.h \
indicator-dialog.c \
indicator-dialog.h \
-   indicator.c 
\
-   indicator.h 

+   indicator.c \
+   indicator.h
 
 libindicator_plugin_la_CFLAGS = \
$(GTK_CFLAGS) \
-   $(LIBXFCE4UTIL_CFLAGS)  \
+   $(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
-   $(LIBXFCE4PANEL_CFLAGS) \
-   $(XFCONF_CFLAGS)\
-   $(INDICATOR_CFLAGS) \
-   $(PLATFORM_CFLAGS)  \
-   -DDATADIR=\$(datadir)\  \
+   $(LIBXFCE4PANEL_CFLAGS) \
+   $(XFCONF_CFLAGS) \
+   $(INDICATOR_CFLAGS) \
+   $(PLATFORM_CFLAGS) \
+   -DDATADIR=\$(datadir)\ \
-DINDICATOR_ICONS_DIR=\$(INDICATORICONSDIR)\ \
-DINDICATOR_DIR=\$(INDICATORDIR)\
 
@@ -53,16 +53,16 @@ libindicator_plugin_la_LDFLAGS = \
 
 libindicator_plugin_la_LIBADD = \
$(GTK_LIBS) \
-   $(LIBXFCE4UTIL_LIBS)\
+   $(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
-   $(LIBXFCE4PANEL_LIBS)   \
-   $(XFCONF_LIBS)  \
+   $(LIBXFCE4PANEL_LIBS) \
+   $(XFCONF_LIBS) \
$(INDICATOR_LIBS)
 
 #
 # Desktop file
 #
-desktopdir =   
\
+desktopdir = \
$(datadir)/xfce4/panel/plugins
 
 desktop_in_files = \
@@ -72,7 +72,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST =   
\
+EXTRA_DIST = \
indicator-dialog.glade \
$(desktop_in_files)
 
diff --git a/panel-plugin/indicator-box.c b/panel-plugin/indicator-box.c
index bba6dd9..4f0b98f 100644
--- a/panel-plugin/indicator-box.c
+++ b/panel-plugin/indicator-box.c
@@ -305,18 +305,6 @@ xfce_indicator_box_child_type (GtkContainer *container)
 
 
 
-static gint
-xfce_indicator_box_get_row_size (XfceIndicatorBox *box)
-{
-  return MIN (indicator_config_get_panel_size (box-config) /
-  indicator_config_get_nrows (box-config),
-  indicator_config_get_row_size_max (box-config));
-}
-
-
-
-
-
 static void
 xfce_indicator_box_get_preferred_length (GtkWidget *widget

[Xfce4-commits] xfce4-indicator-plugin:master Merge branch 'master' of ssh://git.xfce.org/panel-plugins/xfce4-indicator-plugin

2013-08-29 Thread Andrzej
Updating branch refs/heads/master
 to 5a3fddd9491426337cb2e52bd4c537228ec0b0bb (commit)
   from 56a2a08d2c30713e8fcbc83d46a01f4d2aa6884b (commit)

commit 5a3fddd9491426337cb2e52bd4c537228ec0b0bb
Merge: 56a2a08 f6b312b
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Aug 30 01:35:11 2013 +0100

Merge branch 'master' of 
ssh://git.xfce.org/panel-plugins/xfce4-indicator-plugin

commit f6b312b1bc4c66f09a8b67afbb06545f4b7ff9d8
Author: Sérgio Marques smarque...@gmail.com
Date:   Fri Aug 30 00:31:48 2013 +0200

I18n: Update translation pt (100%).

34 translated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/pt.po |  112 +-
 1 file changed, 59 insertions(+), 53 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 856d7b6..9fcd932 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,31 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR EMAIL@ADDRESS, YEAR.
 # 
+# Translators:
+# Sérgio Marques smarque...@gmail.com, 2013
 msgid 
 msgstr 
-Project-Id-Version: indicator-plugin\n
+Project-Id-Version: Xfce Panel Plugins\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-05-07 10:27+\n
-PO-Revision-Date: 2012-01-08 22:16-\n
+POT-Creation-Date: 2013-08-27 00:31+0200\n
+PO-Revision-Date: 2013-08-29 21:59+\n
 Last-Translator: Sérgio Marques smarque...@gmail.com\n
-Language-Team: \n
+Language-Team: Portuguese 
(http://www.transifex.com/projects/p/xfce/language/pt/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-Language: \n
-X-Poedit-Language: Portuguese\n
-X-Poedit-Country: PORTUGAL\n
+Language: pt\n
+Plural-Forms: nplurals=2; plural=(n != 1);\n
 
-#: ../panel-plugin/indicator.desktop.in.in.h:1 ../panel-plugin/indicator.c:157
-msgid An indicator of something that needs your attention on the desktop
-msgstr Uma indicação sobre algo que requer a sua atenção
-
-#: ../panel-plugin/indicator.desktop.in.in.h:2
+#: ../panel-plugin/indicator.desktop.in.in.h:1
 msgid Indicator Plugin
 msgstr \Plug-in\ Indicador
 
+#: ../panel-plugin/indicator.desktop.in.in.h:2 ../panel-plugin/indicator.c:157
+msgid An indicator of something that needs your attention on the desktop
+msgstr Uma indicação sobre algo que requer a sua atenção
+
 #: ../panel-plugin/indicator.c:159
 msgid Copyright (c) 2009-2013\n
 msgstr Direitos de autor (c) 2009-2013\n
@@ -68,42 +68,54 @@ msgstr Menu de mensagens instantâneas 
 msgid Date and Time
 msgstr Data e hora
 
-#: ../panel-plugin/indicator-dialog.c:436
+#: ../panel-plugin/indicator-dialog.c:65
+msgid Bluetooth
+msgstr Bluetooth
+
+#: ../panel-plugin/indicator-dialog.c:66
+msgid Sync Menu
+msgstr Sincronizar menu
+
+#: ../panel-plugin/indicator-dialog.c:67
+msgid Workrave
+msgstr Workrave
+
+#: ../panel-plugin/indicator-dialog.c:441
 msgid Are you sure you want to clear the list of known indicators?
 msgstr Tem a certeza que deseja limpar a lista de indicadores?
 
-#: ../panel-plugin/indicator-dialog.c:581
+#: ../panel-plugin/indicator-dialog.c:586
 #, c-format
 msgid Unable to open the following url: %s
 msgstr Não foi possível abri o URL: %s
 
 #: ../panel-plugin/indicator-dialog.glade.h:1
-msgid iPlease restart the panel for visibility changes to take effect./i
-msgstr iReinicie o painel para aplicar as alterações./i
+msgid Indicators
+msgstr Indicadores
 
 #: ../panel-plugin/indicator-dialog.glade.h:2
-msgid Align left in deskbar mode
-msgstr Alinha na esquerdo no modo de barra de applets
+msgid _Maximum row size (px):
+msgstr Tamanho _máximo da linha (px):
 
 #: ../panel-plugin/indicator-dialog.glade.h:3
-msgid Appearance
-msgstr Aparência
+msgid 
+Icons are scaled to fit a single row of the panel. Use this option to 
+restrict the maximum size of the row.
+msgstr Os ícones são ajustados a uma linha do painel. Utilize esta opção para 
restringir o tamanho máximo dos ícones.
 
 #: ../panel-plugin/indicator-dialog.glade.h:4
-msgid C_lear known indicators
-msgstr _Limpar indicadores
+msgid Align left in deskbar mode
+msgstr Alinha na esquerdo no modo de barra de applets
 
 #: ../panel-plugin/indicator-dialog.glade.h:5
 msgid 
 Controls the indicator button layout when the panel is in a Deskbar mode. 
 Possible choices are \centered\ or \aligned left\.
-msgstr 
-Controla o esquema do botão indicador quando o painel está no modo de barra 
-de applets. As escolhas possíveis são centrado ou alinhado à esquerda.
+msgstr Controla o esquema do botão indicador quando o painel está no modo de 
barra de applets. As escolhas possíveis são centrado ou alinhado à esquerda.
 
 #: ../panel-plugin/indicator-dialog.glade.h:6
-msgid Hidden
-msgstr Oculto
+msgid Appearance
+msgstr Aparência
 
 #: ../panel-plugin/indicator-dialog.glade.h:7
 msgid Hide indicators by default
@@ -111,48 +123,42 @@ msgstr Por omissão, ocultar

[Xfce4-commits] xfce4-indicator-plugin:master Reworked button layout mechanism.

2013-08-29 Thread Andrzej
Updating branch refs/heads/master
 to 56a2a08d2c30713e8fcbc83d46a01f4d2aa6884b (commit)
   from 5455baee861dbf23c57c220381d0791feca7fe5c (commit)

commit 56a2a08d2c30713e8fcbc83d46a01f4d2aa6884b
Author: Andrzej ndrwr...@gmail.com
Date:   Fri Aug 30 01:34:40 2013 +0100

Reworked button layout mechanism.

 panel-plugin/Makefile.am|2 +
 panel-plugin/indicator-box.c|   86 +++--
 panel-plugin/indicator-button-box.c |  586 +++
 panel-plugin/indicator-button-box.h |   55 
 panel-plugin/indicator-button.c |  396 ++-
 panel-plugin/indicator-button.h |8 +-
 6 files changed, 742 insertions(+), 391 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 919a6dd..f2d4f23 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -21,6 +21,8 @@ libindicator_plugin_la_SOURCES = \
$(libindicator_built_sources) \
indicator-config.c  
\
indicator-config.h  
\
+   indicator-button-box.c  
\
+   indicator-button-box.h  
\
indicator-button.c  
\
indicator-button.h  
\
indicator-box.c 
\
diff --git a/panel-plugin/indicator-box.c b/panel-plugin/indicator-box.c
index 92e53ad..bba6dd9 100644
--- a/panel-plugin/indicator-box.c
+++ b/panel-plugin/indicator-box.c
@@ -33,6 +33,8 @@
 #include indicator-box.h
 #include indicator-button.h
 
+#define ICON_SIZE 22
+
 static void xfce_indicator_box_finalize (GObject   
   *object);
 static void xfce_indicator_box_list_changed 
(XfceIndicatorBox *box,
  
IndicatorConfig  *config);
@@ -324,25 +326,44 @@ xfce_indicator_box_get_preferred_length (GtkWidget 
*widget,
   XfceIndicatorButton *button;
   GtkRequisition   child_req;
   GList   *known_indicators, *li, *li_int, *li_tmp;
-  gint panel_size;
+  gint panel_size, size;
   gint length;
   gint row;
   gint nrows;
   gint x;
-  gboolean has_label, rectangular_icon;
+  gboolean is_small;
   GtkOrientation   panel_orientation;
-
+  GtkStyleContext *ctx;
+  GtkBorderpadding, border;
+  gint border_thickness;
+
+  /* check border thickness of the first button */
+  li = gtk_container_get_children (GTK_CONTAINER (box));
+  if (li == NULL)
+return;
+
+  button = XFCE_INDICATOR_BUTTON (li-data);
+  ctx = gtk_widget_get_style_context (GTK_WIDGET (button));
+  gtk_style_context_get_padding (ctx, gtk_widget_get_state_flags (GTK_WIDGET 
(button)), padding);
+  gtk_style_context_get_border (ctx, gtk_widget_get_state_flags (GTK_WIDGET 
(button)), border);
+  border_thickness = MAX (padding.left+padding.right+border.left+border.right,
+  padding.top+padding.bottom+border.top+border.bottom);
+
+  size = ICON_SIZE + border_thickness;
   panel_size = indicator_config_get_panel_size (box-config);
+  nrows = MAX (1, panel_size / size);
+
   panel_orientation = indicator_config_get_panel_orientation (box-config);
+
   row = 0;
   length = 0;
   x = 0;
-  nrows = panel_size / xfce_indicator_box_get_row_size (box);
 
   if (g_hash_table_lookup (box-children, placeholder) != NULL)
 known_indicators = g_list_append (NULL, placeholder);
   else
 known_indicators = indicator_config_get_known_indicators (box-config);
+
   for (li = known_indicators; li != NULL; li = li-next)
 {
   li_int = g_hash_table_lookup (box-children, li-data);
@@ -351,11 +372,11 @@ xfce_indicator_box_get_preferred_length (GtkWidget 
*widget,
   button = XFCE_INDICATOR_BUTTON (li_tmp-data);
 
   gtk_widget_get_preferred_size (GTK_WIDGET (button), NULL, 
child_req);
-  has_label = (xfce_indicator_button_get_label (button) != NULL);
-  rectangular_icon = xfce_indicator_button_is_icon_rectangular 
(button);
+
+  is_small = xfce_indicator_button_is_small (button);
 
   /* wrap rows if column is overflowing or a label is encountered */
-  if (row  0  (has_label || row = nrows || rectangular_icon))
+  if (row  0  (row = nrows || !is_small))
 {
   x += length;
   row = 0;
@@ -365,7 +386,7 @@ xfce_indicator_box_get_preferred_length (GtkWidget *widget,
   length =
 MAX (length

[Xfce4-commits] xfce4-indicator-plugin:master IndicatorButton: detect storage type

2013-08-27 Thread Andrzej
Updating branch refs/heads/master
 to f669246582758f933f1679aadb34b8376f9a9cab (commit)
   from 01e0527650a0bf5a85936efd3869896c58ee0931 (commit)

commit f669246582758f933f1679aadb34b8376f9a9cab
Author: Andrzej ndrwr...@gmail.com
Date:   Wed Aug 28 00:30:56 2013 +0100

IndicatorButton: detect storage type

 panel-plugin/indicator-button.c |   33 -
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/panel-plugin/indicator-button.c b/panel-plugin/indicator-button.c
index 93c49c8..67b5b6a 100644
--- a/panel-plugin/indicator-button.c
+++ b/panel-plugin/indicator-button.c
@@ -260,6 +260,7 @@ xfce_indicator_button_update_icon (XfceIndicatorButton 
*button)
   gint  border_thickness;
   GtkStyleContext  *ctx;
   GtkBorder padding, border;
+  GtkImageType  storage;
 
   g_return_if_fail (GTK_IS_IMAGE (button-orig_icon));
   g_return_if_fail (GTK_IS_IMAGE (button-icon));
@@ -278,7 +279,37 @@ xfce_indicator_button_update_icon (XfceIndicatorButton 
*button)
 size = 24;
 #endif
 
-  pixbuf_s = gtk_image_get_pixbuf (GTK_IMAGE (button-orig_icon));
+  storage = gtk_image_get_storage_type (GTK_IMAGE (button-orig_icon));
+
+  if (storage == GTK_IMAGE_PIXBUF || storage == GTK_IMAGE_EMPTY)
+{
+  pixbuf_s = gtk_image_get_pixbuf (GTK_IMAGE (button-orig_icon));
+}
+  else if (storage == GTK_IMAGE_GICON)
+{
+  GIcon *icon = NULL;
+  GtkIconSize size;
+  gtk_image_get_gicon (GTK_IMAGE (button-orig_icon), icon, size);
+  //printf (G_ICON %s ... %d\n, g_icon_to_string (icon), size);
+  gtk_image_set_from_gicon (GTK_IMAGE (button-icon),
+icon, size);
+  return;
+}
+  else if (storage == GTK_IMAGE_ICON_NAME)
+{
+  const gchar *icon_name = NULL;
+  GtkIconSize size;
+  gtk_image_get_icon_name (GTK_IMAGE (button-orig_icon), icon_name, 
size);
+  //printf (ICON_NAME %s ... %d\n, icon_name, size);
+  gtk_image_set_from_icon_name (GTK_IMAGE (button-icon),
+icon_name, size);
+  return;
+}
+  else
+{
+  printf (Unrecognized storage type);
+  return;
+}
 
   if (pixbuf_s != NULL)
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 Build fix with gtk3

2013-08-26 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 7683aab6dbd64de9d10b79d2118bd5702beec639 (commit)
   from 88c73508a09a05a7bc44833a9eaebc48072d4695 (commit)

commit 7683aab6dbd64de9d10b79d2118bd5702beec639
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Aug 26 18:29:17 2013 +0100

Build fix with gtk3

 libxfce4panel/Makefile.am |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am
index 384d15f..20b4e11 100644
--- a/libxfce4panel/Makefile.am
+++ b/libxfce4panel/Makefile.am
@@ -25,7 +25,6 @@ libxfce4panel_headers = \
libxfce4panel-config.h \
libxfce4panel-enums.h \
xfce-arrow-button.h \
-   xfce-hvbox.h \
xfce-panel-convenience.h \
xfce-panel-macros.h \
xfce-panel-macros-46.h \
@@ -38,11 +37,13 @@ libxfce4panel_includedir = \
 
 libxfce4panel_include_HEADERS = \
$(libxfce4panel_public_built_sources) \
-   $(libxfce4panel_headers)
+   $(libxfce4panel_headers) \
+   xfce-hvbox.h
 
 libxfce4panel_1_0_la_SOURCES = \
$(libxfce4panel_built_sources) \
$(libxfce4panel_headers) \
+   xfce-hvbox.h \
libxfce4panel-config.c \
xfce-arrow-button.c \
xfce-hvbox.c \
@@ -99,7 +100,7 @@ libxfce4panel_2_0_la_SOURCES = \
xfce-panel-image.c
 
 libxfce4panel_2_0_la_CFLAGS =   \
-   $(GTK_CFLAGS) \
+   $(GTK3_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(PLATFORM_CFLAGS)
 
@@ -111,7 +112,7 @@ libxfce4panel_2_0_la_LDFLAGS = \
$(PLATFORM_LDFLAGS)
 
 libxfce4panel_2_0_la_LIBADD = \
-   $(GTK_LIBS) \
+   $(GTK3_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
-lm
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 Workaround for a crash in gtk3 version of xfce4-indicator-plugin

2013-08-26 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to da5ff8004458575dd6561ed2763237623c17c1fc (commit)
   from 7683aab6dbd64de9d10b79d2118bd5702beec639 (commit)

commit da5ff8004458575dd6561ed2763237623c17c1fc
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Aug 26 18:30:06 2013 +0100

Workaround for a crash in gtk3 version of xfce4-indicator-plugin

 wrapper/wrapper-plug.c |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c
index 14bac51..173ebf6 100644
--- a/wrapper/wrapper-plug.c
+++ b/wrapper/wrapper-plug.c
@@ -111,9 +111,11 @@ wrapper_plug_init (WrapperPlug *plug)
   /* old versions of gtk don't support transparent tray icons, if we
* set an argb colormap on the tray, the icons won't be embedded because
* the socket-plugin implementation requires identical colormaps */
-  if (gtk_check_version (2, 16, 0) != NULL
-   strcmp (wrapper_name, systray) == 0)
-return;
+
+  /* FIXIT temporarily disabled because it crashes xfce4-indicator-plugin */
+  /* if (gtk_check_version (2, 16, 0) != NULL
+   * strcmp (wrapper_name, systray) == 0)
+   *  return; */
 
   /* set the colormap */
   screen = gtk_window_get_screen (GTK_WINDOW (plug));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 Fix to the previous commit

2013-08-26 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 156d16bf986935966631457e5656d7e1f2f05cd7 (commit)
   from da5ff8004458575dd6561ed2763237623c17c1fc (commit)

commit 156d16bf986935966631457e5656d7e1f2f05cd7
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Aug 26 20:01:05 2013 +0100

Fix to the previous commit

 wrapper/wrapper-plug.c |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c
index 173ebf6..5723a24 100644
--- a/wrapper/wrapper-plug.c
+++ b/wrapper/wrapper-plug.c
@@ -108,14 +108,14 @@ wrapper_plug_init (WrapperPlug *plug)
   /* allow painting, else compositing won't work */
   gtk_widget_set_app_paintable (GTK_WIDGET (plug), TRUE);
 
+#if !GTK_CHECK_VERSION (3, 0, 0)
   /* old versions of gtk don't support transparent tray icons, if we
* set an argb colormap on the tray, the icons won't be embedded because
* the socket-plugin implementation requires identical colormaps */
-
-  /* FIXIT temporarily disabled because it crashes xfce4-indicator-plugin */
-  /* if (gtk_check_version (2, 16, 0) != NULL
-   * strcmp (wrapper_name, systray) == 0)
-   *  return; */
+  if (gtk_check_version (2, 16, 0) != NULL
+   strcmp (wrapper_name, systray) == 0)
+return;
+#endif
 
   /* set the colormap */
   screen = gtk_window_get_screen (GTK_WINDOW (plug));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 Setting gtk3 StyleContext class in wrapper.

2013-08-26 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 6da51ed42ef4defb1bad63c44188e29373bd65cb (commit)
   from 156d16bf986935966631457e5656d7e1f2f05cd7 (commit)

commit 6da51ed42ef4defb1bad63c44188e29373bd65cb
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Aug 26 20:14:36 2013 +0100

Setting gtk3 StyleContext class in wrapper.

(reworked:
2820b5bc195adfc49490d9001f8f4e8677140203
Added panel class for theming.
3557ce18a3f0dfa88ebaa8c2f69f80e12fa69c5f
Use both .panel and .xfce4-panel style context classes
from nick/gtk3 branch)

 wrapper/wrapper-plug.c |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c
index 5723a24..6dc4432 100644
--- a/wrapper/wrapper-plug.c
+++ b/wrapper/wrapper-plug.c
@@ -91,8 +91,9 @@ static void
 wrapper_plug_init (WrapperPlug *plug)
 {
 #if GTK_CHECK_VERSION (3, 0, 0)
-  GdkVisual *visual = NULL;
-  GdkScreen *screen;
+  GdkVisual   *visual = NULL;
+  GdkScreen   *screen;
+  GtkStyleContext *context;
 #else
   GdkColormap *colormap = NULL;
   GdkScreen   *screen;
@@ -128,6 +129,13 @@ wrapper_plug_init (WrapperPlug *plug)
   if (colormap != NULL)
 gtk_widget_set_colormap (GTK_WIDGET (plug), colormap);
 #endif
+
+#if GTK_CHECK_VERSION (3, 0, 0)
+  /* set the panel class */
+  context = gtk_widget_get_style_context (GTK_WIDGET (plug));
+  gtk_style_context_add_class (context, panel);
+  gtk_style_context_add_class (context, xfce4-panel);
+#endif
 }
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Fixed repeated names and icons in the config dialog.

2013-08-26 Thread Andrzej
Updating branch refs/heads/master
 to 52ac036b161c7dc7c4607f30f8f1bb1dc3d4bf8d (commit)
   from 4ab0d62b1b2ed9b2d43fa375d4152bebd56305f5 (commit)

commit 52ac036b161c7dc7c4607f30f8f1bb1dc3d4bf8d
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Aug 26 21:54:47 2013 +0100

Fixed repeated names and icons in the config dialog.

 panel-plugin/indicator-dialog.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/panel-plugin/indicator-dialog.c b/panel-plugin/indicator-dialog.c
index e325975..caf4eb5 100644
--- a/panel-plugin/indicator-dialog.c
+++ b/panel-plugin/indicator-dialog.c
@@ -171,6 +171,8 @@ indicator_dialog_update_indicator_names (IndicatorDialog 
*dialog)
   name = li-data;
 
   /* check if we have a better name for the application */
+  pretty_name = NULL;
+  icon_name = NULL;
   for (i = 0; i  G_N_ELEMENTS (pretty_names); i++)
 {
   if (strcmp (name, pretty_names[i][0]) == 0)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master Added more known indicators

2013-08-26 Thread Andrzej
Updating branch refs/heads/master
 to e807eae675ef5ffc8b5da4910d1b58a688a05bb9 (commit)
   from 52ac036b161c7dc7c4607f30f8f1bb1dc3d4bf8d (commit)

commit e807eae675ef5ffc8b5da4910d1b58a688a05bb9
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Aug 26 21:55:28 2013 +0100

Added more known indicators

 panel-plugin/indicator-dialog.c |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/panel-plugin/indicator-dialog.c b/panel-plugin/indicator-dialog.c
index caf4eb5..e769628 100644
--- a/panel-plugin/indicator-dialog.c
+++ b/panel-plugin/indicator-dialog.c
@@ -60,8 +60,11 @@ static const gchar *pretty_names[][3] =
   { libpower.so,  N_(Power Management), 
NULL },
   { libappmenu.so,N_(Application Menus (Global Menu)),  
menu-editor },
   { libsession.so,N_(Session Management),   
NULL },
-  { libmessaging.so,  N_(Messaging Menu),   
indicator-messages },
+  { libmessaging.so,  N_(Messaging Menu),   
indicator-messages-new },
   { libdatetime.so,   N_(Date and Time),
time-admin },
+  { libbluetooth.so,  N_(Bluetooth),
bluetooth-active },
+  { libsyncindicator.so,  N_(Sync Menu),
sync-client-updating },
+  { libworkrave.so,   N_(Workrave), 
workrave },
 };
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master make distcheck fix

2013-08-26 Thread Andrzej
Updating branch refs/heads/master
 to f9608f5671abff3b582b7ba9719bfde4b3f96fb9 (commit)
   from d0a61c007b18cfacb15975803067bf0cc564ce07 (commit)

commit f9608f5671abff3b582b7ba9719bfde4b3f96fb9
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Aug 26 23:36:18 2013 +0100

make distcheck fix

 panel-plugin/Makefile.am |5 ++---
 po/POTFILES.skip |1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index e09af55..919a6dd 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -64,10 +64,9 @@ desktopdir = 
\
$(datadir)/xfce4/panel/plugins
 
 desktop_in_files = \
-   indicator.desktop.in
+   indicator.desktop.in.in
 
-desktop_DATA = 
\
-   $(desktop_in_files:.desktop.in=.desktop)
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 000..473cb6e
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1 @@
+panel-plugin/indicator.desktop.in
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master make distcheck fixes

2013-08-26 Thread Andrzej
Updating branch refs/heads/master
 to d0a61c007b18cfacb15975803067bf0cc564ce07 (commit)
   from e807eae675ef5ffc8b5da4910d1b58a688a05bb9 (commit)

commit d0a61c007b18cfacb15975803067bf0cc564ce07
Author: Andrzej ndrwr...@gmail.com
Date:   Tue Jun 4 22:05:35 2013 +0100

make distcheck fixes

 Makefile.am  |3 +++
 panel-plugin/Makefile.am |1 +
 2 files changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 56fdc91..a3fd5a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,9 @@ SUBDIRS =   
\
 distclean-local:
rm -rf *.cache *~
 
+distuninstallcheck_listfiles = 
\
+   find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache
+
 rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 4229737..e09af55 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -72,6 +72,7 @@ desktop_DATA =
\
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST =   
\
+   indicator-dialog.glade \
$(desktop_in_files)
 
 DISTCLEANFILES = \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master back to development

2013-08-26 Thread Andrzej
Updating branch refs/heads/master
 to c19cf696fc6e18f7364b1686eaf4fd3674f077ce (commit)
   from 6570cb8d49105800b57c6aeabd069d19f722ffe9 (commit)

commit c19cf696fc6e18f7364b1686eaf4fd3674f077ce
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Aug 26 23:52:47 2013 +0100

back to development

 configure.ac.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index 9fc3be2..d1f7532 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,7 +11,7 @@ m4_define([indicator_version_minor], [0])
 m4_define([indicator_version_micro], [0])
 m4_define([indicator_version_nano],  []) dnl leave this empty to have no nano 
version
 m4_define([indicator_version_build], [@REVISION@])
-m4_define([indicator_version_tag],   [])
+m4_define([indicator_version_tag],   [git])
 m4_define([indicator_version], 
[indicator_version_major().indicator_version_minor().indicator_version_micro()ifelse(indicator_version_nano(),
 [], [], [.indicator_version_nano()])ifelse(indicator_version_tag(), [git], 
[indicator_version_tag()-indicator_version_build()], 
[indicator_version_tag()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:master preparing for a release

2013-08-26 Thread Andrzej
Updating branch refs/heads/master
 to 6570cb8d49105800b57c6aeabd069d19f722ffe9 (commit)
   from f9608f5671abff3b582b7ba9719bfde4b3f96fb9 (commit)

commit 6570cb8d49105800b57c6aeabd069d19f722ffe9
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Aug 26 23:40:23 2013 +0100

preparing for a release

 ChangeLog   |  121 ++-
 configure.ac.in |6 +--
 2 files changed, 123 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e9e7c66..9cde7f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,127 @@
-# created with git log --pretty=format:%ad %h %s %aN %aE --no-merges 
--date=short
+2013-08-26 f9608f5 make distcheck fix Andrzej ndrwr...@gmail.com
+2013-06-04 d0a61c0 make distcheck fixes Andrzej ndrwr...@gmail.com
+2013-08-26 e807eae Added more known indicators Andrzej ndrwr...@gmail.com
+2013-08-26 52ac036 Fixed repeated names and icons in the config dialog. 
Andrzej ndrwr...@gmail.com
+2013-08-24 4ab0d62 I18n: Update translation cs (100%). Alois Nešpor 
i...@aloisnespor.info
+2013-08-19 a2d90a7 I18n: Update translation pl (74%). Piotr Strębski 
streb...@o2.pl
+2013-07-29 e0f5d31 I18n: Add new translation en_AU (100%). k3lt01 
keltoi...@gmail.com
+2013-07-27 8e346db I18n: Add new translation en_GB (100%). Noskcaj 
nosk...@ubuntu.com
+2013-07-21 e712cdd I18n: Update translation ro (100%). Mișu Moldovan 
du...@gnome.org
+2013-07-13 e9808bb Remove unneeded files. Nick Schermer n...@xfce.org
+2013-07-05 b66764c I18n: Add new translation eu (96%). Piarres Beobide 
p...@beobide.net
+2013-07-03 a97b0b8 I18n: Remove broken / unsupported translations. Nick 
Schermer n...@xfce.org
+2013-06-21 f722729 l10n: Updated Hungarian (hu) translation to 100% Imre 
Benedek nuc...@indamail.hu
+2013-06-21 f801f71 l10n: Updated Hungarian (hu) translation to 100% Imre 
Benedek nuc...@indamail.hu
+2013-06-15 b34b864 l10n: Updated Indonesian (id) translation to 100% Ardjuna 
asyur...@gmail.com
+2013-06-11 4394f10 l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 
100% Neliton Pereira Junior neliton...@gmail.com
+2013-05-30 146bdfa l10n: Updated Chinese (China) (zh_CN) translation to 100% 
Chipong Luo chipong@yahoo.com
+2013-05-12 eb1555f l10n: Updated Korean (ko) translation to 100% Seong-ho Cho 
darkcircle.0...@gmail.com
+2013-05-08 ba1b92c l10n: Updated Basque (eu) translation to 96% Piarres 
Beobide p...@beobide.net
+2013-05-07 00109c1 l10n: Updated Portuguese (pt) translation to 100% Sergio 
Marques smarque...@gmail.com
+2013-05-03 143c07e l10n: Updated Spanish (Castilian) (es) translation to 100% 
Francisco Javier Serrador fserra...@gmail.com
+2013-04-28 8af47d6 l10n: Updated Bulgarian (bg) translation to 100% Kiril 
Kirilov cybercop_mont...@abv.bg
+2013-04-26 abe8deb l10n: Updated Dutch (Flemish) (nl) translation to 100% 
Pjotr vertaalt pjotrverta...@gmail.com
+2013-04-22 46f43f3 Improved icon sizing. Andrzej ndrwr...@gmail.com
+2013-04-22 816b45a l10n: Updated German (de) translation to 100% Mark Trompell 
m...@foresightlinux.org
+2013-04-21 f97c212 l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 
100% Rafael Ferreira rafael.f...@gmail.com
+2013-04-21 9494786 l10n: Updated Russian (ru) translation to 100% Roman K 
mrdoctor...@gmail.com
+2013-04-20 d2c81b2 tweak de.po Mark Trompell m...@foresightlinux.org
+2013-04-20 51c1aac l10n: Updated Italian (it) translation to 100% Cristian 
Marchi cri.pe...@gmail.com
+2013-04-19 523cb8c merge de.po Mark Trompell m...@foresightlinux.org
+2013-04-18 ae89a56 l10n: Updated Ukrainian (uk) translation to 100% Yarema aka 
Knedlyk yupad...@gmail.com
+2013-04-18 8cb9bdf l10n: Updated Dutch (Flemish) (nl) translation to 100% 
Pjotr vertaalt pjotrverta...@gmail.com
+2013-04-18 d4ca8e9 l10n: Updated Serbian (sr) translation to 100% Саша 
Петровић salepetron...@gmail.com
+2013-04-18 3845461 l10n: Updated French (fr) translation to 100% jc jc1 
jc1.quebe...@gmail.com
+2013-04-18 9804040 Layout fixes Andrzej ndrwr...@gmail.com
+2013-04-17 54c2201 Build fixes, automatic detection of libxfce4panel api 
version Andrzej ndrwr...@gmail.com
+2013-04-17 2a7ee58 l10n: Updated Italian (it) translation to 100% Cristian 
Marchi cri.pe...@gmail.com
+2013-04-17 00abd73 l10n: Updated Basque (eu) translation to 87% Piarres 
Beobide p...@beobide.net
+2013-04-17 b309f6e l10n: Updated Basque (eu) translation to 80% Piarres 
Beobide p...@beobide.net
+2013-04-16 a87f3e3 l10n: Updated Spanish (Castilian) (es) translation to 100% 
Adolfo Jayme Barrientos fitosch...@gmail.com
+2013-04-16 8746e2d l10n: Updated Ukrainian (uk) translation to 100% Yarema aka 
Knedlyk yupad...@gmail.com
+2013-04-16 d106a04 l10n: Updated Korean (ko) translation to 100% Seong-ho Cho 
darkcircle.0...@gmail.com
+2013-04-16 d5a5ab7 l10n: Updated Romanian (ro) translation to 100% Mișu 
Moldovan du...@xfce.org
+2013-04-16 6c09846 l10n: Updated Romanian (ro) translation to 100% Mișu 
Moldovan du...@xfce.org
+2013-04-16 41f9ea9 l10n: Updated

[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 ArrowButton: better handling of minimum sizes.

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 20202a2432490490f4ff246babd37aa8205147cb (commit)
   from 866af5da283392b63ba23fe560154ec1e4c87582 (commit)

commit 20202a2432490490f4ff246babd37aa8205147cb
Author: Andrzej ndrwr...@gmail.com
Date:   Wed Apr 17 21:10:09 2013 +0100

ArrowButton: better handling of minimum sizes.

 libxfce4panel/xfce-arrow-button.c |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/libxfce4panel/xfce-arrow-button.c 
b/libxfce4panel/xfce-arrow-button.c
index bcd06b0..c571256 100644
--- a/libxfce4panel/xfce-arrow-button.c
+++ b/libxfce4panel/xfce-arrow-button.c
@@ -305,7 +305,7 @@ xfce_arrow_button_draw (GtkWidget *widget,
 {
   width = (gdouble) MIN (alloc.height - padding.top - padding.bottom - 
border.top - border.bottom,
  alloc.width  - padding.left - padding.right - 
border.left - border.right);
-  width = (gdouble) CLAMP (width, 1.0, (gdouble) ARROW_WIDTH);
+  width = (gdouble) CLAMP (width, 0.0, (gdouble) ARROW_WIDTH);
 
   x = (gdouble) (alloc.width - width) / 2.0;
   y = (gdouble) (alloc.height - width) / 2.0;
@@ -323,7 +323,8 @@ xfce_arrow_button_draw (GtkWidget *widget,
 }
   gtk_style_context_get_color (context, gtk_widget_get_state_flags 
(widget), fg_rgba);
   gdk_cairo_set_source_rgba (cr, fg_rgba);
-  gtk_render_arrow (context, cr, angle, x, y, width);
+  if (width  0)
+gtk_render_arrow (context, cr, angle, x, y, width);
 }
 
   return TRUE;
@@ -354,7 +355,6 @@ xfce_arrow_button_get_preferred_width (GtkWidget *widget,
 {
 case GTK_ARROW_UP:
 case GTK_ARROW_DOWN:
-  minimum_child_width += ARROW_WIDTH;
   natural_child_width += ARROW_WIDTH;
   break;
 
@@ -369,7 +369,7 @@ xfce_arrow_button_get_preferred_width (GtkWidget *widget,
   gtk_style_context_get_padding (context, gtk_widget_get_state_flags 
(widget), padding);
   gtk_style_context_get_border (context, gtk_widget_get_state_flags 
(widget), border);
   natural_child_width = (ARROW_WIDTH + padding.left + padding.right + 
border.left + border.right);
-  minimum_child_width = natural_child_width;
+  minimum_child_width = natural_child_width - ARROW_WIDTH;
 }
 
   if (minimum_width != NULL)
@@ -404,7 +404,6 @@ xfce_arrow_button_get_preferred_height (GtkWidget *widget,
 {
 case GTK_ARROW_LEFT:
 case GTK_ARROW_RIGHT:
-  minimum_child_height += ARROW_WIDTH;
   natural_child_height += ARROW_WIDTH;
   break;
 
@@ -419,7 +418,7 @@ xfce_arrow_button_get_preferred_height (GtkWidget *widget,
   gtk_style_context_get_padding (context, gtk_widget_get_state_flags 
(widget), padding);
   gtk_style_context_get_border (context, gtk_widget_get_state_flags 
(widget), border);
   natural_child_height = (ARROW_WIDTH + padding.top + padding.bottom + 
border.top + border.bottom);
-  minimum_child_height = natural_child_height;
+  minimum_child_height = natural_child_height - ARROW_WIDTH;
 }
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 ArrowButton: sizing fixes.

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 368aedcef78da3c753ef32882aca3b86fbec99c2 (commit)
   from 8774af02f8ea29c43dc1bec53626bfee5b480faa (commit)

commit 368aedcef78da3c753ef32882aca3b86fbec99c2
Author: Andrzej ndrwr...@gmail.com
Date:   Wed Apr 17 01:57:34 2013 +0100

ArrowButton: sizing fixes.

 libxfce4panel/xfce-arrow-button.c |   91 +
 1 file changed, 61 insertions(+), 30 deletions(-)

diff --git a/libxfce4panel/xfce-arrow-button.c 
b/libxfce4panel/xfce-arrow-button.c
index a9363de..bcd06b0 100644
--- a/libxfce4panel/xfce-arrow-button.c
+++ b/libxfce4panel/xfce-arrow-button.c
@@ -79,10 +79,10 @@ static void xfce_arrow_button_finalize 
(GObject   *o
 static gboolean xfce_arrow_button_draw (GtkWidget 
*widget,
 cairo_t   
*cr);
 static void xfce_arrow_button_get_preferred_width  (GtkWidget 
*widget,
-gint  
*minimal_width,
+gint  
*minimum_width,
 gint  
*natural_width);
 static void xfce_arrow_button_get_preferred_height (GtkWidget 
*widget,
-gint  
*minimal_height,
+gint  
*minimum_height,
 gint  
*natural_height);
 #else
 static gboolean xfce_arrow_button_expose_event (GtkWidget 
*widget,
@@ -269,7 +269,7 @@ xfce_arrow_button_draw (GtkWidget *widget,
   GtkAllocationalloc;
   gdouble  angle;
   GtkStyleContext *context;
-  GtkBorderpadding;
+  GtkBorderpadding, border;
   GdkRGBA  fg_rgba;
 
   /* draw the button */
@@ -282,6 +282,7 @@ xfce_arrow_button_draw (GtkWidget *widget,
   child = gtk_bin_get_child (GTK_BIN (widget));
   context = gtk_widget_get_style_context (widget);
   gtk_style_context_get_padding (context, gtk_widget_get_state_flags 
(widget), padding);
+  gtk_style_context_get_border (context, gtk_widget_get_state_flags 
(widget), border);
 
   if (child != NULL
gtk_widget_get_visible (child))
@@ -290,20 +291,20 @@ xfce_arrow_button_draw (GtkWidget *widget,
   || button-priv-arrow_type == GTK_ARROW_DOWN)
 {
   width = (gdouble) ARROW_WIDTH;
-  x = (gdouble) padding.left;
+  x = (gdouble) padding.left + border.left;
   y = (gdouble) (alloc.height - width) / 2.0;
 }
   else
 {
   width = (gdouble) ARROW_WIDTH;
   x = (gdouble) (alloc.width - width) / 2.0;
-  y = (gdouble) padding.top;
+  y = (gdouble) padding.top + border.top;
 }
 }
   else
 {
-  width = (gdouble) MIN (alloc.height - padding.top - padding.bottom,
- alloc.width  - padding.left - padding.right);
+  width = (gdouble) MIN (alloc.height - padding.top - padding.bottom - 
border.top - border.bottom,
+ alloc.width  - padding.left - padding.right - 
border.left - border.right);
   width = (gdouble) CLAMP (width, 1.0, (gdouble) ARROW_WIDTH);
 
   x = (gdouble) (alloc.width - width) / 2.0;
@@ -313,13 +314,16 @@ xfce_arrow_button_draw (GtkWidget *widget,
   switch (button-priv-arrow_type)
 {
 case GTK_ARROW_DOWN:  angle = G_PI;
+  break;
 case GTK_ARROW_LEFT:  angle = G_PI / 2.0 + G_PI;
+  break;
 case GTK_ARROW_RIGHT: angle = G_PI / 2.0;
+  break;
 default:  angle = 0.0;
 }
   gtk_style_context_get_color (context, gtk_widget_get_state_flags 
(widget), fg_rgba);
   gdk_cairo_set_source_rgba (cr, fg_rgba);
-  gtk_render_arrow (context, cr, angle, x, y, ARROW_WIDTH);
+  gtk_render_arrow (context, cr, angle, x, y, width);
 }
 
   return TRUE;
@@ -327,28 +331,31 @@ xfce_arrow_button_draw (GtkWidget *widget,
 
 
 
-static void 
+static void
 xfce_arrow_button_get_preferred_width (GtkWidget *widget,
-   gint  *minimal_width,
+   gint  *minimum_width,
gint  *natural_width)
 {
   XfceArrowButton *button = XFCE_ARROW_BUTTON (widget);
   GtkWidget   *child;
-
-  /* use gtk for the widget size */
-  (*GTK_WIDGET_CLASS (xfce_arrow_button_parent_class)-get_preferred_width) 
(widget, minimal_width, natural_width);
+  gint minimum_child_width, natural_child_width;
+  GtkStyleContext *context

[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 PanelImage: better handling of minimum sizes.

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 866af5da283392b63ba23fe560154ec1e4c87582 (commit)
   from 8fff5877bbca65545f9dcfac788aa48fcf037f3e (commit)

commit 866af5da283392b63ba23fe560154ec1e4c87582
Author: Andrzej ndrwr...@gmail.com
Date:   Wed Apr 17 21:09:27 2013 +0100

PanelImage: better handling of minimum sizes.

 libxfce4panel/xfce-panel-image.c |   40 --
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index 1783f39..ded78ea 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -359,30 +359,27 @@ xfce_panel_image_get_preferred_width (GtkWidget *widget,
   XfcePanelImagePrivate *priv = XFCE_PANEL_IMAGE (widget)-priv;
   GtkAllocation  alloc;
   gint   width, width_min;
-#ifdef GTK_BUTTON_SIZING_FIX
-  gint   correction;
-#endif
 
   if (priv-size  0)
-width = width_min = priv-size;
+width = priv-size;
   else if (priv-pixbuf != NULL)
-{
-  width = gdk_pixbuf_get_width (priv-pixbuf);
-  width_min = width / 2;
-}
+width = gdk_pixbuf_get_width (priv-pixbuf);
   else
 {
   gtk_widget_get_allocation (widget, alloc);
   width = alloc.width;
-  width_min = width / 2;
 }
 
 #ifdef GTK_BUTTON_SIZING_FIX
-  correction = xfce_panel_image_padding_correction (widget);
-  width -= correction;
-  width_min -= correction;
+  width -= xfce_panel_image_padding_correction (widget);
+  width = MAX (width, 0);
 #endif
 
+  if (priv-size  0)
+width_min = width;
+  else
+width_min = 0;
+
   if (minimum_width != NULL)
 *minimum_width = width_min;
 
@@ -400,30 +397,27 @@ xfce_panel_image_get_preferred_height (GtkWidget *widget,
   XfcePanelImagePrivate *priv = XFCE_PANEL_IMAGE (widget)-priv;
   GtkAllocation  alloc;
   gint   height, height_min;
-#ifdef GTK_BUTTON_SIZING_FIX
-  gint   correction;
-#endif
 
   if (priv-size  0)
 height = height_min = priv-size;
   else if (priv-pixbuf != NULL)
-{
-  height = gdk_pixbuf_get_height (priv-pixbuf);
-  height_min = height / 2;
-}
+height = gdk_pixbuf_get_height (priv-pixbuf);
   else
 {
   gtk_widget_get_allocation (widget, alloc);
   height = alloc.height;
-  height_min = height / 2;
 }
 
 #ifdef GTK_BUTTON_SIZING_FIX
-  correction = xfce_panel_image_padding_correction (widget);
-  height -= correction;
-  height_min -= correction;
+  height -= xfce_panel_image_padding_correction (widget);
+  height = MAX (height, 0);
 #endif
 
+  if (priv-size  0)
+height_min = height;
+  else
+height_min = 0;
+
   if (minimum_height != NULL)
 *minimum_height = height_min;
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 panel-image: use style-update signal rather than style-set.

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 50462009c0fa6ab1097f393dee97042b1be4471e (commit)
   from 700769744a13cb166214c9ddda1e987b1ad5ef04 (commit)

commit 50462009c0fa6ab1097f393dee97042b1be4471e
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Apr 14 01:09:57 2013 +0100

panel-image: use style-update signal rather than style-set.

Doesn't seem to make any difference here but style-set is deprecated
since Gtk+ 3.0.

 libxfce4panel/xfce-panel-image.c |   43 +-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index 1fd96d4..b5afae6 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -134,8 +134,12 @@ static gboolean   xfce_panel_image_draw 
(GtkWidget   *widget
 static gboolean   xfce_panel_image_expose_event (GtkWidget   
*widget,
  GdkEventExpose  
*event);
 #endif
+#if GTK_CHECK_VERSION (3, 0, 0)
+static void   xfce_panel_image_style_updated(GtkWidget   
*widget);
+#else
 static void   xfce_panel_image_style_set(GtkWidget   
*widget,
  GtkStyle
*previous_style);
+#endif
 static gboolean   xfce_panel_image_load (gpointer 
data);
 static void   xfce_panel_image_load_destroy (gpointer 
data);
 static GdkPixbuf *xfce_panel_image_scale_pixbuf (GdkPixbuf   
*source,
@@ -171,10 +175,11 @@ xfce_panel_image_class_init (XfcePanelImageClass *klass)
   gtkwidget_class-size_allocate = xfce_panel_image_size_allocate;
 #if GTK_CHECK_VERSION (3, 0, 0)
   gtkwidget_class-draw = xfce_panel_image_draw;
+  gtkwidget_class-style_updated = xfce_panel_image_style_updated;
 #else
   gtkwidget_class-expose_event = xfce_panel_image_expose_event;
-#endif
   gtkwidget_class-style_set = xfce_panel_image_style_set;
+#endif
 
   g_object_class_install_property (gobject_class,
PROP_SOURCE,
@@ -525,6 +530,41 @@ xfce_panel_image_expose_event (GtkWidget  *widget,
 
 
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+static void
+xfce_panel_image_style_updated (GtkWidget *widget)
+{
+  XfcePanelImagePrivate *priv = XFCE_PANEL_IMAGE (widget)-priv;
+  gboolean   force;
+
+  /* let gtk update the widget style */
+  (*GTK_WIDGET_CLASS (xfce_panel_image_parent_class)-style_updated) (widget);
+
+  /* get style property */
+  gtk_widget_style_get (widget, force-gtk-icon-sizes, force, NULL);
+
+  /* update if needed */
+  if (priv-force_icon_sizes != force)
+{
+  priv-force_icon_sizes = force;
+  if (priv-size  0)
+gtk_widget_queue_resize (widget);
+}
+
+  /* update the icon if we have an icon-name source */
+  if (priv-source != NULL
+   !g_path_is_absolute (priv-source))
+{
+  /* unset the size to force an update */
+  priv-width = priv-height = -1;
+  gtk_widget_queue_resize (widget);
+}
+}
+#endif
+
+
+
+#if !GTK_CHECK_VERSION (3, 0, 0)
 static void
 xfce_panel_image_style_set (GtkWidget *widget,
 GtkStyle  *previous_style)
@@ -555,6 +595,7 @@ xfce_panel_image_style_set (GtkWidget *widget,
   gtk_widget_queue_resize (widget);
 }
 }
+#endif
 
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 PanelImage: reworked workaround for GtkButton sizing issue.

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to bbd0001c3c89946bb63c1b5c78b129eeb4bce3e8 (commit)
   from 87ce7cdb2d348715d90793c563d7a747114f69e8 (commit)

commit bbd0001c3c89946bb63c1b5c78b129eeb4bce3e8
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Apr 15 21:34:04 2013 +0100

PanelImage: reworked workaround for GtkButton sizing issue.

It should now work in all scenarios (custom buttons, can_focus=FALSE etc.)

 libxfce4panel/xfce-panel-image.c |   48 ++
 1 file changed, 48 insertions(+)

diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index 7acb239..6d9687d 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -308,6 +308,48 @@ xfce_panel_image_finalize (GObject *object)
 
 
 
+//#if GTK_CHECK_VERSION (3, 0, 0)  !GTK_CHECK_VERSION (3, 10, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define GTK_BUTTON_SIZING_FIX
+#endif
+
+#ifdef GTK_BUTTON_SIZING_FIX
+/* When can_focus is true, GtkButton allocates larger size than requested *
+ * and causes the panel image to grow indefinitely.   *
+ * This workaround compensates for this difference.   *
+ * Details in https://bugzilla.gnome.org/show_bug.cgi?id=698030   *
+ */
+static gint
+xfce_panel_image_padding_correction (GtkWidget *widget)
+{
+  GtkWidget *parent;
+  GtkStyleContext   *context;
+  gint   focus_width;
+  gint   focus_pad;
+  gint   correction;
+
+  parent = gtk_widget_get_parent (widget);
+  if (parent != NULL 
+  GTK_IS_BUTTON (parent) 
+  !gtk_widget_get_can_focus (parent))
+{
+  context = gtk_widget_get_style_context (parent);
+  gtk_style_context_get_style (context,
+   focus-line-width, focus_width,
+   focus-padding, focus_pad,
+   NULL);
+  correction = (focus_width + focus_pad) * 2;
+}
+  else
+{
+  correction = 0;
+}
+
+  return correction;
+}
+#endif
+
+
 #if GTK_CHECK_VERSION (3, 0, 0)
 static void
 xfce_panel_image_get_preferred_width (GtkWidget *widget,
@@ -324,6 +366,9 @@ xfce_panel_image_get_preferred_width (GtkWidget *widget,
   else
 {
   gtk_widget_get_allocation (widget, alloc);
+#ifdef GTK_BUTTON_SIZING_FIX
+  alloc.width -= xfce_panel_image_padding_correction (widget);
+#endif
   *minimal_width = alloc.width;
 }
 
@@ -347,6 +392,9 @@ xfce_panel_image_get_preferred_height (GtkWidget *widget,
   else
 {
   gtk_widget_get_allocation (widget, alloc);
+#ifdef GTK_BUTTON_SIZING_FIX
+  alloc.height -= xfce_panel_image_padding_correction (widget);
+#endif
   *minimal_height = alloc.height;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 Fixed drawing code in panel-image and arrow-button

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 700769744a13cb166214c9ddda1e987b1ad5ef04 (commit)
   from b35c168cb77181f4e358cd1c03b73606c371b001 (commit)

commit 700769744a13cb166214c9ddda1e987b1ad5ef04
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Apr 14 01:08:01 2013 +0100

Fixed drawing code in panel-image and arrow-button

- top-left coordinate at 0,0, not alloc-x,alloc-y
- use gdouble instead of gint in _draw
- use GtkStyleContext
- fix uninitialized alloc variable

 libxfce4panel/xfce-arrow-button.c |   38 -
 libxfce4panel/xfce-panel-image.c  |4 ++--
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/libxfce4panel/xfce-arrow-button.c 
b/libxfce4panel/xfce-arrow-button.c
index bbf2369..a9363de 100644
--- a/libxfce4panel/xfce-arrow-button.c
+++ b/libxfce4panel/xfce-arrow-button.c
@@ -265,10 +265,12 @@ xfce_arrow_button_draw (GtkWidget *widget,
 {
   XfceArrowButton *button = XFCE_ARROW_BUTTON (widget);
   GtkWidget   *child;
-  gint x, y, width;
+  gdouble  x, y, width;
   GtkAllocationalloc;
   gdouble  angle;
   GtkStyleContext *context;
+  GtkBorderpadding;
+  GdkRGBA  fg_rgba;
 
   /* draw the button */
   (*GTK_WIDGET_CLASS (xfce_arrow_button_parent_class)-draw) (widget, cr);
@@ -276,34 +278,36 @@ xfce_arrow_button_draw (GtkWidget *widget,
   if (button-priv-arrow_type != GTK_ARROW_NONE
gtk_widget_is_drawable (widget))
 {
+  gtk_widget_get_allocation (widget, alloc);
   child = gtk_bin_get_child (GTK_BIN (widget));
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_get_padding (context, gtk_widget_get_state_flags 
(widget), padding);
+
   if (child != NULL
gtk_widget_get_visible (child))
 {
-  gtk_widget_get_allocation (widget, alloc);
-  
   if (button-priv-arrow_type == GTK_ARROW_UP
   || button-priv-arrow_type == GTK_ARROW_DOWN)
 {
-  width = ARROW_WIDTH;
-  x = alloc.x + 1 /* widget-style-xthickness */;
-  y = alloc.y + (alloc.height - width) / 2;
+  width = (gdouble) ARROW_WIDTH;
+  x = (gdouble) padding.left;
+  y = (gdouble) (alloc.height - width) / 2.0;
 }
   else
 {
-  width = ARROW_WIDTH;
-  x = alloc.x + (alloc.width - width) / 2;
-  y = alloc.y + 1 /* widget-style-ythickness */;
+  width = (gdouble) ARROW_WIDTH;
+  x = (gdouble) (alloc.width - width) / 2.0;
+  y = (gdouble) padding.top;
 }
 }
   else
 {
-  width = MIN (alloc.height - 2 * 1 /* widget-style-ythickness */,
-   alloc.width  - 2 * 1 /* widget-style-xthickness */);
-  width = CLAMP (width, 1, ARROW_WIDTH);
+  width = (gdouble) MIN (alloc.height - padding.top - padding.bottom,
+ alloc.width  - padding.left - padding.right);
+  width = (gdouble) CLAMP (width, 1.0, (gdouble) ARROW_WIDTH);
 
-  x = alloc.x + (alloc.width - width) / 2;
-  y = alloc.y + (alloc.height - width) / 2;
+  x = (gdouble) (alloc.width - width) / 2.0;
+  y = (gdouble) (alloc.height - width) / 2.0;
 }
 
   switch (button-priv-arrow_type)
@@ -311,10 +315,10 @@ xfce_arrow_button_draw (GtkWidget *widget,
 case GTK_ARROW_DOWN:  angle = G_PI;
 case GTK_ARROW_LEFT:  angle = G_PI / 2.0 + G_PI;
 case GTK_ARROW_RIGHT: angle = G_PI / 2.0;
-default:  angle = 0;
+default:  angle = 0.0;
 }
-
-  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_get_color (context, gtk_widget_get_state_flags 
(widget), fg_rgba);
+  gdk_cairo_set_source_rgba (cr, fg_rgba);
   gtk_render_arrow (context, cr, angle, x, y, ARROW_WIDTH);
 }
 
diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index 2c5ba5b..1fd96d4 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -438,8 +438,8 @@ xfce_panel_image_draw (GtkWidget *widget,
 
   /* position */
   gtk_widget_get_allocation (widget, alloc);
-  dest_x = alloc.x + (priv-width - source_width) / 2;
-  dest_y = alloc.y + (priv-height - source_height) / 2;
+  dest_x = (priv-width - source_width) / 2;
+  dest_y = (priv-height - source_height) / 2;
 
   context = gtk_widget_get_style_context (widget);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 Loading external gtk2 panel plugins in gtk3 panel.

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to b35c168cb77181f4e358cd1c03b73606c371b001 (commit)
   from f625f76e96d3fc142f5b896d3d780e0dc883b7c7 (commit)

commit b35c168cb77181f4e358cd1c03b73606c371b001
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Apr 7 22:49:33 2013 +0100

Loading external gtk2 panel plugins in gtk3 panel.

Addeding X-XFCE-API to the plugin .desktop files to determine which
wrapper to use. This falls back to 1.0 wrapper for compatibility with
the current plugins.

Conflicts:
panel/panel-module.c
panel/panel-plugin-external-wrapper.c

 configure.ac.in|   12 ++
 libxfce4panel/libxfce4panel-1.0.pc.in  |1 +
 libxfce4panel/libxfce4panel-2.0.pc.in  |1 +
 panel/panel-module.c   |   44 +++-
 panel/panel-module.h   |2 +
 panel/panel-plugin-external-wrapper.c  |   13 ++
 plugins/actions/Makefile.am|4 +-
 .../{actions.desktop.in = actions.desktop.in.in}  |1 +
 plugins/applicationsmenu/Makefile.am   |4 +-
 ...u.desktop.in = applicationsmenu.desktop.in.in} |1 +
 plugins/clock/Makefile.am  |4 +-
 .../{clock.desktop.in = clock.desktop.in.in}  |1 +
 plugins/directorymenu/Makefile.am  |4 +-
 ...menu.desktop.in = directorymenu.desktop.in.in} |1 +
 plugins/launcher/Makefile.am   |4 +-
 ...{launcher.desktop.in = launcher.desktop.in.in} |1 +
 plugins/pager/Makefile.am  |4 +-
 .../{pager.desktop.in = pager.desktop.in.in}  |1 +
 plugins/separator/Makefile.am  |4 +-
 ...eparator.desktop.in = separator.desktop.in.in} |1 +
 plugins/showdesktop/Makefile.am|4 +-
 ...esktop.desktop.in = showdesktop.desktop.in.in} |1 +
 plugins/systray/Makefile.am|4 +-
 .../{systray.desktop.in = systray.desktop.in.in}  |1 +
 plugins/tasklist/Makefile.am   |4 +-
 ...{tasklist.desktop.in = tasklist.desktop.in.in} |1 +
 plugins/windowmenu/Makefile.am |4 +-
 ...dowmenu.desktop.in = windowmenu.desktop.in.in} |1 +
 28 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 654eab2..b341b37 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -91,6 +91,7 @@ LIBXFCE4PANEL_VERSION_API=libxfce4panel_version_api()
 LIBXFCE4PANEL_VERSION_MAJOR=xfce4_panel_version_major()
 LIBXFCE4PANEL_VERSION_MINOR=xfce4_panel_version_minor()
 LIBXFCE4PANEL_VERSION_MICRO=xfce4_panel_version_micro()
+AC_DEFINE([LIBXFCE4PANEL_VERSION_API], libxfce4panel_version_api(), 
[libxfce4panel api version])
 AC_SUBST([LIBXFCE4PANEL_VERSION])
 AC_SUBST([LIBXFCE4PANEL_VERSION_API])
 AC_SUBST([LIBXFCE4PANEL_VERSION_MAJOR])
@@ -244,16 +245,27 @@ panel/Makefile
 wrapper/Makefile
 plugins/Makefile
 plugins/actions/Makefile
+plugins/actions/actions.desktop.in
 plugins/applicationsmenu/Makefile
+plugins/applicationsmenu/applicationsmenu.desktop.in
 plugins/clock/Makefile
+plugins/clock/clock.desktop.in
 plugins/directorymenu/Makefile
+plugins/directorymenu/directorymenu.desktop.in
 plugins/launcher/Makefile
+plugins/launcher/launcher.desktop.in
 plugins/pager/Makefile
+plugins/pager/pager.desktop.in
 plugins/separator/Makefile
+plugins/separator/separator.desktop.in
 plugins/showdesktop/Makefile
+plugins/showdesktop/showdesktop.desktop.in
 plugins/systray/Makefile
+plugins/systray/systray.desktop.in
 plugins/tasklist/Makefile
+plugins/tasklist/tasklist.desktop.in
 plugins/windowmenu/Makefile
+plugins/windowmenu/windowmenu.desktop.in
 po/Makefile.in
 ])
 
diff --git a/libxfce4panel/libxfce4panel-1.0.pc.in 
b/libxfce4panel/libxfce4panel-1.0.pc.in
index a54205d..f596d69 100644
--- a/libxfce4panel/libxfce4panel-1.0.pc.in
+++ b/libxfce4panel/libxfce4panel-1.0.pc.in
@@ -3,6 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 localedir=@localedir@
+api=1.0
 
 Name: libxfce4panel
 Description: Library for the Xfce Panel
diff --git a/libxfce4panel/libxfce4panel-2.0.pc.in 
b/libxfce4panel/libxfce4panel-2.0.pc.in
index affbacf..944a985 100644
--- a/libxfce4panel/libxfce4panel-2.0.pc.in
+++ b/libxfce4panel/libxfce4panel-2.0.pc.in
@@ -3,6 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 localedir=@localedir@
+api=@LIBXFCE4PANEL_VERSION_API@
 
 Name: libxfce4panel
 Description: Library for the Xfce Panel
diff --git a/panel/panel-module.c b/panel/panel-module.c
index 6abd362..48d9745 100644
--- a/panel/panel-module.c
+++ b/panel/panel-module.c
@@ -21,7 +21,6 @@
 #endif
 
 #include gmodule.h
-#include exo/exo.h
 #include glib/gstdio.h
 #include libxfce4util/libxfce4util.h
 
@@ -63,7 +62,6 @@ enum _PanelModuleRunMode
   UNKNOWN,/* Unset */
   INTERNAL

[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 PanelImage: fixes to previous commit and cleanup.

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 8774af02f8ea29c43dc1bec53626bfee5b480faa (commit)
   from bbd0001c3c89946bb63c1b5c78b129eeb4bce3e8 (commit)

commit 8774af02f8ea29c43dc1bec53626bfee5b480faa
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Apr 15 23:31:45 2013 +0100

PanelImage: fixes to previous commit and cleanup.

Correction has to be done in all cases, not only when the requested
size is derived from allocation.

 libxfce4panel/xfce-panel-image.c |   46 +++---
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index 6d9687d..5d17419 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -116,10 +116,10 @@ static void   xfce_panel_image_set_property 
(GObject *object
 static void   xfce_panel_image_finalize (GObject 
*object);
 #if GTK_CHECK_VERSION (3, 0, 0)
 static void   xfce_panel_image_get_preferred_width  (GtkWidget   
*widget,
- gint
*minimal_width,
+ gint
*minimum_width,
  gint
*natural_width);
 static void   xfce_panel_image_get_preferred_height (GtkWidget   
*widget,
- gint
*minimal_height,
+ gint
*minimum_height,
  gint
*natural_height);
 #else
 static void   xfce_panel_image_size_request (GtkWidget   
*widget,
@@ -353,52 +353,64 @@ xfce_panel_image_padding_correction (GtkWidget *widget)
 #if GTK_CHECK_VERSION (3, 0, 0)
 static void
 xfce_panel_image_get_preferred_width (GtkWidget *widget,
-  gint  *minimal_width,
+  gint  *minimum_width,
   gint  *natural_width)
 {
   XfcePanelImagePrivate *priv = XFCE_PANEL_IMAGE (widget)-priv;
   GtkAllocation  alloc;
+  gint   width;
 
   if (priv-size  0)
-*minimal_width = priv-size;
+width = priv-size;
   else if (priv-pixbuf != NULL)
-*minimal_width = gdk_pixbuf_get_width (priv-pixbuf);
+width = gdk_pixbuf_get_width (priv-pixbuf);
   else
 {
   gtk_widget_get_allocation (widget, alloc);
+  width = alloc.width;
+}
+
 #ifdef GTK_BUTTON_SIZING_FIX
-  alloc.width -= xfce_panel_image_padding_correction (widget);
+  width -= xfce_panel_image_padding_correction (widget);
 #endif
-  *minimal_width = alloc.width;
-}
 
-  *natural_width = *minimal_width;
+  if (minimum_width != NULL)
+*minimum_width = width;
+
+  if (natural_width != NULL)
+*natural_width = width;
 }
 
 
 
 static void
 xfce_panel_image_get_preferred_height (GtkWidget *widget,
-   gint  *minimal_height,
+   gint  *minimum_height,
gint  *natural_height)
 {
   XfcePanelImagePrivate *priv = XFCE_PANEL_IMAGE (widget)-priv;
   GtkAllocation  alloc;
+  gint   height;
 
   if (priv-size  0)
-*minimal_height = priv-size;
+height = priv-size;
   else if (priv-pixbuf != NULL)
-*minimal_height = gdk_pixbuf_get_height (priv-pixbuf);
+height = gdk_pixbuf_get_height (priv-pixbuf);
   else
 {
   gtk_widget_get_allocation (widget, alloc);
+  height = alloc.height;
+}
+
 #ifdef GTK_BUTTON_SIZING_FIX
-  alloc.height -= xfce_panel_image_padding_correction (widget);
+  height -= xfce_panel_image_padding_correction (widget);
 #endif
-  *minimal_height = alloc.height;
-}
 
-  *natural_height = *minimal_height;
+  if (minimum_height != NULL)
+*minimum_height = height;
+
+  if (natural_height != NULL)
+*natural_height = height;
 }
 #endif
 
@@ -481,7 +493,6 @@ xfce_panel_image_draw (GtkWidget *widget,
   GdkPixbuf *rendered = NULL;
   GdkPixbuf *pixbuf = priv-cache;
   GtkStyleContext   *context;
-  GtkAllocation  alloc;
 
   if (G_LIKELY (pixbuf != NULL))
 {
@@ -490,7 +501,6 @@ xfce_panel_image_draw (GtkWidget *widget,
   source_height = gdk_pixbuf_get_height (pixbuf);
 
   /* position */
-  gtk_widget_get_allocation (widget, alloc);
   dest_x = (priv-width - source_width) / 2;
   dest_y = (priv-height - source_height) / 2;
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 Quick fix of compilation errors after merge of nick/gtk3 branch.

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 88c73508a09a05a7bc44833a9eaebc48072d4695 (commit)
   from 70736810202ecebc25bc5622e8022c1f3612e997 (commit)

commit 88c73508a09a05a7bc44833a9eaebc48072d4695
Author: Andrzej ndrwr...@gmail.com
Date:   Sun Aug 25 23:23:04 2013 +0100

Quick fix of compilation errors after merge of nick/gtk3 branch.

Gtk3 plugins (e.g. xfce4-indicator-plugin/master) are not recognized
(treated as gtk2 ones).

 panel/panel-module.c  |5 +++--
 panel/panel-plugin-external-wrapper.c |2 +-
 panel/panel-plugin-external-wrapper.h |1 -
 panel/panel-plugin-external.c |   18 --
 panel/panel-plugin-external.h |1 -
 5 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/panel/panel-module.c b/panel/panel-module.c
index 48d9745..dc947ba 100644
--- a/panel/panel-module.c
+++ b/panel/panel-module.c
@@ -21,6 +21,7 @@
 #endif
 
 #include gmodule.h
+#include exo/exo.h
 #include glib/gstdio.h
 #include libxfce4util/libxfce4util.h
 
@@ -309,8 +310,8 @@ panel_module_new_from_desktop_file (const gchar *filename,
   const gchar *module_unique;
   gboolean found;
 
-  panel_return_val_if_fail (!panel_str_is_empty (filename), NULL);
-  panel_return_val_if_fail (!panel_str_is_empty (name), NULL);
+  panel_return_val_if_fail (!exo_str_is_empty (filename), NULL);
+  panel_return_val_if_fail (!exo_str_is_empty (name), NULL);
 
   rc = xfce_rc_simple_open (filename, TRUE);
   if (G_UNLIKELY (rc == NULL))
diff --git a/panel/panel-plugin-external-wrapper.c 
b/panel/panel-plugin-external-wrapper.c
index 6b61713..12da849 100644
--- a/panel/panel-plugin-external-wrapper.c
+++ b/panel/panel-plugin-external-wrapper.c
@@ -220,7 +220,7 @@ panel_plugin_external_wrapper_get_argv (PanelPluginExternal 
  *external,
   argv[PLUGIN_ARGV_0] = g_strjoin (-, WRAPPER_BIN, panel_module_get_api 
(external-module), NULL);
   argv[PLUGIN_ARGV_FILENAME] = g_strdup (panel_module_get_filename 
(external-module));
   argv[PLUGIN_ARGV_UNIQUE_ID] = g_strdup_printf (%d, external-unique_id);;
-  argv[PLUGIN_ARGV_SOCKET_ID] = g_strdup_printf (%lu, gtk_socket_get_id 
(GTK_SOCKET (external)));;
+  argv[PLUGIN_ARGV_SOCKET_ID] = g_strdup_printf (%u, gtk_socket_get_id 
(GTK_SOCKET (external)));;
   argv[PLUGIN_ARGV_NAME] = g_strdup (panel_module_get_name (external-module));
   argv[PLUGIN_ARGV_DISPLAY_NAME] = g_strdup (panel_module_get_display_name 
(external-module));
   argv[PLUGIN_ARGV_COMMENT] = g_strdup (panel_module_get_comment 
(external-module));
diff --git a/panel/panel-plugin-external-wrapper.h 
b/panel/panel-plugin-external-wrapper.h
index e4bb1b2..eaa3ee9 100644
--- a/panel/panel-plugin-external-wrapper.h
+++ b/panel/panel-plugin-external-wrapper.h
@@ -40,7 +40,6 @@ GType  panel_plugin_external_wrapper_get_type (void) 
G_GNUC_CONST;
 
 GtkWidget *panel_plugin_external_wrapper_new  (PanelModule  *module,
gint  unique_id,
-   gboolean  is_gtk3,
gchar   **arguments) 
G_GNUC_MALLOC;
 
 G_END_DECLS
diff --git a/panel/panel-plugin-external.c b/panel/panel-plugin-external.c
index f26adf7..b9e8f36 100644
--- a/panel/panel-plugin-external.c
+++ b/panel/panel-plugin-external.c
@@ -133,7 +133,6 @@ enum
   PROP_0,
   PROP_MODULE,
   PROP_UNIQUE_ID,
-  PROP_IS_GTK3,
   PROP_ARGUMENTS
 };
 
@@ -175,14 +174,6 @@ panel_plugin_external_class_init (PanelPluginExternalClass 
*klass)
  | 
G_PARAM_CONSTRUCT_ONLY));
 
   g_object_class_install_property (gobject_class,
-   PROP_IS_GTK3,
-   g_param_spec_boolean (is-gtk3,
- NULL, NULL,
- FALSE,
- EXO_PARAM_READWRITE
- | 
G_PARAM_CONSTRUCT_ONLY));
-
-  g_object_class_install_property (gobject_class,
PROP_MODULE,
g_param_spec_object (module,
 NULL, NULL,
@@ -210,7 +201,6 @@ panel_plugin_external_init (PanelPluginExternal *external)
   external-show_configure = FALSE;
   external-show_about = FALSE;
   external-unique_id = -1;
-  external-is_gtk3 = FALSE;
 
   external-priv-arguments = NULL;
   external-priv-queue = NULL;
@@ -291,10 +281,6 @@ panel_plugin_external_get_property (GObject*object,
   g_value_set_int (value, external-unique_id);
   break;
 
-case PROP_IS_GTK3:
-  g_value_set_boolean (value, external-is_gtk3);
-  break;
-
 case PROP_ARGUMENTS:
   g_value_set_boxed (value, external-priv-arguments);
   break;
@@ -325,10 +311,6

[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 PanelImage: do not reload fixed-size icons on style-updated.

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 70736810202ecebc25bc5622e8022c1f3612e997 (commit)
   from e19efc05e6c6388b6f2f869aec452f55a03cc74c (commit)

commit 70736810202ecebc25bc5622e8022c1f3612e997
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Apr 22 23:58:10 2013 +0100

PanelImage: do not reload fixed-size icons on style-updated.

Style-updated triggered a lot of flickering in the applications menu
on mouse hover events.

Are there any use cases where reloading the icons is needed?

 libxfce4panel/xfce-panel-image.c |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index ded78ea..8073040 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -622,8 +622,10 @@ xfce_panel_image_style_updated (GtkWidget *widget)
 }
 
   /* update the icon if we have an icon-name source */
+  /* and size is not set */
   if (priv-source != NULL
-   !g_path_is_absolute (priv-source))
+   !g_path_is_absolute (priv-source)
+   priv-size = 0)
 {
   /* unset the size to force an update */
   priv-width = priv-height = -1;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 PanelPlugin: workaround for transparency issues.

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 2502e16c7d50862adfec96955532d02c35dedaf8 (commit)
   from 20202a2432490490f4ff246babd37aa8205147cb (commit)

commit 2502e16c7d50862adfec96955532d02c35dedaf8
Author: Andrzej ndrwr...@gmail.com
Date:   Thu Apr 18 20:43:29 2013 +0100

PanelPlugin: workaround for transparency issues.

It disables plugin transparency completely (breaking custom background
colors, bitmaps and alpha settings). But at least it makes the panel
usable with system style background settings.

How to fix it properly?
External plugins work fine but they have their own API for setting
the background style.

 libxfce4panel/xfce-panel-plugin.c |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libxfce4panel/xfce-panel-plugin.c 
b/libxfce4panel/xfce-panel-plugin.c
index cd67eaa..1e5933e 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -715,7 +715,10 @@ xfce_panel_plugin_init (XfcePanelPlugin *plugin)
 #endif
 
   /* hide the event box window to make the plugin transparent */
-  gtk_event_box_set_visible_window (GTK_EVENT_BOX (plugin), FALSE);
+  // FIXME
+  // Temporarily disabled to workaround plugin transparency issues.
+  // It breaks background transparency and color support.
+  //gtk_event_box_set_visible_window (GTK_EVENT_BOX (plugin), FALSE);
 }
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 PanelImage: allow scaling the image down (below allocation)

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 8fff5877bbca65545f9dcfac788aa48fcf037f3e (commit)
   from 368aedcef78da3c753ef32882aca3b86fbec99c2 (commit)

commit 8fff5877bbca65545f9dcfac788aa48fcf037f3e
Author: Andrzej ndrwr...@gmail.com
Date:   Wed Apr 17 02:24:58 2013 +0100

PanelImage: allow scaling the image down (below allocation)

Some containers (GtkBox(?)) refuse to allocate their child items below
minimum requested size, even if that results in violating their own
allocation.

Reducing the minimum size allows these containers to iteratively
reduce the size of the embedded PanelImage.

When priv-size  0 minimum size must be equal to the natural size.
Otherwise icons displayed in menus will be too small (menus use
a minimum size).

 libxfce4panel/xfce-panel-image.c |   38 --
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index 5d17419..1783f39 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -358,24 +358,33 @@ xfce_panel_image_get_preferred_width (GtkWidget *widget,
 {
   XfcePanelImagePrivate *priv = XFCE_PANEL_IMAGE (widget)-priv;
   GtkAllocation  alloc;
-  gint   width;
+  gint   width, width_min;
+#ifdef GTK_BUTTON_SIZING_FIX
+  gint   correction;
+#endif
 
   if (priv-size  0)
-width = priv-size;
+width = width_min = priv-size;
   else if (priv-pixbuf != NULL)
-width = gdk_pixbuf_get_width (priv-pixbuf);
+{
+  width = gdk_pixbuf_get_width (priv-pixbuf);
+  width_min = width / 2;
+}
   else
 {
   gtk_widget_get_allocation (widget, alloc);
   width = alloc.width;
+  width_min = width / 2;
 }
 
 #ifdef GTK_BUTTON_SIZING_FIX
-  width -= xfce_panel_image_padding_correction (widget);
+  correction = xfce_panel_image_padding_correction (widget);
+  width -= correction;
+  width_min -= correction;
 #endif
 
   if (minimum_width != NULL)
-*minimum_width = width;
+*minimum_width = width_min;
 
   if (natural_width != NULL)
 *natural_width = width;
@@ -390,24 +399,33 @@ xfce_panel_image_get_preferred_height (GtkWidget *widget,
 {
   XfcePanelImagePrivate *priv = XFCE_PANEL_IMAGE (widget)-priv;
   GtkAllocation  alloc;
-  gint   height;
+  gint   height, height_min;
+#ifdef GTK_BUTTON_SIZING_FIX
+  gint   correction;
+#endif
 
   if (priv-size  0)
-height = priv-size;
+height = height_min = priv-size;
   else if (priv-pixbuf != NULL)
-height = gdk_pixbuf_get_height (priv-pixbuf);
+{
+  height = gdk_pixbuf_get_height (priv-pixbuf);
+  height_min = height / 2;
+}
   else
 {
   gtk_widget_get_allocation (widget, alloc);
   height = alloc.height;
+  height_min = height / 2;
 }
 
 #ifdef GTK_BUTTON_SIZING_FIX
-  height -= xfce_panel_image_padding_correction (widget);
+  correction = xfce_panel_image_padding_correction (widget);
+  height -= correction;
+  height_min -= correction;
 #endif
 
   if (minimum_height != NULL)
-*minimum_height = height;
+*minimum_height = height_min;
 
   if (natural_height != NULL)
 *natural_height = height;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 PanelImage: better support for non-square icons.

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to 87ce7cdb2d348715d90793c563d7a747114f69e8 (commit)
   from 50462009c0fa6ab1097f393dee97042b1be4471e (commit)

commit 87ce7cdb2d348715d90793c563d7a747114f69e8
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Apr 15 00:09:06 2013 +0100

PanelImage: better support for non-square icons.

I thought this might be the reason for panel buttons growing infinitely.
It turned out to be something different but this change still improves
the sizing and makes it consistent with 
xfce_panel_pixbuf_from_source_at_size.

 libxfce4panel/xfce-panel-image.c |   14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index b5afae6..7acb239 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -669,8 +669,7 @@ xfce_panel_image_scale_pixbuf (GdkPixbuf *source,
gint   dest_width,
gint   dest_height)
 {
-  gdouble wratio;
-  gdouble hratio;
+  gdouble ratio;
   gintsource_width;
   gintsource_height;
 
@@ -688,13 +687,12 @@ xfce_panel_image_scale_pixbuf (GdkPixbuf *source,
 return g_object_ref (G_OBJECT (source));
 
   /* calculate the new dimensions */
-  wratio = (gdouble) source_width  / (gdouble) dest_width;
-  hratio = (gdouble) source_height / (gdouble) dest_height;
 
-  if (hratio  wratio)
-dest_width  = rint (source_width / hratio);
-  else
-dest_height = rint (source_height / wratio);
+  ratio = MIN ((gdouble) dest_width / (gdouble) source_width,
+   (gdouble) dest_height / (gdouble) source_height);
+
+  dest_width  = rint (source_width * ratio);
+  dest_height = rint (source_height * ratio);
 
   return gdk_pixbuf_scale_simple (source, MAX (dest_width, 1),
   MAX (dest_height, 1),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:andrzejr/wrapper3 xfce4-panel lib: workaround for ctx menus with scroll buttons.

2013-08-25 Thread Andrzej
Updating branch refs/heads/andrzejr/wrapper3
 to e19efc05e6c6388b6f2f869aec452f55a03cc74c (commit)
   from 2502e16c7d50862adfec96955532d02c35dedaf8 (commit)

commit e19efc05e6c6388b6f2f869aec452f55a03cc74c
Author: Andrzej ndrwr...@gmail.com
Date:   Mon Apr 22 23:41:28 2013 +0100

xfce4-panel lib: workaround for ctx menus with scroll buttons.

 libxfce4panel/xfce-panel-plugin.c |7 +++
 1 file changed, 7 insertions(+)

diff --git a/libxfce4panel/xfce-panel-plugin.c 
b/libxfce4panel/xfce-panel-plugin.c
index 1e5933e..df417fe 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -2589,8 +2589,15 @@ xfce_panel_plugin_position_menu (GtkMenu  *menu,
   xfce_panel_plugin_position_widget (XFCE_PANEL_PLUGIN (panel_plugin),
  GTK_WIDGET (menu), attach_widget, x, y);
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+  /* FIXME */
+  /* A workaround for Gtk3 popup menus with scroll buttons */
+  /* Menus are pushed in anyway */
+  *push_in = FALSE;
+#else
   /* keep the menu inside screen */
   *push_in = TRUE;
+#endif
 }
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:nick/gtk3 Use both .panel and .xfce4-panel style context classes

2013-06-19 Thread Andrzej
Updating branch refs/heads/nick/gtk3
 to 3557ce18a3f0dfa88ebaa8c2f69f80e12fa69c5f (commit)
   from df724b19e6799f8b688a690b88255cb5a9c4a1ee (commit)

commit 3557ce18a3f0dfa88ebaa8c2f69f80e12fa69c5f
Author: Andrzej ndrwr...@gmail.com
Date:   Wed Jun 19 21:31:52 2013 +0100

Use both .panel and .xfce4-panel style context classes

 panel/panel-base-window.c |1 +
 wrapper/wrapper-plug.c|1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c
index f39a1c2..6e41290 100644
--- a/panel/panel-base-window.c
+++ b/panel/panel-base-window.c
@@ -222,6 +222,7 @@ panel_base_window_init (PanelBaseWindow *window)
   /* set the panel class */
   context = gtk_widget_get_style_context (GTK_WIDGET (window));
   gtk_style_context_add_class (context, panel);
+  gtk_style_context_add_class (context, xfce4-panel);
 }
 
 
diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c
index de08e8c..3baed0c 100644
--- a/wrapper/wrapper-plug.c
+++ b/wrapper/wrapper-plug.c
@@ -125,6 +125,7 @@ wrapper_plug_init (WrapperPlug *plug)
   /* set the panel class */
   context = gtk_widget_get_style_context (GTK_WIDGET (plug));
   gtk_style_context_add_class (context, panel);
+  gtk_style_context_add_class (context, xfce4-panel);
 #endif
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin|xfce4-indicator-plugin-1.0.0 Creating annotated tag xfce4-indicator-plugin-1.0.0

2013-06-04 Thread Andrzej
Updating annotated tag refs/tags/xfce4-indicator-plugin-1.0.0
 as new annotated tag
 to 24ae0cfe9828ff042b93820eba1d5583de1e68fa (tag)
   succeeds xfce4-indicator-plugin-0.5.0-77-ge123b2c
  tagged by Andrzej ndrwr...@gmail.com
 on 2013-06-04 23:10 +0200

Andrzej (1):
  preparing for a release

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:xfce4-indicator-plugin-1.0 make distcheck fixes

2013-06-04 Thread Andrzej
Updating branch refs/heads/xfce4-indicator-plugin-1.0
 to e123b2cfb5613efc2fdfd47a0fcc85af825b412e (commit)
   from 69afae1afe55372d3280446e16d05a45672687ce (commit)

commit e123b2cfb5613efc2fdfd47a0fcc85af825b412e
Author: Andrzej ndrwr...@gmail.com
Date:   Tue Jun 4 22:05:35 2013 +0100

make distcheck fixes

 Makefile.am  |3 +++
 panel-plugin/Makefile.am |1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 56fdc91..a3fd5a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,9 @@ SUBDIRS =   
\
 distclean-local:
rm -rf *.cache *~
 
+distuninstallcheck_listfiles = 
\
+   find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache
+
 rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index fcec7f7..09b0373 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -74,6 +74,7 @@ desktop_DATA =
\
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST =   
\
+   indicator-dialog.glade \
$(desktop_in_files)
 
 DISTCLEANFILES = \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-indicator-plugin:xfce4-indicator-plugin-1.0 preparing for a release

2013-06-04 Thread Andrzej
Updating branch refs/heads/xfce4-indicator-plugin-1.0
 to 1a411aca6e659b58460a50b4079e2475d7a9a81f (commit)
   from e123b2cfb5613efc2fdfd47a0fcc85af825b412e (commit)

commit 1a411aca6e659b58460a50b4079e2475d7a9a81f
Author: Andrzej ndrwr...@gmail.com
Date:   Tue Jun 4 22:10:25 2013 +0100

preparing for a release

 ChangeLog   |   77 ++-
 INSTALL |9 +-
 configure.ac.in |6 ++--
 3 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e9e7c66..c9af291 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,83 @@
-# created with git log --pretty=format:%ad %h %s %aN %aE --no-merges 
--date=short
+2013-06-04 e123b2c make distcheck fixes Andrzej ndrwr...@gmail.com
+2013-04-22 69afae1 l10n: Updated German (de) translation to 100% Mark Trompell 
m...@foresightlinux.org
+2013-04-20 a2fd886 tweak de.po Mark Trompell m...@foresightlinux.org
+2013-04-19 f21ae5d l10n: Updated German (de) translation to 16% Johannes Lips 
johannes.l...@googlemail.com
+2013-04-19 4f4eeaa l10n: Updated German (de) translation to 6% Mark Trompell 
m...@foresightlinux.org
+2013-04-19 ed8ae14 l10n: Updated German (de) translation to 22% Mark Trompell 
m...@foresightlinux.org
+2013-04-19 0a33510 merge {es,hu,nl}.po from master Mark Trompell 
m...@foresightlinux.org
+2013-04-19 16240fe l10n: Updated Russian (ru) translation to 100% Sergey 
Alyoshin alyoshi...@gmail.com
+2013-04-18 ec06937 l10n: Updated Russian (ru) translation to 100% Sergey 
Alyoshin alyoshi...@gmail.com
+2013-04-16 8d4f20d l10n: Updated Romanian (ro) translation to 100% Mișu 
Moldovan du...@xfce.org
+2013-04-14 4b937fb l10n: Updated Polish (pl) translation to 45% Piotr Sokół 
pso...@jabster.pl
+2013-04-14 835ad78 l10n: Updated Polish (pl) translation to 38% Piotr Sokół 
pso...@jabster.pl
+2013-04-13 5306a03 l10n: Updated Japanese (ja) translation to 100% Masato 
Hashimoto hash...@xfce.org
+2013-04-12 5a76c65 Add column titles to translation Sergey Alyoshin 
alyoshi...@gmail.com
+2013-04-13 fc0900b Revert make column titles translatable Mark Trompell 
m...@foresightlinux.org
+2013-04-13 d02f804 make column titles translatable Mark Trompell 
m...@foresightlinux.org
+2013-04-13 4855405 rename to .ac.in, avoid obsolete Macro Mark Trompell 
m...@foresightlinux.org
+2013-04-13 4030e77 l10n: Add ja translation Masato Hashimoto hash...@xfce.org
+2013-04-12 4bf324e l10n: Updated German (de) translation to 17% Mark Trompell 
m...@foresightlinux.org
+2013-04-12 4b2b5fd l10n: Updated Russian (ru) translation to 100% Sergey 
Alyoshin alyoshi...@gmail.com
+2013-04-12 2ba29dd l10n: Updated Korean (ko) translation to 100% Seong-ho Cho 
darkcircle.0...@gmail.com
+2013-04-10 92c8dc0 l10n: Updated Portuguese (pt) translation to 92% Sergio 
Marques smarque...@gmail.com
+2013-04-07 c441817 l10n: Updated Ukrainian (uk) translation to 100% Yarema aka 
Knedlyk yupad...@gmail.com
+2013-04-07 2644dde l10n: Updated Ukrainian (uk) translation to 100% Yarema aka 
Knedlyk yupad...@gmail.com
+2013-04-07 da4ebab l10n: Updated Ukrainian (uk) translation to 78% Yarema aka 
Knedlyk yupad...@gmail.com
+2013-04-07 d35c618 l10n: Updated Dutch (Flemish) (nl) translation to 100% 
Pjotr vertaalt pjotrverta...@gmail.com
+2013-04-07 1ec1610 l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 
100% Rafael Ferreira rafael.f...@gmail.com
+2013-04-07 d819238 l10n: Updated Italian (it) translation to 100% Cristian 
Marchi cri.pe...@gmail.com
+2013-04-06 29fd8d2 l10n: Updated Italian (it) translation to 89% Cristian 
Marchi cri.pe...@gmail.com
+2013-04-06 8c52a5e l10n: Updated Croatian (hr) translation to 25% Ivica  Kolić 
ik...@yahoo.com
+2013-04-06 bc19ca1 l10n: Updated French (fr) translation to 100% jc jc1 
jc1.quebe...@gmail.com
+2013-04-06 aceff8c l10n: Updated French (fr) translation to 89% jc jc1 
jc1.quebe...@gmail.com
+2013-04-06 b9c02bb l10n: Updated French (fr) translation to 57% jc jc1 
jc1.quebe...@gmail.com
+2013-04-05 c47509d l10n: Updated Serbian (sr) translation to 100% Саша 
Петровић salepetron...@gmail.com
+2013-04-05 7f332e0 Updated list of files for translation Andrzej 
ndrwr...@gmail.com
+2013-04-05 a7ae93a button: Compilation fix. Andrzej ndrwr...@gmail.com
+2013-04-03 f60f6d5 Fixed #9040. Andrzej ndrwr...@gmail.com
+2013-04-02 985d349 indicator-button: minor fix to gtk_menu_popup call Andrzej 
ndrwr...@gmail.com
+2013-03-22 23dfad6 Reworked indicator entry sorting Andrzej 
ndrwr...@gmail.com
+2013-03-22 8c1c944 Using 22px icon size by default. Andrzej 
ndrwr...@gmail.com
+2013-03-22 dd4f96d Added an About dialog. Andrzej ndrwr...@gmail.com
+2013-03-22 bc0abf0 Fixed crash on Xfce 4.8 (no xfce_dialog_show_help) Andrzej 
ndrwr...@gmail.com
+2013-03-14 8eb3053 Fixed a regression, inconsistent border sizes. Andrzej 
ndrwr...@gmail.com
+2013-03-14 81c7851 Force a configuration-changed signal at start-up. Andrzej 
ndrwr...@gmail.com
+2013-03-13 346cfe1 Hiding one of hidden

  1   2   3   4   5   >