[Xfce4-commits] Drop superfluous folders
Updating branch refs/heads/master to da3858b3d513e7fac1298f55f963352c9061ff11 (commit) from 1585aecab8b5a89902d7bb13e8600f75935e559e (commit) commit da3858b3d513e7fac1298f55f963352c9061ff11 Author: Simon Steinbeiss Date: Tue Jan 21 01:04:53 2014 +0100 Drop superfluous folders data/icons/scalable/apps/Makefile.am |7 - data/icons/scalable/apps/parole.svg| 911 data/icons/scalable/status/Makefile.am |6 - 3 files changed, 924 deletions(-) diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am deleted file mode 100644 index 7c60db1..000 --- a/data/icons/scalable/apps/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -EXTRA_DIST = \ - $(Data_DATA) - -Datadir = $(datadir)/icons/hicolor/scalable/apps - -Data_DATA =\ - parole.svg diff --git a/data/icons/scalable/apps/parole.svg b/data/icons/scalable/apps/parole.svg deleted file mode 100644 index 062ba96..000 --- a/data/icons/scalable/apps/parole.svg +++ /dev/null @@ -1,911 +0,0 @@ - - - -http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:xlink="http://www.w3.org/1999/xlink"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; - width="48px" - height="48px" - id="svg4405" - version="1.1" - inkscape:version="0.48.4 r9939" - sodipodi:docname="parole-new.svg"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -image/svg+xml -http://purl.org/dc/dcmitype/StillImage"; /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am deleted file mode 100644 index 9580871..000 --- a/data/icons/scalable/status/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST = \ - $(Data_DATA) - -Datadir = $(datadir)/icons/hicolor/scalable/status - -Data_DATA = ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add 128px appicon and add separate dirs for 64px and 128px
Updating branch refs/heads/master
to 1585aecab8b5a89902d7bb13e8600f75935e559e (commit)
from 59de668852c91279b21dde51449eb7f698825f22 (commit)
commit 1585aecab8b5a89902d7bb13e8600f75935e559e
Author: Simon Steinbeiss
Date: Mon Jan 20 23:49:18 2014 +0100
Add 128px appicon and add separate dirs for 64px and 128px
data/icons/{24x24 => 128x128}/Makefile.am |2 +-
data/icons/128x128/parole.png | Bin 0 -> 6522 bytes
data/icons/{24x24 => 64x64}/Makefile.am |2 +-
data/icons/64x64/parole.png | Bin 0 -> 2634 bytes
data/icons/Makefile.am|4 +-
data/icons/scalable/parole.svg| 180 +++--
6 files changed, 123 insertions(+), 65 deletions(-)
diff --git a/data/icons/24x24/Makefile.am b/data/icons/128x128/Makefile.am
similarity index 56%
copy from data/icons/24x24/Makefile.am
copy to data/icons/128x128/Makefile.am
index 9871c46..5bcf260 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/128x128/Makefile.am
@@ -1,7 +1,7 @@
EXTRA_DIST = \
$(Data_DATA)
-Datadir = $(datadir)/icons/hicolor/24x24/apps
+Datadir = $(datadir)/icons/hicolor/128x128/apps
Data_DATA =\
parole.png
diff --git a/data/icons/128x128/parole.png b/data/icons/128x128/parole.png
new file mode 100644
index 000..7541458
Binary files /dev/null and b/data/icons/128x128/parole.png differ
diff --git a/data/icons/24x24/Makefile.am b/data/icons/64x64/Makefile.am
similarity index 57%
copy from data/icons/24x24/Makefile.am
copy to data/icons/64x64/Makefile.am
index 9871c46..196a29a 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/64x64/Makefile.am
@@ -1,7 +1,7 @@
EXTRA_DIST = \
$(Data_DATA)
-Datadir = $(datadir)/icons/hicolor/24x24/apps
+Datadir = $(datadir)/icons/hicolor/64x64/apps
Data_DATA =\
parole.png
diff --git a/data/icons/64x64/parole.png b/data/icons/64x64/parole.png
new file mode 100644
index 000..16ecc25
Binary files /dev/null and b/data/icons/64x64/parole.png differ
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 36090c0..bbc52de 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -3,7 +3,9 @@ SUBDIRS = \
16x16 \
24x24 \
32x32 \
- 48x48
+ 48x48 \
+ 64x64 \
+ 128x128
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
diff --git a/data/icons/scalable/parole.svg b/data/icons/scalable/parole.svg
index 61158ce..3b101b6 100644
--- a/data/icons/scalable/parole.svg
+++ b/data/icons/scalable/parole.svg
@@ -10,15 +10,37 @@
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="64"
- height="64"
+ width="128"
+ height="128"
id="svg4405"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="parole-64.svg">
+ sodipodi:docname="parole.svg">
+
+
+
+
+
+
+
+
+
+
+
+
image/svg+xml
http://purl.org/dc/dcmitype/StillImage"; />
-
+
@@ -774,9 +836,9 @@
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer"
- transform="translate(0,16)">
+ transform="translate(0,80)">
-
+ width="36"
+ height="6"
+ x="16"
+ y="23" />
+ x="16"
+ y="23" />
-
+ transform="matrix(1.6301837,0,0,1.4108942,24.423309,-67.672232)">
+ transform="matrix(2.5890987,0,0,2.6177832,8.423075,-85.747173)" />
+
+
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix m3u with with all absolute paths
Updating branch refs/heads/master to 59de668852c91279b21dde51449eb7f698825f22 (commit) from e6a744188febdd31a9d760ff1e6d180460961943 (commit) commit 59de668852c91279b21dde51449eb7f698825f22 Author: Matias De lellis Date: Thu Jan 16 20:56:47 2014 -0300 Fix m3u with with all absolute paths Signed-off-by: Simon Steinbeiss src/misc/parole-pl-parser.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c index 6a26735..567ef90 100644 --- a/src/misc/parole-pl-parser.c +++ b/src/misc/parole-pl-parser.c @@ -335,7 +335,7 @@ parole_pl_parser_parse_m3u (const gchar *filename) guint i; GRegex *regex; -GMatchInfo *match_info; +GMatchInfo *match_info = NULL; file = g_file_new_for_path (filename); path = g_path_get_dirname(filename); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Don't allow systemd to handle suspend/hibernate events.
Updating branch refs/heads/eric/bugzilla-patches
to 1e2b996f5e9c6da6fd2f6ba1ad5d82a3552adf89 (commit)
from fbf8daf3709bd9fedbe251b6faaeebafcf02f830 (commit)
commit 1e2b996f5e9c6da6fd2f6ba1ad5d82a3552adf89
Author: Mikhail Efremov
Date: Thu Feb 21 15:03:44 2013 +0400
Don't allow systemd to handle suspend/hibernate events.
Signed-off-by: Eric Koegel
src/xfpm-main.c | 87 +--
1 file changed, 85 insertions(+), 2 deletions(-)
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index 40959c8..24dacae 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -194,16 +194,96 @@ xfpm_dump_remote (DBusGConnection *bus)
g_hash_table_destroy (hash);
}
+static gint
+xfpm_inhibit_sleep_systemd (DBusGConnection *bus)
+{
+DBusConnection *bus_connection;
+DBusMessage *message = NULL, *reply = NULL;
+DBusError error;
+gint fd = -1;
+const char *what =
"handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch";
+const char *who = "xfce4-power-manager";
+const char *why = "xfce4-power-manager handles these events";
+const char *mode = "block";
+
+bus_connection = dbus_g_connection_get_connection (bus);
+if (!xfpm_dbus_name_has_owner (bus_connection, "org.freedesktop.login1"))
+return -1;
+
+dbus_error_init (&error);
+
+message = dbus_message_new_method_call ("org.freedesktop.login1",
+"/org/freedesktop/login1",
+"org.freedesktop.login1.Manager",
+"Inhibit");
+
+if (!message)
+{
+g_warning ("Unable to call Inhibit()");
+goto done;
+}
+
+
+if (!dbus_message_append_args (message,
+DBUS_TYPE_STRING, &what,
+DBUS_TYPE_STRING, &who,
+DBUS_TYPE_STRING, &why,
+DBUS_TYPE_STRING, &mode,
+DBUS_TYPE_INVALID))
+{
+g_warning ("Unable to call Inhibit()");
+goto done;
+}
+
+
+reply = dbus_connection_send_with_reply_and_block (bus_connection,
message, -1, &error);
+if (!reply)
+{
+g_warning ("Unable to inhibit systemd sleep: %s", error.message);
+goto done;
+}
+
+if (!dbus_message_get_args (reply, &error,
+DBUS_TYPE_UNIX_FD, &fd,
+DBUS_TYPE_INVALID))
+{
+g_warning ("Inhibit() reply parsing failed: %s", error.message);
+}
+
+done:
+
+if (message)
+dbus_message_unref (message);
+if (reply)
+dbus_message_unref (reply);
+dbus_error_free (&error);
+
+return fd;
+}
+
static void G_GNUC_NORETURN
xfpm_start (DBusGConnection *bus, const gchar *client_id, gboolean dump)
{
+DBusGConnection *system_bus;
XfpmManager *manager;
GError *error = NULL;
+gint inhibit_fd = -1;
XFPM_DEBUG ("Starting the power manager");
manager = xfpm_manager_new (bus, client_id);
-
+
+/* Don't allow systemd to handle power/suspend/hibernate buttons
+ * and lid-switch */
+system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+if (system_bus)
+inhibit_fd = xfpm_inhibit_sleep_systemd (system_bus);
+else
+{
+g_warning ("Unable connect to system bus: %s", error->message);
+g_clear_error (&error);
+}
+
if ( xfce_posix_signal_handler_init (&error))
{
xfce_posix_signal_handler_set_handler (SIGHUP,
@@ -238,7 +318,10 @@ xfpm_start (DBusGConnection *bus, const gchar *client_id,
gboolean dump)
gtk_main ();
g_object_unref (manager);
-
+
+if (inhibit_fd >= 0)
+close (inhibit_fd);
+
exit (EXIT_SUCCESS);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] I18n: Update translation zh_CN (99%).
Updating branch refs/heads/master to f85177a94e678b173e4ea5769f80feb7f9c28bd5 (commit) from d8cb52be571084c26672c8e4ace7a8c6d506794a (commit) commit f85177a94e678b173e4ea5769f80feb7f9c28bd5 Author: 玉堂白鹤 Date: Mon Jan 20 18:32:04 2014 +0100 I18n: Update translation zh_CN (99%). 214 translated messages, 2 untranslated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/zh_CN.po | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index b2950c2..80c1ef6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ # Chris K. Zhang , 2009 # Hunt Xu , 2009-2010 # xiaobo zhou , 2013 -# 玉堂白鹤 , 2013 +# 玉堂白鹤 , 2013-2014 # Yongtao Yang , 2004 # xiaobo zhou , 2013 # xiaobo zhou , 2013 @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-12-15 00:31+0100\n" -"PO-Revision-Date: 2013-12-28 01:31+\n" +"PO-Revision-Date: 2014-01-20 13:32+\n" "Last-Translator: 玉堂白鹤 \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/xfce/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -272,15 +272,15 @@ msgstr "更改背景的时间间隔" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26 msgid "in seconds:" -msgstr "" +msgstr "间隔秒数：" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:27 msgid "in minutes:" -msgstr "" +msgstr "间隔分钟数：" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:28 msgid "in hours:" -msgstr "" +msgstr "间隔小时数：" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:29 msgid "at start up" @@ -296,11 +296,11 @@ msgstr "每天" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:32 msgid "chronologically" -msgstr "" +msgstr "按时间顺序" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:33 msgid "Amount of time before a different background is selected." -msgstr "" +msgstr "在选择不同的背景前请选择间隔时间。" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:34 msgid "_Random Order" @@ -310,7 +310,7 @@ msgstr "随机排序" msgid "" "Randomly selects another image from the same directory when the wallpaper is" " to cycle." -msgstr "" +msgstr "在壁纸循环时随机选择一个同目录下的其他图片。" #: ../settings/xfdesktop-settings-ui.glade.h:1 msgid "Left" @@ -410,7 +410,7 @@ msgstr "仅在当前工作区中显示已粘滞窗口(_T)" #: ../settings/xfdesktop-settings-ui.glade.h:26 msgid "Show a_dd and remove workspace options in list" -msgstr "" +msgstr "在列表中显示添加和移除工作区选项(_D)" #: ../settings/xfdesktop-settings-ui.glade.h:27 msgid "Window List Menu" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
