removed old templates

pull/75/head
parent 7b057f1de9
commit ee5c997f7e

@ -1 +0,0 @@
# Calculate append=skip mergepkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r6

@ -1 +0,0 @@
# Calculate path=/usr/share/plasma/desktoptheme/default/icons name=start.svgz append=remove

@ -1,30 +0,0 @@
# Calculate format=diff merge(xfce-extra/xfce4-power-manager)<1.5.2
diff --git src/xfpm-dpms.c src/xfpm-dpms.c
index 53f3721..6fb0947 100644
--- src/xfpm-dpms.c
+++ src/xfpm-dpms.c
@@ -46,6 +46,16 @@ static void xfpm_dpms_finalize (GObject *object);
#define XFPM_DPMS_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), XFPM_TYPE_DPMS, XfpmDpmsPrivate))
+static void
+set_saver(Display *dpy, int value)
+{
+ int timeout, interval, prefer_blank, allow_exp;
+
+ XGetScreenSaver(dpy, &timeout, &interval, &prefer_blank, &allow_exp);
+ timeout = value;
+ XSetScreenSaver(dpy, timeout, timeout, prefer_blank, allow_exp);
+}
+
struct XfpmDpmsPrivate
{
XfpmXfconf *conf;
@@ -75,6 +85,7 @@ xfpm_dpms_set_timeouts (XfpmDpms *dpms, guint16 standby, guint16 suspend, guint
DPMSSetTimeouts (GDK_DISPLAY(), standby,
suspend,
off );
+ set_saver(GDK_DISPLAY(), standby);
}
}

@ -1,30 +0,0 @@
# Calculate format=diff
diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
index e9acaa0..a08f42c 100644
--- a/src/xfpm-manager.c
+++ b/src/xfpm-manager.c
@@ -441,12 +441,9 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
{
XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID close event");
- if ( action == LID_TRIGGER_NOTHING )
- {
- if ( !xfpm_is_multihead_connected () )
- xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOff);
- }
- else if ( action == LID_TRIGGER_LOCK_SCREEN )
+ if ( action != LID_TRIGGER_NOTHING && !xfpm_is_multihead_connected () )
+ xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOff);
+ if ( action == LID_TRIGGER_LOCK_SCREEN )
{
if ( !xfpm_is_multihead_connected () )
{
@@ -472,7 +469,7 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
else
{
XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID opened");
-
+ g_usleep (1000000);
xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOn);
}
}
Loading…
Cancel
Save