date:20131212

[Xfce4-commits] Make buttons in tabwin square and account for more x/ythickness in themes

2013-12-12 Thread Simon Steinbeiss

Updating branch refs/heads/ochosi/tabwin
 to edf7ad46c0686b483ebeb5bc206c83778580747e (commit)
   from 79cce29cf2451bc18bf676cd81d6126e2200633a (commit)

commit edf7ad46c0686b483ebeb5bc206c83778580747e
Author: Simon Steinbeiss 
Date:   Thu Dec 12 17:40:41 2013 +0100

Make buttons in tabwin square and account for more x/ythickness in themes

Now themes with an x/ythickness of 3 should work fine, >3 might result in 
cut labels

 src/tabwin.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tabwin.c b/src/tabwin.c
index f13f015..c5d8846 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -489,7 +489,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget 
*tbw)
 
 if (screen_info->params->cycle_tabwin_mode == STANDARD_ICON_GRID)
 {
-gtk_widget_set_size_request (GTK_WIDGET (window_button), 
icon_size+24, icon_size+app_label_height+8);
+gtk_widget_set_size_request (GTK_WIDGET (window_button), 
icon_size+app_label_height+10, icon_size+app_label_height+10);
 buttonbox = gtk_vbox_new (FALSE, 0);
 buttonlabel = gtk_label_new ("");
 gtk_misc_set_alignment (GTK_MISC (buttonlabel), 0.5, 1.0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Add xfconf property for add/remove workspace (Bug 4278, 7337)

2013-12-12 Thread Eric Koegel

Updating branch refs/heads/master
 to f12aa431c11f4aac2e9805f68e2f1d5b5424e079 (commit)
   from a83d43d32562c76754cbba3b5cbcabcd656c0081 (commit)

commit f12aa431c11f4aac2e9805f68e2f1d5b5424e079
Author: Eric Koegel 
Date:   Thu Dec 12 17:48:55 2013 +0300

Add xfconf property for add/remove workspace (Bug 4278, 7337)

An xfconf property /windowlist-menu/show-add-remove-workspaces
was added to allow the removal of the Add/Remove workspace buttons
on the windowlist menu. This will allow administrators to remove
those options when locking down xfconf properties for kiosk setups.
Also this patch updates the README.xfconf file with all the recent
xfconf property changes. It also revises the README.kiosk file
since xfdesktop relies on xfconf to lock properties rather than
the kioskrc file.

 doc/README.kiosk  |   58 +-
 doc/README.xfconf |   39 ++--
 src/windowlist.c  |   73 ++---
 3 files changed, 72 insertions(+), 98 deletions(-)

diff --git a/doc/README.kiosk b/doc/README.kiosk
index b0a175b..51728ab 100644
--- a/doc/README.kiosk
+++ b/doc/README.kiosk
@@ -1,52 +1,6 @@
-Xfdesktop supports a 'kiosk mode' in which you can restrict the actions users
-are allowed to take.  You can do this by creating a file called
-'xfdesktop.kioskrc' in $sysconfdir/xdg/xfce4/kiosk/ (usually
-/etc/xdg/xfce4/kiosk/). A sample file might look like this:
-
 begin xfdesktop.kioskrc ---
-UserMenu=%wheel
-CustomizeBackdrop=ALL
-CustomizeDesktopMenu=%wheel
-CustomizeWindowlist=NONE
-CustomizeDesktopIcons=brian
  end xfdesktop.kioskrc  ---
-
-Additionally, the above can be added to $sysconfdir/xdg/xfce4/kiosk/kioskrc
-if you put it in a section called '[xfdesktop]', like so:
-
 begin kioskrc ---
-[xfdesktop]
-UserMenu=%wheel
-CustomizeBackdrop=ALL
-CustomizeDesktopMenu=%wheel
-CustomizeWindowlist=NONE
-CustomizeDesktopIcons=brian
  end kioskrc  ---
-
-Entries in $sysconfdir/xdg/xfce4/kiosk/kioskrc will override any entries in
-$sysconfdir/xdg/xfce4/kiosk/xfdesktop.kioskrc.
-
-Each entry can have a user name, a group name (prefixed with '%'), or one of
-the two special values 'ALL' or 'NONE'.  Lists of names should be
-comma-separated.
-
-Here's an explanation of the keys:
-
-UserMenu:  Whether or not to allow user modifications to the desktop menu.  If
-   not, xfdesktop will ignore the menu.xml file in
-   ~/.config/xfce4/desktop/ and use the system menu in
-   $sysconfdir/xdg/xfce4/desktop/menu.xml.
-
-CustomizeBackdrop: Whether or not to allow user modifications to the desktop
-   backdrop.  If not, the Backdrop settings panel will be greyed out.
-
-CustomizeDesktopMenu: Whether or not to allow user modifications to the desktop
-   menu.  This includes showing or hiding application icons, as well
-   as showing or hiding the menu itself.
-
-CustomizeWindowlist: Whether or not to allow user modifications to the window
-   list.  This includes showing or hiding window icons, as well as
-   showing or hiding the menu itself.
-
-CustomizeDesktopIcons: Whether or not to allow the user to enable or disable
-   the display of desktop icons, or change their style.
+Any xfconf property or channel can be locked down to prevent
+specific users or groups from making changes. See the
+README.xfconf for the list of properties xfdesktop supports.
+Additional kiosk information is available at:
+http://docs.xfce.org/xfce/xfconf/start
+http://git.xfce.org/xfce/xfconf/tree/docs/spec/perchannel-xml.txt
diff --git a/doc/README.xfconf b/doc/README.xfconf
index 74bf96e..a762688 100644
--- a/doc/README.xfconf
+++ b/doc/README.xfconf
@@ -3,46 +3,57 @@ hierarchical configuration system.  The channel name that 
xfdesktop uses
 is 'xfce4-desktop'.  Property names below should be referred to with each
 component separated by a slash ('/') character.  The data type of each
 property is listd after the name.
+The monitor settings are referred to by name where possible so that when
+the same monitor is plugged in again those settings apply to it.
 
-
-  
-  
-
 
+  
+  
   
-
 
-  
-  
-  
-  
-  
-  
-  
+  
+
+
+
+
+
+
+
+
+
+  
 
   
 
 
 
+
 
 
 
+
 
 
 
-
+

[Xfce4-commits] I18n: Update translation is (100%).

2013-12-12 Thread Transifex

Updating branch refs/heads/master
 to b2b8dc7005eeebf2fc4f6d85b66423d73da04648 (commit)
   from cb9798da8a898e083bbe90765e7c8333e7ea2559 (commit)

commit b2b8dc7005eeebf2fc4f6d85b66423d73da04648
Author: Sveinn í Felli 
Date:   Thu Dec 12 12:30:33 2013 +0100

I18n: Update translation is (100%).

393 translated messages.

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

 po/is.po |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/po/is.po b/po/is.po
index 2624a8f..ee5a9df 100644
--- a/po/is.po
+++ b/po/is.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Sveinn í Felli , 2010,2012-2013
+# Sveinn í Felli , 2010,2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Xfce4-panel\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-08-03 00:30+0200\n"
-"PO-Revision-Date: 2013-11-27 14:32+\n"
-"Last-Translator: Sveinn í Felli \n"
+"PO-Revision-Date: 2013-12-12 06:25+\n"
+"Last-Translator: Sveinn í Felli \n"
 "Language-Team: Icelandic 
(http://www.transifex.com/projects/p/xfce/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -223,14 +223,14 @@ msgstr "Gat ekki keyrt skipunina \"%s\""
 #: ../panel/panel-dbus-client.c:211
 msgid ""
 "Invalid plugin event syntax specified. Use PLUGIN-NAME:NAME[:TYPE:VALUE]."
-msgstr ""
+msgstr "Ógilt form viðbótaraðgerðar tilgreint. Notaðu 
PLUGIN-NAME:NAME[:TYPE:VALUE]."
 
 #: ../panel/panel-dbus-client.c:244
 #, c-format
 msgid ""
 "Invalid hint type \"%s\". Valid types are bool, double, int, string and "
 "uint."
-msgstr ""
+msgstr "Ótæk gerð vísbendingar (hint type) \"%s\". Gildar gerðir eru bool, 
double, int, string og uint."
 
 #: ../panel/panel-dialogs.c:65
 msgid "Maintainers"
@@ -238,7 +238,7 @@ msgstr "Umsjónarmenn"
 
 #: ../panel/panel-dialogs.c:68
 msgid "Deskbar Mode"
-msgstr ""
+msgstr "Skjáborðahamur"
 
 #: ../panel/panel-dialogs.c:71
 msgid "Inactive Maintainers"
@@ -270,7 +270,7 @@ msgstr "Skjástika %d"
 msgid ""
 "Because the panel is running in kiosk mode, you are not allowed to make "
 "changes to the panel configuration as a regular user"
-msgstr ""
+msgstr "Þar sem skjástikan er keyrandi í sjálfsalaham (kiosk mode) er þér ekki 
leyfilegt sem venjulegum notanda að gera breytingar á uppsetningu hennar."
 
 #: ../panel/panel-dialogs.c:234
 msgid "Modifying the panel is not allowed"
@@ -296,7 +296,7 @@ msgstr "Sláðu hér inn leitarstreng"
 #: ../panel/panel-plugin-external.c:429
 #, c-format
 msgid "Plugin \"%s\" unexpectedly left the panel, do you want to restart it?"
-msgstr ""
+msgstr "Viðbótin \"%s\" hvarf óvænt af skjástikunni, viltu endurræsa hana 
núna?"
 
 #: ../panel/panel-plugin-external.c:431
 #, c-format
@@ -304,7 +304,7 @@ msgid ""
 "The plugin restarted more than once in the last %d seconds. If you press "
 "Execute the panel will try to restart the plugin otherwise it will be "
 "permanently removed from the panel."
-msgstr ""
+msgstr "Viðbótin endurræstist oftar en einu sinni á síðustu %d sekúndum. Ef þú 
ýtir á 'Keyra' mun skjástikan reyna að endurræsa viðbótina, en annars verður 
henni endanlega eytt af skjástikunni."
 
 #: ../panel/panel-preferences-dialog.c:472
 msgid "Automatic"
@@ -324,7 +324,7 @@ msgstr "Skjátæki %d"
 
 #: ../panel/panel-preferences-dialog.c:872
 msgid "The panel and plugin configurations will be permanently removed"
-msgstr ""
+msgstr "Skjástikan og stillingar viðbótarinnar verða endanlega fjarlægð"
 
 #: ../panel/panel-preferences-dialog.c:873
 #, c-format
@@ -364,7 +364,7 @@ msgstr "Lóðrétt"
 
 #: ../panel/panel-preferences-dialog.glade.h:3
 msgid "Deskbar"
-msgstr "Skjástika"
+msgstr "Skjáborði"
 
 #: ../panel/panel-preferences-dialog.glade.h:4
 msgid "None (use system style)"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] I18n: Update translation is (97%).

2013-12-12 Thread Transifex

Updating branch refs/heads/master
 to 75275c39b90f74fa05697ba13569b5d0cf527d79 (commit)
   from ce5f008584302362f6374201432f91e3d950715d (commit)

commit 75275c39b90f74fa05697ba13569b5d0cf527d79
Author: Sveinn í Felli 
Date:   Thu Dec 12 12:31:59 2013 +0100

I18n: Update translation is (97%).

165 translated messages, 5 untranslated messages.

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

 po/is.po |   42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/po/is.po b/po/is.po
index 2a0f102..71f9695 100644
--- a/po/is.po
+++ b/po/is.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: Xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-07-02 22:21+0200\n"
-"PO-Revision-Date: 2013-11-06 22:53+\n"
-"Last-Translator: Sveinn í Felli \n"
+"PO-Revision-Date: 2013-12-12 06:27+\n"
+"Last-Translator: Sveinn í Felli \n"
 "Language-Team: Icelandic 
(http://www.transifex.com/projects/p/xfce/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -427,7 +427,7 @@ msgstr "Lykill notaður til _grípa í og færa glugga:"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17
 msgid "_Raise windows when any mouse button is pressed"
-msgstr ""
+msgstr "_Lyfta gluggum þegar ýtt er á einhvern músahnapp"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18
 msgid "Hide frame of windows when ma_ximized"
@@ -435,11 +435,11 @@ msgstr "_Fela gluggaramma þegar gluggar eru hámarkaðir"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:19
 msgid "Restore original size of maximi_zed windows when moving"
-msgstr ""
+msgstr "Endur_heimta upprunalega stærð hámarkaðra glugga þegar þeir eru færðir"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20
 msgid "Automatically _tile windows when moving toward the screen edge"
-msgstr ""
+msgstr "_Flísaleggja glugga sjálfkrafa þegar þeir eru færðir að skjájaðri"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21
 msgid "Notify of _urgency by making window's decoration blink"
@@ -447,7 +447,7 @@ msgstr "_Láta vita um áríðandi glugga með því að 
gluggaskreyting blikkar
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22
 msgid "Use _edge resistance instead of window snapping"
-msgstr ""
+msgstr "Nota _viðnám á jöðrum í stað grips glugga"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23
 msgid "Keep urgent windows _blinking repeatedly"
@@ -465,7 +465,7 @@ msgstr "Nota _músarhjólið til að skipta um vinnusvæði"
 msgid ""
 "_Remember and recall previous workspace\n"
 "when switching via keyboard shortcuts"
-msgstr ""
+msgstr "_Muna og endurheimta fyrri vinnusvæði\nþegar skipt er með flýtilyklum"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28
 msgid "Wrap workspaces depending on the actual desktop _layout"
@@ -481,7 +481,7 @@ msgstr "_Vinnusvæði"
 
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31
 msgid "_Minimum size of windows to trigger smart placement:"
-msgstr ""
+msgstr "_Lágmarksstærð glugga til þess að virkja snjallstaðsetningu:"
 
 #. Smart placement size
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35
@@ -579,7 +579,7 @@ msgstr "_Almennt"
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7
 msgid ""
 "Margins are areas on the edges of the screen where no window will be placed"
-msgstr ""
+msgstr "Spássíur eru svæði á skjájöðrum þar sem engir gluggar verða settir"
 
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8
 msgid "_Margins"
@@ -593,23 +593,23 @@ msgstr "%s (á %s)"
 
 #: ../src/main.c:540
 msgid "Fork to the background"
-msgstr ""
+msgstr "Kvísla á bakgrunn"
 
 #: ../src/main.c:542
 msgid "Fork to the background (not supported)"
-msgstr ""
+msgstr "Kvísla á bakgrunn (er ekki stutt)"
 
 #: ../src/main.c:545
 msgid "Set the compositor mode"
-msgstr ""
+msgstr "Setja ham skjásamsetningar"
 
 #: ../src/main.c:547
 msgid "Set the compositor mode (not supported)"
-msgstr ""
+msgstr "Setja ham skjásamsetningar (er ekki stutt)"
 
 #: ../src/main.c:549
 msgid "Replace the existing window manager"
-msgstr ""
+msgstr "Skipta út núverandi gluggastýringu"
 
 #: ../src/main.c:550
 msgid "Print version information and exit"
@@ -719,34 +719,34 @@ msgstr "Endurræsa"
 #: ../src/menu.c:412
 #, c-format
 msgid "%s: GtkMenu failed to grab the pointer\n"
-msgstr ""
+msgstr "%s: GtkMenu mistókst að nema bendilinn (pointer)\n"
 
 #: ../src/settings.c:273
 #, c-format
 msgid "%s: Cannot allocate color %s\n"
-msgstr ""
+msgstr "%s: Gat ekki úthlutað lit %s\n"
 
 #: ../src/settings.c:275
 #, c-format
 msgid "%s: Cannot allocate color: GValue for color is not of type STRING"
-msgstr ""
+msgstr "%s: Gat ekki úthlutað lit: GValue litsins er ekki af gerðinni STRING"
 
 #: ../src/settings.c:282
 #, c-format
 msgid "%s: Cannot parse color %s\n"
-msgstr ""
+msgstr "%s: Gat ekki þáttað lit %s\n"
 
 #: ../src/settings.c:284
 #, c-format
 msgid "%s: Cannot parse color: GValue for color is not of type STRING"
-msgst

[Xfce4-commits] Fix memory leak

2013-12-12 Thread Simon Steinbeiss

Updating branch refs/heads/ochosi/tabwin
 to 79cce29cf2451bc18bf676cd81d6126e2200633a (commit)
   from ba64c3ab91dd6512dd7e3e06f3d119bdfaacd1b5 (commit)

commit 79cce29cf2451bc18bf676cd81d6126e2200633a
Author: Eric Koegel 
Date:   Thu Dec 12 13:17:46 2013 +0300

Fix memory leak

Signed-off-by: Simon Steinbeiss 

 src/tabwin.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tabwin.c b/src/tabwin.c
index 545e749..f13f015 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -485,6 +485,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget 
*tbw)
  * appearance theme and gtkrc settings */
 layout = gtk_widget_create_pango_layout (GTK_WIDGET (tbw), "");
 pango_layout_get_pixel_size (layout, NULL, &app_label_height);
+g_object_unref (layout);
 
 if (screen_info->params->cycle_tabwin_mode == STANDARD_ICON_GRID)
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Tabwin list mode relative label width

2013-12-12 Thread Simon Steinbeiss

Updating branch refs/heads/ochosi/tabwin
 to ba64c3ab91dd6512dd7e3e06f3d119bdfaacd1b5 (commit)
   from 43c4cbe83ceb9e1e9deb416e785871fe9ebbdf52 (commit)

commit ba64c3ab91dd6512dd7e3e06f3d119bdfaacd1b5
Author: Eric Koegel 
Date:   Thu Dec 12 12:46:43 2013 +0300

Tabwin list mode relative label width

The width of the application label in the tabwin window while in
list mode is now relative to the number of columns displays. This
is scaled to the width of the smallest monitor attached. Now there's
space for more label info when there are fewer columns and it properly
displays all the windows when there are lots of them open.

Signed-off-by: Simon Steinbeiss 

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

diff --git a/src/tabwin.c b/src/tabwin.c
index 4d6f887..545e749 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -435,7 +435,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget 
*tbw)
 Client *c;
 GList *client_list;
 GtkWidget *windowlist, *icon, *selected, *window_button, *buttonbox, 
*buttonlabel, *selected_label;
-int packpos, monitor_width, monitor_height, app_label_height;
+int packpos, monitor_width, monitor_height, app_label_height, label_width;
 Tabwin *t;
 PangoLayout *layout;
 gint icon_size = WIN_ICON_SIZE;
@@ -495,10 +495,12 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget 
*tbw)
 }
 else
 {
+label_width = monitor_width / (tbw->grid_cols + 1);
+
 if (icon_size < app_label_height)
-gtk_widget_set_size_request (GTK_WIDGET (window_button), 
icon_size+256, app_label_height+8);
+gtk_widget_set_size_request (GTK_WIDGET (window_button), 
label_width, app_label_height+8);
 else
-gtk_widget_set_size_request (GTK_WIDGET (window_button), 
icon_size+256, icon_size+8);
+gtk_widget_set_size_request (GTK_WIDGET (window_button), 
label_width, icon_size+8);
 buttonbox = gtk_hbox_new (FALSE, 6);
 buttonlabel = gtk_label_new (c->name);
 gtk_misc_set_alignment (GTK_MISC (buttonlabel), 0, 0.5);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Fix cursor wrapping in grid mode with only one row

2013-12-12 Thread Simon Steinbeiss

Updating branch refs/heads/ochosi/tabwin
 to 43c4cbe83ceb9e1e9deb416e785871fe9ebbdf52 (commit)
   from 32337d3fa001f2fdea64c436c78d91d48ccadd38 (commit)

commit 43c4cbe83ceb9e1e9deb416e785871fe9ebbdf52
Author: Eric Koegel 
Date:   Thu Dec 12 11:53:19 2013 +0300

Fix cursor wrapping in grid mode with only one row

Signed-off-by: Simon Steinbeiss 

 src/tabwin.c |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/tabwin.c b/src/tabwin.c
index 4572f06..4d6f887 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -974,7 +974,16 @@ tabwinSelectDelta (Tabwin *t, int row_delta, int col_delta)
 else if (col_current >= cols)
 {
 col_current = 0;
-row_current++;
+if (rows > 1)
+{
+row_current++;
+}
+else
+{
+/* If there's only 1 row then col needs to wrap back to
+ * the head of the grid */
+col_current = 0;
+}
 }
 
 /* Wrap row */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Fix crash when compositor is compiled in but disabled.

2013-12-12 Thread Alistair Buxton

Updating branch refs/heads/ochosi/tabwin
 to ce5f008584302362f6374201432f91e3d950715d (commit)
   from 51a982b74c9b48b9ae20d712127187119dad7a05 (commit)

commit ce5f008584302362f6374201432f91e3d950715d
Author: Alistair Buxton 
Date:   Tue Dec 10 01:32:05 2013 +

Fix crash when compositor is compiled in but disabled.

If user attempts to zoom in when compositor is disabled,
don't do anything. Also handle possible divide by zero
if the refresh rate is reported as zero.

 src/compositor.c |2 ++
 src/events.c |6 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index 01ff05f..843ce65 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3056,6 +3056,8 @@ compositorZoomIn (ScreenInfo *screen_info, XButtonEvent 
*ev)
 if (screen_info->display_info->have_xrandr)
 {
 timeout_rate = screen_info->refresh_rate/2;
+if(timeout_rate < 1)
+timeout_rate = 30;
 }
 #endif /* HAVE_RANDR */
 screen_info->zoom_timeout_id = g_timeout_add ((1000/timeout_rate), 
zoom_timeout_cb, screen_info);
diff --git a/src/events.c b/src/events.c
index 3701d75..e83bde9 100644
--- a/src/events.c
+++ b/src/events.c
@@ -904,11 +904,13 @@ handleButtonPress (DisplayInfo *display_info, 
XButtonEvent * ev)
 edgeButton (c, part, ev);
 }
 #ifdef HAVE_COMPOSITOR
-else if ((ev->button == Button4) && (state) && (state == 
screen_info->params->easy_click))
+else if ((ev->button == Button4) && (state) && (state == 
screen_info->params->easy_click)
+  && (screen_info->compositor_active))
 {
 compositorZoomIn(screen_info, ev);
 }
-else if ((ev->button == Button5) && (state) && (state == 
screen_info->params->easy_click))
+else if ((ev->button == Button5) && (state) && (state == 
screen_info->params->easy_click)
+  && (screen_info->compositor_active))
 {
 compositorZoomOut(screen_info, ev);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Merge branch 'master' into ochosi/tabwin

2013-12-12 Thread Simon Steinbeiss

Updating branch refs/heads/ochosi/tabwin
 to 32337d3fa001f2fdea64c436c78d91d48ccadd38 (commit)
   from 648537cffa9ab60e2e1a8444f2f4da7ac9eca47b (commit)

commit 32337d3fa001f2fdea64c436c78d91d48ccadd38
Merge: 648537c ce5f008
Author: Simon Steinbeiss 
Date:   Thu Dec 12 09:40:14 2013 +0100

Merge branch 'master' into ochosi/tabwin

commit ce5f008584302362f6374201432f91e3d950715d
Author: Alistair Buxton 
Date:   Tue Dec 10 01:32:05 2013 +

Fix crash when compositor is compiled in but disabled.

If user attempts to zoom in when compositor is disabled,
don't do anything. Also handle possible divide by zero
if the refresh rate is reported as zero.

 src/compositor.c |2 ++
 src/events.c |6 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index 01ff05f..843ce65 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3056,6 +3056,8 @@ compositorZoomIn (ScreenInfo *screen_info, XButtonEvent 
*ev)
 if (screen_info->display_info->have_xrandr)
 {
 timeout_rate = screen_info->refresh_rate/2;
+if(timeout_rate < 1)
+timeout_rate = 30;
 }
 #endif /* HAVE_RANDR */
 screen_info->zoom_timeout_id = g_timeout_add ((1000/timeout_rate), 
zoom_timeout_cb, screen_info);
diff --git a/src/events.c b/src/events.c
index e70ca16..ccdb2a5 100644
--- a/src/events.c
+++ b/src/events.c
@@ -904,11 +904,13 @@ handleButtonPress (DisplayInfo *display_info, 
XButtonEvent * ev)
 edgeButton (c, part, ev);
 }
 #ifdef HAVE_COMPOSITOR
-else if ((ev->button == Button4) && (state) && (state == 
screen_info->params->easy_click))
+else if ((ev->button == Button4) && (state) && (state == 
screen_info->params->easy_click)
+  && (screen_info->compositor_active))
 {
 compositorZoomIn(screen_info, ev);
 }
-else if ((ev->button == Button5) && (state) && (state == 
screen_info->params->easy_click))
+else if ((ev->button == Button5) && (state) && (state == 
screen_info->params->easy_click)
+  && (screen_info->compositor_active))
 {
 compositorZoomOut(screen_info, ev);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Update man page

2013-12-12 Thread Eric Koegel

Updating branch refs/heads/master
 to a83d43d32562c76754cbba3b5cbcabcd656c0081 (commit)
   from ce72d74bc4d339336e2e856097d9ef82fb5a4f59 (commit)

commit a83d43d32562c76754cbba3b5cbcabcd656c0081
Author: Eric Koegel 
Date:   Thu Dec 12 11:35:56 2013 +0300

Update man page

 xfdesktop.1 |   45 +
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/xfdesktop.1 b/xfdesktop.1
index e8638b2..e73ea50 100644
--- a/xfdesktop.1
+++ b/xfdesktop.1
@@ -1,4 +1,4 @@
-.TH XFDESKTOP 1 "Version 4.11.0" "29 September 2013"
+.TH XFDESKTOP 1 "December 2013"
 
 .SH NAME
 xfdesktop \- The Xfce 4 Desktop Environment's desktop manager
@@ -18,24 +18,49 @@ icons on the desktop.  Only one instance of xfdesktop can 
be running at
 a time, and should be started by running \fBxfdesktop\fP without any arguments.
 
 .SH OPTIONS
+
+.SS HELP OPTIONS:
+.TP
+.B \-h, --help
+Show help options
+.TP
+.B \--help-all
+Show all help options
+.TP
+.B \--help-gtk
+Show GTK+ Options
+.TP
+.B \--help-sm-client
+Show session management options
+
+.SS APPLICATION OPTIONS:
 .TP
-.B \--reload
+.B \-V, --version
+Display version information
+.TP
+.B \-R, --reload
 Causes an already-running instance of \fBxfdesktop\fP to reload all its
 settings, including loading a new random backdrop if using a backdrop list.
 .TP
-.B \--menu
+.B \-M, --menu
 Causes an already-running instance of \fBxfdesktop\fP to pop up the
 applications menu at the current position of the mouse cursor.
 .TP
-.B \--windowlist
+.B \-W, --windowlist
 Causes an already-running instance of \fBxfdesktop\fP to pop up the window
 list menu at the current position of the mouse cursor.
 .TP
-.B \--arrange
+.B \-A, --arrange
 Automatically arrange all the icons on the desktop
 .TP
-.B \--quit
+.B \-D, --disable-wm-check
+Do not wait for a window manager on startup
+.TP
+.B \-Q, --quit
 Cause \fBxfdesktop\fP to quit
+.TP
+.B \--display=[DISPLAY]
+X display to use
 
 .SH ENVIRONMENT
 \fBxfdesktop\fP's behavior is affected by the following environment variables.
@@ -61,9 +86,12 @@ If this environment variable is not present, it defaults to
 .SH BUGS
 Please report any bugs to
 .IR http://bugzilla.xfce.org/ .
+.br
 Development discussion should be conducted on the
 .IR xfce4-...@xfce.org
-mailing list.  Usage-related questions should be directed to the
+mailing list.
+.br
+Usage-related questions should be directed to the
 .IR x...@xfce.org
 mailing list.
 
@@ -72,7 +100,8 @@ mailing list.
 
 .SH AUTHOR
 Jasper Huijsmans , Benedikt Meurer
-, and Brian Tarricone .
+, Brian Tarricone , and Eric
+Koegel .
 
 This manual page was originally written by Brian Tarricone
 .br
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Make buttons in tabwin square and account for more x/ythickness in themes

[Xfce4-commits] Add xfconf property for add/remove workspace (Bug 4278, 7337)

[Xfce4-commits] I18n: Update translation is (100%).

[Xfce4-commits] I18n: Update translation is (97%).

[Xfce4-commits] Fix memory leak

[Xfce4-commits] Tabwin list mode relative label width

[Xfce4-commits] Fix cursor wrapping in grid mode with only one row

[Xfce4-commits] Fix crash when compositor is compiled in but disabled.

[Xfce4-commits] Merge branch 'master' into ochosi/tabwin

[Xfce4-commits] Update man page

10 matches

Site Navigation

Mail list logo

Footer information