[Xfce4-commits] xfce4-embed-plugin:master remove trailing parens on AC_INIT version info to work around bug in intltool 0.35.x and 0.36.x
Updating branch refs/heads/master to fda2f66c0bb27ac30473dff49a14bcfec3f5 (commit) from f9884da545f9010dd57666ceec909c1fd3742689 (commit) commit fda2f66c0bb27ac30473dff49a14bcfec3f5 Author: Brian Tarricone br...@tarricone.org Date: Wed Oct 24 22:36:53 2007 + remove trailing parens on AC_INIT version info to work around bug in intltool 0.35.x and 0.36.x (Old svn revision: 3434) configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 4201f18..d073f6b 100644 --- a/configure.in.in +++ b/configure.in.in @@ -20,7 +20,7 @@ dnl *** Initialize autoconf *** dnl *** AC_COPYRIGHT([Copyright (c) 2006-2007 The Xfce development team. All rights reserved.]) -AC_INIT([xfce4-sample-plugin], [sample_version()], [http://bugzilla.xfce.org/], [xfce4-sample-plugin]) +AC_INIT([xfce4-sample-plugin], [sample_version], [http://bugzilla.xfce.org/], [xfce4-sample-plugin]) AC_PREREQ([2.50]) AC_CANONICAL_TARGET() AC_REVISION([$Id]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] transd:master specify file mode on create for open()
Updating branch refs/heads/master to f9b8b77365e8597b84c7e963874c590ae29e3876 (commit) from 31356ee91b01bc18cc497a042eef27f2a01005dc (commit) commit f9b8b77365e8597b84c7e963874c590ae29e3876 Author: Brian Tarricone br...@kakai.com Date: Mon Mar 8 19:39:07 2010 -0800 specify file mode on create for open() src/main.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main.c b/src/main.c index 09b4d27..6d3460b 100644 --- a/src/main.c +++ b/src/main.c @@ -119,7 +119,7 @@ main(int argc, char **argv) xsession_errors = xfce_get_homefile(.xsession-errors, NULL); open(/dev/null, O_RDONLY); /* stdin */ -i = open(xsession_errors, O_CREAT|O_APPEND); /* stdout */ +i = open(xsession_errors, O_CREAT|O_APPEND, 600); /* stdout */ if(i = 0) dup(i); /* stderr */ g_free(xsession_errors); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30415 - libxfce4ui/trunk/libxfce4smclient-private
Author: kelnos
Date: 2009-07-29 19:11:28 + (Wed, 29 Jul 2009)
New Revision: 30415
Modified:
libxfce4ui/trunk/libxfce4smclient-private/eggsmclient-xsmp.c
libxfce4ui/trunk/libxfce4smclient-private/eggsmclient.h
Log:
add SmRestartImmediately support to EggSMClient
Modified: libxfce4ui/trunk/libxfce4smclient-private/eggsmclient-xsmp.c
===
--- libxfce4ui/trunk/libxfce4smclient-private/eggsmclient-xsmp.c
2009-07-28 22:10:06 UTC (rev 30414)
+++ libxfce4ui/trunk/libxfce4smclient-private/eggsmclient-xsmp.c
2009-07-29 19:11:28 UTC (rev 30415)
@@ -214,6 +214,8 @@
if (egg_sm_client_get_mode () == EGG_SM_CLIENT_MODE_NO_RESTART)
xsmp-restart_style = SmRestartNever;
+ else if (egg_sm_client_get_mode () == EGG_SM_CLIENT_MODE_RESTART_IMMEDIATELY)
+xsmp-restart_style = SmRestartImmediately;
/* Parse info out of desktop file */
desktop_file = egg_get_desktop_file ();
Modified: libxfce4ui/trunk/libxfce4smclient-private/eggsmclient.h
===
--- libxfce4ui/trunk/libxfce4smclient-private/eggsmclient.h 2009-07-28
22:10:06 UTC (rev 30414)
+++ libxfce4ui/trunk/libxfce4smclient-private/eggsmclient.h 2009-07-29
19:11:28 UTC (rev 30415)
@@ -45,7 +45,8 @@
typedef enum {
EGG_SM_CLIENT_MODE_DISABLED,
EGG_SM_CLIENT_MODE_NO_RESTART,
- EGG_SM_CLIENT_MODE_NORMAL
+ EGG_SM_CLIENT_MODE_NORMAL,
+ EGG_SM_CLIENT_MODE_RESTART_IMMEDIATELY,
} EggSMClientMode;
struct _EggSMClient
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30417 - in xfconf/trunk: . xfconf
Author: kelnos
Date: 2009-07-29 21:42:58 + (Wed, 29 Jul 2009)
New Revision: 30417
Added:
xfconf/trunk/xfconf/xfconf-cache.c
xfconf/trunk/xfconf/xfconf-cache.h
Modified:
xfconf/trunk/NEWS
xfconf/trunk/xfconf/Makefile.am
xfconf/trunk/xfconf/xfconf-channel.c
xfconf/trunk/xfconf/xfconf-private.h
Log:
add transparent property prefetching and caching
XfconfCache is a transparent cache that sits behind XfconfChannel,
and, so far, involves no new API. this moves most of the dbus code
from XfconfChannel to XfconfCache. on creation, XfconfChannel gets
an XfconfCache object for that channel (the cache objects are
per-channel-name singletons, regardless of property_base or whether
or not the XfconfChannel is a singleton).
on creation, XfconfChannel prefetches all properties in the channel.
this might turn out to be a bad idea for large channels.
property setting does not block if the setting is already in the cache.
i may change this in the future to not block at all ever, but that
might make reporting certain kinds of errors impossible. property
resets are completely non-blocking. lookups are non-blocking if
the setting is already in the cache. the cache automatically
updates itself if another application modifies a property.
the cache has hooks to set the maximum age of entries (in seconds)
and the max number of entries to store in the cache. currently
these two are unimplemented, and i'm not sure if there's value to
exposing these in the public API.
Modified: xfconf/trunk/NEWS
===
--- xfconf/trunk/NEWS 2009-07-29 19:11:56 UTC (rev 30416)
+++ xfconf/trunk/NEWS 2009-07-29 21:42:58 UTC (rev 30417)
@@ -1,3 +1,11 @@
+Xfce 4.7.0
+==
+
+ * Add prefetching and caching support to XfconfChannel. Should speed
+things up a bit on app startup, and avoid blocking waiting on DBus
+in other cases.
+
+
Xfce 4.6.2
==
Modified: xfconf/trunk/xfconf/Makefile.am
===
--- xfconf/trunk/xfconf/Makefile.am 2009-07-29 19:11:56 UTC (rev 30416)
+++ xfconf/trunk/xfconf/Makefile.am 2009-07-29 21:42:58 UTC (rev 30417)
@@ -12,6 +12,8 @@
libxfconf_0_la_SOURCES = \
$(libxfconfinclude_HEADERS) \
xfconf-binding.c \
+ xfconf-cache.c \
+ xfconc-cache.h \
xfconf-channel.c \
xfconf-dbus-bindings.h \
xfconf-private.h \
@@ -37,6 +39,7 @@
libxfconf_0_la_LIBADD = \
$(top_builddir)/common/libxfconf-common.la \
+ $(top_builddir)/common/libxfconf-gvaluefuncs.la \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(DBUS_GLIB_LIBS)
Added: xfconf/trunk/xfconf/xfconf-cache.c
===
--- xfconf/trunk/xfconf/xfconf-cache.c (rev 0)
+++ xfconf/trunk/xfconf/xfconf-cache.c 2009-07-29 21:42:58 UTC (rev 30417)
@@ -0,0 +1,844 @@
+/*
+ * xfconf
+ *
+ * Copyright (c) 2009 Brian Tarricone br...@tarricone.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License ONLY.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include config.h
+#endif
+
+#ifdef HAVE_STRING_H
+#include string.h
+#endif
+
+#include xfconf-cache.h
+#include xfconf-channel.h
+#include xfconf-errors.h
+#include xfconf-dbus-bindings.h
+#include xfconf-gvaluefuncs.h
+#include xfconf-private.h
+#include xfconf-marshal.h
+//#include xfconf-types.h
+//#include xfconf-common-private.h
+//#include xfconf.h
+//#include xfconf-alias.h
+
+#define DEFAULT_MAX_ENTRIES -1 /* no limit */
+#define DEFAULT_MAX_AGE (60*60) /* 1 hour */
+
+#define ALIGN_VAL(val, align) ( ((val) + ((align) -1)) ~((align) - 1) )
+
+static void xfconf_cache_mutex_lock(GStaticMutex *mtx)
__attribute__((noinline));
+static void xfconf_cache_mutex_lock(GStaticMutex *mtx) {
g_static_mutex_lock(mtx); }
+static void xfconf_cache_mutex_unlock(GStaticMutex *mtx)
__attribute__((noinline));
+static void xfconf_cache_mutex_unlock(GStaticMutex *mtx) {
g_static_mutex_unlock(mtx); }
+
+
+/ XfconfCacheItem /
+
+
+typedef struct
+{
+GTimeVal last_used;
+GValue value;
+} XfconfCacheItem;
+
+static XfconfCacheItem *
+xfconf_cache_item_new(const GValue *value)
+{
+XfconfCacheItem *item;
+
+g_return_val_if_fail(value, NULL);
+
+item
[Xfce4-commits] r30418 - in xfconf/trunk: . xfconf
Author: kelnos
Date: 2009-07-29 21:43:07 + (Wed, 29 Jul 2009)
New Revision: 30418
Modified:
xfconf/trunk/NEWS
xfconf/trunk/xfconf/xfconf-binding.c
Log:
revert async property fetch for bindings
with the new caching in place, this doesn't really speed things up
anymore, and was problematic to begin with.
Modified: xfconf/trunk/NEWS
===
--- xfconf/trunk/NEWS 2009-07-29 21:42:58 UTC (rev 30417)
+++ xfconf/trunk/NEWS 2009-07-29 21:43:07 UTC (rev 30418)
@@ -6,13 +6,6 @@
in other cases.
-Xfce 4.6.2
-==
-
- * Speed up startup of many apps that use bindings by retrieving the
-initial value of the binding asynchronously.
-
-
Xfce 4.6.1
==
Modified: xfconf/trunk/xfconf/xfconf-binding.c
===
--- xfconf/trunk/xfconf/xfconf-binding.c2009-07-29 21:42:58 UTC (rev
30417)
+++ xfconf/trunk/xfconf/xfconf-binding.c2009-07-29 21:43:07 UTC (rev
30418)
@@ -31,7 +31,6 @@
#include xfconf-private.h
#include xfconf-alias.h
#include xfconf-common-private.h
-#include xfconf-dbus-bindings.h
typedef struct
{
@@ -44,9 +43,6 @@
GObject *object;
gchar *object_property;
GType object_property_type;
-
-/* async call to get initial value */
-DBusGProxyCall *call;
} XfconfGBinding;
typedef struct
@@ -80,9 +76,6 @@
if(G_UNLIKELY(!binding))
return;
-if(G_UNLIKELY(binding-call))
-dbus_g_proxy_cancel_call(_xfconf_get_dbus_g_proxy(), binding-call);
-
if(binding-object) {
g_signal_handlers_disconnect_by_func(G_OBJECT(binding-object),
G_CALLBACK(xfconf_g_binding_object_property_changed),
@@ -289,33 +282,6 @@
g_value_unset(dst_val);
}
-static void
-xfconf_g_binding_initial_value_received(DBusGProxy *proxy,
-GValue value,
-GError *error,
-gpointer user_data)
-{
-XfconfGBinding *binding = user_data;
-
-binding-call = NULL;
-
-if(error) {
-#ifdef XFCONF_ENABLE_CHECKS
-g_warning(Initial query for property \%s\ failed: %s,
- binding-xfconf_property, error-message);
-#endif
-g_error_free(error);
-return;
-}
-
-xfconf_g_binding_channel_property_changed(binding-channel,
- binding-xfconf_property,
- value,
- binding);
-g_value_unset(value);
-}
-
-
static XfconfGBinding *
xfconf_g_binding_init(XfconfChannel *channel,
const gchar *xfconf_property,
@@ -325,9 +291,9 @@
GType object_property_type)
{
XfconfGBinding *binding;
-gchar buf[1024], *channel_name = NULL;
-gchar *property_base = NULL, *real_property;
+gchar buf[1024];
GSList *bindings;
+GValue value = { 0, };
binding = g_slice_new0(XfconfGBinding);
binding-channel = channel;
@@ -374,24 +340,10 @@
bindings, (GDestroyNotify)g_slist_free);
}
-g_object_get(G_OBJECT(channel),
- channel-name, channel_name,
- property-base, property_base,
- NULL);
-if(property_base)
-real_property = g_strconcat(property_base, xfconf_property, NULL);
-else
-real_property = (gchar *)xfconf_property;
-
-binding-call =
xfconf_client_get_property_async(_xfconf_get_dbus_g_proxy(),
- channel_name,
- real_property,
-
xfconf_g_binding_initial_value_received,
- binding);
-g_free(channel_name);
-if(property_base) {
-g_free(property_base);
-g_free(real_property);
+if(xfconf_channel_get_property(channel, xfconf_property, value)) {
+xfconf_g_binding_channel_property_changed(channel, xfconf_property,
+ value, binding);
+g_value_unset(value);
}
binding-id = ++__last_binding_id;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30419 - xfconf/trunk/xfconf
Author: kelnos
Date: 2009-07-29 22:10:52 + (Wed, 29 Jul 2009)
New Revision: 30419
Modified:
xfconf/trunk/xfconf/xfconf-cache.c
Log:
fix a possible reentrancy issue.
a client could re-enter the set function when handling the signal
that reverts a property value after an error. if the old_item is
still in one of the hash tables, that could confuse things.
Modified: xfconf/trunk/xfconf/xfconf-cache.c
===
--- xfconf/trunk/xfconf/xfconf-cache.c 2009-07-29 21:43:07 UTC (rev 30418)
+++ xfconf/trunk/xfconf/xfconf-cache.c 2009-07-29 22:10:52 UTC (rev 30419)
@@ -466,6 +466,10 @@
g_critical(Couldn't find current cache item based on pending call
(libxfconf bug?));
goto out;
}
+
+g_hash_table_remove(cache-old_properties, old_item-property);
+/* don't destroy old_item yet */
+g_hash_table_steal(cache-pending_calls, old_item-call);
/* NULL this out so we don't try to cancel it in the remove function */
old_item-call = NULL;
@@ -495,10 +499,8 @@
}
out:
-if(old_item) {
-g_hash_table_remove(cache-old_properties, old_item-property);
-g_hash_table_remove(cache-pending_calls, old_item-call);
-}
+if(old_item)
+xfconf_cache_old_item_free(old_item);
xfconf_cache_mutex_unlock(cache-cache_lock);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30410 - xfce4-settings/branches/xfce_4_6/xfce4-settings-helper
Author: kelnos Date: 2009-07-28 20:03:28 + (Tue, 28 Jul 2009) New Revision: 30410 Modified: xfce4-settings/branches/xfce_4_6/xfce4-settings-helper/xfce4-settings-helper-autostart.desktop Log: add OnlyShowIn=XFCE; to xfce4-settings-helper autostart Modified: xfce4-settings/branches/xfce_4_6/xfce4-settings-helper/xfce4-settings-helper-autostart.desktop === --- xfce4-settings/branches/xfce_4_6/xfce4-settings-helper/xfce4-settings-helper-autostart.desktop 2009-07-28 07:38:31 UTC (rev 30409) +++ xfce4-settings/branches/xfce_4_6/xfce4-settings-helper/xfce4-settings-helper-autostart.desktop 2009-07-28 20:03:28 UTC (rev 30410) @@ -7,3 +7,4 @@ Type=Application StartupNotify=false Terminal=false +OnlyShowIn=XFCE; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30411 - xfce4-settings/trunk/xfce4-settings-helper
Author: kelnos Date: 2009-07-28 20:04:54 + (Tue, 28 Jul 2009) New Revision: 30411 Modified: xfce4-settings/trunk/xfce4-settings-helper/xfce4-settings-helper-autostart.desktop Log: add OnlyShowIn=XFCE; to xfce4-settings-helper autostart Modified: xfce4-settings/trunk/xfce4-settings-helper/xfce4-settings-helper-autostart.desktop === --- xfce4-settings/trunk/xfce4-settings-helper/xfce4-settings-helper-autostart.desktop 2009-07-28 20:03:28 UTC (rev 30410) +++ xfce4-settings/trunk/xfce4-settings-helper/xfce4-settings-helper-autostart.desktop 2009-07-28 20:04:54 UTC (rev 30411) @@ -7,3 +7,4 @@ Type=Application StartupNotify=false Terminal=false +OnlyShowIn=XFCE; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30414 - in xfce4-dev-tools/trunk: . scripts
Author: kelnos Date: 2009-07-28 22:10:06 + (Tue, 28 Jul 2009) New Revision: 30414 Added: xfce4-dev-tools/trunk/scripts/xdt-autogen.in.in Removed: xfce4-dev-tools/trunk/scripts/xdt-autogen.in Modified: xfce4-dev-tools/trunk/ChangeLog xfce4-dev-tools/trunk/NEWS xfce4-dev-tools/trunk/configure.in.in xfce4-dev-tools/trunk/scripts/Makefile.am Log: add --version and -V options, add required minimum version check. users who wish to require a minimum version of xdt-autogen should export XDT_AUTOGEN_REQUIRED_VERSION, set to the minimum required version that is supported. Modified: xfce4-dev-tools/trunk/ChangeLog === --- xfce4-dev-tools/trunk/ChangeLog 2009-07-28 21:30:37 UTC (rev 30413) +++ xfce4-dev-tools/trunk/ChangeLog 2009-07-28 22:10:06 UTC (rev 30414) @@ -1,3 +1,10 @@ +2009-07-28 Brian Tarricone br...@tarricone.org + + * scripts/xdt-autogen.in: Renamed to xdt-autogen.in.in. + * scripts/xdt-autogen.in.in: Add --version and -V options. Add a + minimum required version check via the XDT_AUTOGEN_REQUIRED_VERSION + env var. + 2009-07-27 Brian Tarricone br...@tarricone.org * scripts/xdt-autogen.in: Also support newer IT_PROG_INTLTOOL Modified: xfce4-dev-tools/trunk/NEWS === --- xfce4-dev-tools/trunk/NEWS 2009-07-28 21:30:37 UTC (rev 30413) +++ xfce4-dev-tools/trunk/NEWS 2009-07-28 22:10:06 UTC (rev 30414) @@ -1,6 +1,10 @@ 4.6.2 = - Also support the newer IT_PROG_INTLTOOL macro +- Added --version and -V options to display the xdt-autogen version +- Added ability for autogen.sh scripts to set an environment + variable XDT_AUTOGEN_REQUIRED_VERSION to depend on a particular version + of xdt-autogen. 4.6.0 = Modified: xfce4-dev-tools/trunk/configure.in.in === --- xfce4-dev-tools/trunk/configure.in.in 2009-07-28 21:30:37 UTC (rev 30413) +++ xfce4-dev-tools/trunk/configure.in.in 2009-07-28 22:10:06 UTC (rev 30414) @@ -11,10 +11,10 @@ dnl *** m4_define([xdt_version_major], [4]) m4_define([xdt_version_minor], [6]) -m4_define([xdt_version_micro], [0]) +m4_define([xdt_version_micro], [1]) m4_define([xdt_version_nano], []) m4_define([xdt_version_build], [...@revision@]) -m4_define([xdt_version_tag], []) +m4_define([xdt_version_tag], [svn]) m4_define([xdt_version], [xdt_version_major().xdt_version_minor().xdt_version_micro()ifelse(xdt_version_nano(), [], [], [.xdt_version_nano()])ifelse(xdt_version_tag(), [svn], [xdt_version_tag()-xdt_version_build()], [])]) @@ -25,13 +25,22 @@ dnl *** dnl *** Initialize autoconf *** dnl *** -AC_INIT([xfce4-dev-tools], [xdt_version], [xfce4-...@xfce.org]) +AC_INIT([xfce4-dev-tools], [xdt_version], +[http://bugzilla.xfce.org/enter_bug.cgi?product=Xfce4-dev-tools]) AC_COPYRIGHT([Copyright (c) 2002-2008 The Xfce development team. All rights reserved. Written for Xfce by Benedikt Meurer be...@xfce.org.]) AC_REVISION([$Id$]) +dnl substitute version info +AC_SUBST([VERSION_MAJOR], [xdt_version_major]) +AC_SUBST([VERSION_MINOR], [xdt_version_minor]) +AC_SUBST([VERSION_MICRO], [xdt_version_micro]) +AC_SUBST([VERSION_NANO], [xdt_version_nano]) +VERSION_REVISION=ifelse(xdt_version_tag(), [svn], [xdt_version_tag()-xdt_version_build()], []) +AC_SUBST([VERSION_REVISION]) + dnl *** dnl *** Initialize automake *** dnl *** @@ -51,6 +60,7 @@ xfce4-dev-tools.spec m4macros/Makefile scripts/Makefile +scripts/xdt-autogen.in ]) dnl vi:set ts=2 sw=2 et ai: Modified: xfce4-dev-tools/trunk/scripts/Makefile.am === --- xfce4-dev-tools/trunk/scripts/Makefile.am 2009-07-28 21:30:37 UTC (rev 30413) +++ xfce4-dev-tools/trunk/scripts/Makefile.am 2009-07-28 22:10:06 UTC (rev 30414) @@ -20,8 +20,10 @@ CLEANFILES = \ xdt-autogen +DISTCLEANFILES = \ + xdt-autogen.in + EXTRA_DIST = \ - xdt-autogen.in \ xdt-commit # vi:set ts=8 sw=8 noet ai: Copied: xfce4-dev-tools/trunk/scripts/xdt-autogen.in.in (from rev 30408, xfce4-dev-tools/trunk/scripts/xdt-autogen.in) === --- xfce4-dev-tools/trunk/scripts/xdt-autogen.in.in (rev 0) +++ xfce4-dev-tools/trunk/scripts/xdt-autogen.in.in 2009-07-28 22:10:06 UTC (rev 30414) @@ -0,0 +1,506 @@ +#!/bin/sh +# +# $Id$ +# +# Copyright (c) 2002-2006 +# The Xfce development team. All rights reserved
[Xfce4-commits] r30405 - xfce4-session/trunk/panel-plugin
Author: kelnos
Date: 2009-07-27 06:36:50 + (Mon, 27 Jul 2009)
New Revision: 30405
Modified:
xfce4-session/trunk/panel-plugin/xfsm-logout-plugin.c
Log:
returning TRUE for size-changed has the same effect
Modified: xfce4-session/trunk/panel-plugin/xfsm-logout-plugin.c
===
--- xfce4-session/trunk/panel-plugin/xfsm-logout-plugin.c 2009-07-27
05:58:56 UTC (rev 30404)
+++ xfce4-session/trunk/panel-plugin/xfsm-logout-plugin.c 2009-07-27
06:36:50 UTC (rev 30405)
@@ -340,19 +340,6 @@
}
static void
-xfsm_logout_plugin_size_changed(XfcePanelPlugin *plugin,
-gint size,
-gpointer user_data)
-{
-GtkWidget *menubar = user_data;
-
-if(xfce_panel_plugin_get_orientation(plugin) == GTK_ORIENTATION_HORIZONTAL)
-gtk_widget_set_size_request(menubar, -1, size);
-else
-gtk_widget_set_size_request(menubar, size, -1);
-}
-
-static void
xfsm_logout_plugin_free_data(XfcePanelPlugin *plugin,
gpointer user_data)
{
@@ -423,10 +410,9 @@
submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(mi));
xfce_panel_plugin_register_menu(plugin, GTK_MENU(submenu));
-/* annoyingly, handling size-changed is required even if we don't
- * do anything special. otherwise we get truncated. */
-g_signal_connect(plugin, size-changed,
- G_CALLBACK(xfsm_logout_plugin_size_changed), menubar);
+/* returning TRUE from size-changed disables the panel's size
+ * handling code for the plugin */
+g_signal_connect(plugin, size-changed, G_CALLBACK(gtk_true), NULL);
g_signal_connect(plugin, free-data,
G_CALLBACK(xfsm_logout_plugin_free_data), logout_plugin);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30408 - in xfce4-dev-tools/trunk: . scripts
Author: kelnos
Date: 2009-07-28 02:14:55 + (Tue, 28 Jul 2009)
New Revision: 30408
Modified:
xfce4-dev-tools/trunk/ChangeLog
xfce4-dev-tools/trunk/NEWS
xfce4-dev-tools/trunk/scripts/xdt-autogen.in
Log:
also support the newer IT_PROG_INTLTOOL macro
Modified: xfce4-dev-tools/trunk/ChangeLog
===
--- xfce4-dev-tools/trunk/ChangeLog 2009-07-27 22:39:11 UTC (rev 30407)
+++ xfce4-dev-tools/trunk/ChangeLog 2009-07-28 02:14:55 UTC (rev 30408)
@@ -1,3 +1,8 @@
+2009-07-27 Brian Tarricone br...@tarricone.org
+
+ * scripts/xdt-autogen.in: Also support newer IT_PROG_INTLTOOL
+ macro.
+
2009-05-04 Brian Tarricone bj...@cornell.edu
* m4macros/xdt-features.m4: Add a bunch more compiler warning
Modified: xfce4-dev-tools/trunk/NEWS
===
--- xfce4-dev-tools/trunk/NEWS 2009-07-27 22:39:11 UTC (rev 30407)
+++ xfce4-dev-tools/trunk/NEWS 2009-07-28 02:14:55 UTC (rev 30408)
@@ -1,3 +1,7 @@
+4.6.2
+=
+- Also support the newer IT_PROG_INTLTOOL macro
+
4.6.0
=
- Replace grep -P with awk and thus make the script more portable. Properly
@@ -4,7 +8,6 @@
detect changed ChangeLogs in SVN. This should get rid the empty lines when
committing several changed ChangeLogs (bug #4716).
-
4.5.93
==
- Remove unreliable and not really needed intltool auto-patch.
Modified: xfce4-dev-tools/trunk/scripts/xdt-autogen.in
===
--- xfce4-dev-tools/trunk/scripts/xdt-autogen.in2009-07-27 22:39:11 UTC
(rev 30407)
+++ xfce4-dev-tools/trunk/scripts/xdt-autogen.in2009-07-28 02:14:55 UTC
(rev 30408)
@@ -161,7 +161,7 @@
##
test -z ${XDT_PROG_INTLTOOLIZE} XDT_PROG_INTLTOOLIZE=intltoolize
for configure_file in $CONFIGURE_FILES; do
- if grep ^AC_PROG_INTLTOOL ${configure_file} /dev/null 21; then
+ if grep -E ^(AC|IT)_PROG_INTLTOOL ${configure_file} /dev/null 21; then
(${XDT_PROG_INTLTOOLIZE} --version) /dev/null /dev/null 21 || {
cat 2 EOF
xdt-autogen: You must have intltool installed on your system.
@@ -345,7 +345,7 @@
fi
fi
- if grep ^AC_PROG_INTLTOOL ${configure_file} /dev/null 21; then
+ if grep -E ^(AC|IT)_PROG_INTLTOOL ${configure_file} /dev/null 21; then
(echo Running ${XDT_PROG_INTLTOOLIZE} --automake --copy --force
cd ${source_dir}
${XDT_PROG_INTLTOOLIZE} --automake --copy --force) || exit 1
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30399 - xfce4-session/trunk
Author: kelnos Date: 2009-07-27 02:14:40 + (Mon, 27 Jul 2009) New Revision: 30399 Modified: xfce4-session/trunk/configure.in.in Log: don't use obsolete autoconf macros; bump AC_PREREQ to 2.59c AC_USE_SYSTEM_EXTENSIONS is hot. AC_AIX, AC_ISC_POSIX, and AC_MINIX are not. Modified: xfce4-session/trunk/configure.in.in === --- xfce4-session/trunk/configure.in.in 2009-07-26 16:42:41 UTC (rev 30398) +++ xfce4-session/trunk/configure.in.in 2009-07-27 02:14:40 UTC (rev 30399) @@ -21,7 +21,7 @@ Written for Xfce by Benedikt Meurer be...@xfce.org.]) AC_INIT([xfce4-session], [xfsm_version], [http://bugs.xfce.org/]) -AC_PREREQ([2.50]) +AC_PREREQ([2.59c]) AC_REVISION([$Id$]) AC_PROG_MAKE_SET() @@ -31,9 +31,7 @@ AM_MAINTAINER_MODE() dnl check for UNIX variants -AC_AIX() -AC_ISC_POSIX() -AC_MINIX() +AC_USE_SYSTEM_EXTENSIONS AM_CONDITIONAL([HAVE_OS_CYGWIN], [test x`uname | grep \CYGWIN\` != x]) if test x`uname | grep \CYGWIN\` != x; then AC_DEFINE([HAVE_OS_CYGWIN], [1], [Compiling under cygwin]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30400 - in xfce4-session/trunk: . panel-plugin po
Author: kelnos Date: 2009-07-27 02:14:51 + (Mon, 27 Jul 2009) New Revision: 30400 Added: xfce4-session/trunk/panel-plugin/ xfce4-session/trunk/panel-plugin/Makefile.am xfce4-session/trunk/panel-plugin/xfsm-logout-plugin-4.6.desktop.in.in xfce4-session/trunk/panel-plugin/xfsm-logout-plugin-ui.xml xfce4-session/trunk/panel-plugin/xfsm-logout-plugin.c xfce4-session/trunk/panel-plugin/xfsm-logout-plugin.desktop.in.in Modified: xfce4-session/trunk/Makefile.am xfce4-session/trunk/configure.in.in xfce4-session/trunk/po/POTFILES.in Log: add panel plugin that lists shutdown/logout actions Modified: xfce4-session/trunk/Makefile.am === --- xfce4-session/trunk/Makefile.am 2009-07-27 02:14:40 UTC (rev 30399) +++ xfce4-session/trunk/Makefile.am 2009-07-27 02:14:51 UTC (rev 30400) @@ -10,8 +10,13 @@ xfce4-session \ xfce4-session-logout\ xfce4-tips \ - xfsm-shutdown-helper + xfsm-shutdown-helper\ + $(panel_plugin_dir) +if HAVE_LIBXFCE4PANEL +panel_plugin_dir = panel-plugin +endif + EXTRA_DIST = \ BUGS\ ChangeLog.pre-xfce-devel\ Modified: xfce4-session/trunk/configure.in.in === --- xfce4-session/trunk/configure.in.in 2009-07-27 02:14:40 UTC (rev 30399) +++ xfce4-session/trunk/configure.in.in 2009-07-27 02:14:51 UTC (rev 30400) @@ -71,12 +71,24 @@ dnl Check for required packages XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0]) XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.6.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0]) XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12]) XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0]) XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.73]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0]) XDT_CHECK_PACKAGE([LIBGLADE], [libglade-2.0], [2.0.0]) +dnl we provide a panel plugin now +XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.6.0], + [panel-plugin], [Panel logout menu button], [yes]) +if test x$LIBXFCE4PANEL_FOUND = xyes; then +PANEL_MINOR=`echo $LIBXFCE4PANEL_VERSION | cut -d. -f2` +if test $PANEL_MINOR -lt 7; then +old_panel_plugin=yes +fi +fi +AM_CONDITIONAL([BUILD_OLD_PANEL_PLUGIN], [test x$old_panel_plugin = xyes]) + dnl Check for gnome support XDT_CHECK_OPTIONAL_PACKAGE([GNOME], [gconf-2.0], [2.4.0], [gnome], [Assistive technologies support], [no]) @@ -164,6 +176,7 @@ icons/scalable/Makefile libxfsm/Makefile libxfsm/xfce4-session-2.0.pc +panel-plugin/Makefile po/Makefile.in settings/Makefile xfce4-session/Makefile Added: xfce4-session/trunk/panel-plugin/Makefile.am === --- xfce4-session/trunk/panel-plugin/Makefile.am (rev 0) +++ xfce4-session/trunk/panel-plugin/Makefile.am2009-07-27 02:14:51 UTC (rev 30400) @@ -0,0 +1,89 @@ +plugindir = $(libdir)/xfce4/panel-plugins + +plugin_sources = \ + xfsm-logout-plugin.c \ + xfsm-logout-plugin-ui.h + +plugin_cflags = \ + $(LIBX11_CFLAGS) \ + $(LIBXFCE4PANEL_CFLAGS) \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(LIBXFCEGUI4_CFLAGS) \ + $(GTK_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + -DLOCALEDIR=\$(localedir)\ + +plugin_libs = \ + $(LIBX11_LIBS) \ + $(LIBXFCE4PANEL_LIBS) \ + $(LIBXFCE4UTIL_LIBS) \ + $(LIBXFCEGUI4_LIBS) \ + $(GTK_LIBS) \ + $(DBUS_GLIB_LIBS) + +if BUILD_OLD_PANEL_PLUGIN + +plugin_PROGRAMS = xfsm-logout-plugin + +xfsm_logout_plugin_SOURCES = $(plugin_sources) +xfsm_logout_plugin_CFLAGS = $(plugin_cflags) +xfsm_logout_plugin_LDADD = $(plugin_libs) + +else + +plugin_LTLIBRARIES = libxfsm-logout-plugin.la + +libxfsm_logout_plugin_la_SOURCES = $(plugin_sources) +libxfsm_logout_plugin_la_CFLAGS = $(plugin_cflags) +libxfsm_logout_plugin_la_LIBADD = $(plugin_libs) +libxfsm_logout_plugin_la_LDFLAGS = \ + -avoid-version \ + -export-dynamic \ + -module \ + -shared + +endif + +# .desktop file +# +# Some automake trickery here. Because we cannot use $(libexecdir) in the +# automake stage, we'll use sed to get the full path into the .desktop file. +# We also need to let intltool merge the translated fields, so we add an +# additional level of indirection: a name.desktop.in.in file. +# +if BUILD_OLD_PANEL_PLUGIN +dfile = xfsm-logout-plugin-4.6.desktop.in.in +else +dfile = xfsm-logout-plugin.desktop.in.in +endif + +desktop_in_in_files = $(dfile)
[Xfce4-commits] r30402 - xfce4-session/trunk/panel-plugin
Author: kelnos Date: 2009-07-27 02:21:49 + (Mon, 27 Jul 2009) New Revision: 30402 Modified: xfce4-session/trunk/panel-plugin/Makefile.am Log: install plugin binary to correct location for 4.6 panel Modified: xfce4-session/trunk/panel-plugin/Makefile.am === --- xfce4-session/trunk/panel-plugin/Makefile.am2009-07-27 02:15:10 UTC (rev 30401) +++ xfce4-session/trunk/panel-plugin/Makefile.am2009-07-27 02:21:49 UTC (rev 30402) @@ -1,5 +1,3 @@ -plugindir = $(libdir)/xfce4/panel-plugins - plugin_sources = \ xfsm-logout-plugin.c \ xfsm-logout-plugin-ui.h @@ -23,6 +21,7 @@ if BUILD_OLD_PANEL_PLUGIN +plugindir = $(libexecdir)/xfce4/panel-plugins plugin_PROGRAMS = xfsm-logout-plugin xfsm_logout_plugin_SOURCES = $(plugin_sources) @@ -31,6 +30,7 @@ else +plugindir = $(libdir)/xfce4/panel-plugins plugin_LTLIBRARIES = libxfsm-logout-plugin.la libxfsm_logout_plugin_la_SOURCES = $(plugin_sources) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30403 - xfce4-session/trunk/panel-plugin
Author: kelnos
Date: 2009-07-27 02:27:43 + (Mon, 27 Jul 2009)
New Revision: 30403
Modified:
xfce4-session/trunk/panel-plugin/xfsm-logout-plugin.c
Log:
add license header and proper include/feature guards
Modified: xfce4-session/trunk/panel-plugin/xfsm-logout-plugin.c
===
--- xfce4-session/trunk/panel-plugin/xfsm-logout-plugin.c 2009-07-27
02:21:49 UTC (rev 30402)
+++ xfce4-session/trunk/panel-plugin/xfsm-logout-plugin.c 2009-07-27
02:27:43 UTC (rev 30403)
@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2009 Brian Tarricone br...@tarricone.org
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * The session id generator was taken from the KDE session manager.
+ * Copyright (c) 2000 Matthias Ettrich ettr...@kde.org
+ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -3,7 +25,15 @@
#endif
+#ifdef HAVE_UNISTD_H
#include unistd.h
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
#include sys/types.h
+#endif
+
+#ifdef HAVE_PWD_H
#include pwd.h
+#endif
#include dbus/dbus-glib.h
@@ -345,8 +375,11 @@
{
XfsmLogoutPlugin *logout_plugin;
GtkUIManager *uimgr;
-GtkWidget *menubar, *mi, *label, *submenu;
+GtkWidget *menubar, *mi, *submenu;
+#ifdef HAVE_GETPWUID
+GtkWidget *label;
struct passwd *pwent;
+#endif
xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, UTF-8);
@@ -374,11 +407,13 @@
mi = gtk_ui_manager_get_widget(uimgr, /main-menubar/session-menu);
+#ifdef HAVE_GETPWUID
pwent = getpwuid(geteuid());
if(pwent) {
label = gtk_bin_get_child(GTK_BIN(mi));
gtk_label_set_text(GTK_LABEL(label), pwent-pw_name);
}
+#endif
menubar = gtk_ui_manager_get_widget(uimgr, /main-menubar);
gtk_container_set_border_width(GTK_CONTAINER(menubar), 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30356 - xfce4-session/trunk/xfce4-session
Author: kelnos
Date: 2009-07-19 21:51:54 + (Sun, 19 Jul 2009)
New Revision: 30356
Modified:
xfce4-session/trunk/xfce4-session/shutdown.c
xfce4-session/trunk/xfce4-session/xfsm-shutdown-helper.c
Log:
add org.freedesktop.PowerManagement support for logout actions
Modified: xfce4-session/trunk/xfce4-session/shutdown.c
===
--- xfce4-session/trunk/xfce4-session/shutdown.c2009-07-19 19:00:59 UTC
(rev 30355)
+++ xfce4-session/trunk/xfce4-session/shutdown.c2009-07-19 21:51:54 UTC
(rev 30356)
@@ -252,6 +252,10 @@
return TRUE;
}
+ /* spawn the helper early so we know what it supports when
+ * constructing the dialog */
+ shutdown_helper = xfsm_shutdown_helper_spawn (NULL);
+
/* It's really bad here if someone else has the pointer
* grabbed, so we first grab the pointer and keyboard
* to an offscreen window, and then once we have the
@@ -426,6 +430,9 @@
label = gtk_label_new (_(Restart));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
+
+ if (!kiosk_can_shutdown || !xfsm_shutdown_helper_supports (shutdown_helper,
XFSM_SHUTDOWN_REBOOT))
+gtk_widget_set_sensitive (reboot_button, FALSE);
/* halt */
halt_button = gtk_button_new ();
@@ -451,8 +458,16 @@
label = gtk_label_new (_(Shut Down));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
+
+ if (!kiosk_can_shutdown || !xfsm_shutdown_helper_supports (shutdown_helper,
XFSM_SHUTDOWN_HALT))
+gtk_widget_set_sensitive (halt_button, FALSE);
+
+ if (show_suspend)
+show_suspend = xfsm_shutdown_helper_supports (shutdown_helper,
XFSM_SHUTDOWN_SUSPEND);
+ if (show_hibernate)
+show_hibernate = xfsm_shutdown_helper_supports (shutdown_helper,
XFSM_SHUTDOWN_HIBERNATE);
- if (show_suspend || show_hibernate)
+ if (kiosk_can_shutdown (show_suspend || show_hibernate))
{
hbox = gtk_hbox_new (FALSE, BORDER);
gtk_widget_show (hbox);
@@ -460,7 +475,7 @@
}
/* suspend */
- if (show_suspend)
+ if (kiosk_can_shutdown show_suspend)
{
suspend_button = gtk_button_new ();
gtk_widget_show (suspend_button);
@@ -488,7 +503,7 @@
}
/* hibernate */
- if (show_hibernate)
+ if (kiosk_can_shutdown show_hibernate)
{
hibernate_button = gtk_button_new ();
gtk_widget_show (hibernate_button);
@@ -536,23 +551,6 @@
/* center dialog on target monitor */
xfce_gtk_window_center_on_monitor (GTK_WINDOW (dialog), screen, monitor);
- /* connect to the shutdown helper */
- if (!kiosk_can_shutdown ||
- (shutdown_helper = xfsm_shutdown_helper_spawn (NULL)) == NULL)
-{
- gtk_widget_set_sensitive (reboot_button, FALSE);
- gtk_widget_set_sensitive (halt_button, FALSE);
- if (suspend_button)
-gtk_widget_set_sensitive (suspend_button, FALSE);
- if (hibernate_button)
-gtk_widget_set_sensitive (hibernate_button, FALSE);
-}
-
- if (suspend_button !xfsm_shutdown_helper_supports (shutdown_helper,
XFSM_SHUTDOWN_SUSPEND))
-gtk_widget_hide (suspend_button);
- if (hibernate_button !xfsm_shutdown_helper_supports (shutdown_helper,
XFSM_SHUTDOWN_HIBERNATE))
-gtk_widget_hide (hibernate_button);
-
/* save portion of the root window covered by the dialog */
if (!accessibility shutdown_helper != NULL)
{
Modified: xfce4-session/trunk/xfce4-session/xfsm-shutdown-helper.c
===
--- xfce4-session/trunk/xfce4-session/xfsm-shutdown-helper.c2009-07-19
19:00:59 UTC (rev 30355)
+++ xfce4-session/trunk/xfce4-session/xfsm-shutdown-helper.c2009-07-19
21:51:54 UTC (rev 30356)
@@ -65,6 +65,14 @@
#include shutdown.h
#include xfsm-shutdown-helper.h
+typedef enum
+{
+XFSM_SHUTDOWN_SUDO = 0,
+XFSM_SHUTDOWN_HAL,
+XFSM_SHUTDOWN_POWER_MANAGER,
+} XfsmShutdownBackend;
+
+
static struct
{
XfsmShutdownType command;
@@ -79,17 +87,19 @@
struct _XfsmShutdownHelper
{
- gchar *sudo;
- pid_tpid;
- FILE*infile;
- FILE*outfile;
- gboolean use_hal;
- gboolean need_password;
+ XfsmShutdownBackend backend;
+
+ gchar *sudo;
+ pid_t pid;
+ FILE *infile;
+ FILE *outfile;
+ gbooleanneed_password;
};
static DBusConnection *
-xfsm_shutdown_helper_dbus_connect (GError **error)
+xfsm_shutdown_helper_dbus_connect (DBusBusType bus_type,
+ GError **error)
{
DBusConnection *connection;
DBusError derror;
@@ -98,7 +108,7 @@
dbus_error_init (derror);
/* connect to the system message bus */
- connection = dbus_bus_get (DBUS_BUS_SYSTEM, derror);
+ connection = dbus_bus_get (bus_type, derror);
if (G_UNLIKELY (connection == NULL))
{
g_warning (G_STRLOC : Failed to connect to the system message bus: %s,
[Xfce4-commits] r30319 - xfce4-session/trunk/xfce4-session
Author: kelnos
Date: 2009-07-16 07:16:26 + (Thu, 16 Jul 2009)
New Revision: 30319
Modified:
xfce4-session/trunk/xfce4-session/shutdown.c
xfce4-session/trunk/xfce4-session/shutdown.h
xfce4-session/trunk/xfce4-session/xfsm-global.h
xfce4-session/trunk/xfce4-session/xfsm-shutdown-helper.c
xfce4-session/trunk/xfce4-session/xfsm-shutdown-helper.h
Log:
query HAL if suspend/hibernate are supported
also clear up internal confusion by getting rid of the
XfsmShutdownCommand type and just using XfsmShutdownType everywhere
Modified: xfce4-session/trunk/xfce4-session/shutdown.c
===
--- xfce4-session/trunk/xfce4-session/shutdown.c2009-07-15 15:41:36 UTC
(rev 30318)
+++ xfce4-session/trunk/xfce4-session/shutdown.c2009-07-16 07:16:26 UTC
(rev 30319)
@@ -548,6 +548,11 @@
gtk_widget_set_sensitive (hibernate_button, FALSE);
}
+ if (suspend_button !xfsm_shutdown_helper_supports (shutdown_helper,
XFSM_SHUTDOWN_SUSPEND))
+gtk_widget_hide (suspend_button);
+ if (hibernate_button !xfsm_shutdown_helper_supports (shutdown_helper,
XFSM_SHUTDOWN_HIBERNATE))
+gtk_widget_hide (hibernate_button);
+
/* save portion of the root window covered by the dialog */
if (!accessibility shutdown_helper != NULL)
{
Modified: xfce4-session/trunk/xfce4-session/shutdown.h
===
--- xfce4-session/trunk/xfce4-session/shutdown.h2009-07-15 15:41:36 UTC
(rev 30318)
+++ xfce4-session/trunk/xfce4-session/shutdown.h2009-07-16 07:16:26 UTC
(rev 30319)
@@ -24,16 +24,7 @@
#include glib.h
-/* */
-typedef enum
-{
- XFSM_SHUTDOWN_ASK = 0,
- XFSM_SHUTDOWN_LOGOUT,
- XFSM_SHUTDOWN_HALT,
- XFSM_SHUTDOWN_REBOOT,
- XFSM_SHUTDOWN_SUSPEND,
- XFSM_SHUTDOWN_HIBERNATE,
-} XfsmShutdownType;
+#include xfsm-global.h
/* prototypes */
extern gbooleanshutdownDialog(const gchar *sessionName,
Modified: xfce4-session/trunk/xfce4-session/xfsm-global.h
===
--- xfce4-session/trunk/xfce4-session/xfsm-global.h 2009-07-15 15:41:36 UTC
(rev 30318)
+++ xfce4-session/trunk/xfce4-session/xfsm-global.h 2009-07-16 07:16:26 UTC
(rev 30319)
@@ -28,6 +28,15 @@
#include xfce4-session/xfsm-splash-screen.h
+typedef enum
+{
+ XFSM_SHUTDOWN_ASK = 0,
+ XFSM_SHUTDOWN_LOGOUT,
+ XFSM_SHUTDOWN_HALT,
+ XFSM_SHUTDOWN_REBOOT,
+ XFSM_SHUTDOWN_SUSPEND,
+ XFSM_SHUTDOWN_HIBERNATE,
+} XfsmShutdownType;
typedef struct _FailsafeClient FailsafeClient;
struct _FailsafeClient
Modified: xfce4-session/trunk/xfce4-session/xfsm-shutdown-helper.c
===
--- xfce4-session/trunk/xfce4-session/xfsm-shutdown-helper.c2009-07-15
15:41:36 UTC (rev 30318)
+++ xfce4-session/trunk/xfce4-session/xfsm-shutdown-helper.c2009-07-16
07:16:26 UTC (rev 30319)
@@ -67,7 +67,7 @@
static struct
{
- XfsmShutdownCommand command;
+ XfsmShutdownType command;
gchar * name;
} command_name_map[] = {
{ XFSM_SHUTDOWN_HALT, Shutdown },
@@ -88,18 +88,12 @@
};
-
-static gboolean
-xfsm_shutdown_helper_hal_check (XfsmShutdownHelper *helper,
-GError **error)
+static DBusConnection *
+xfsm_shutdown_helper_dbus_connect (GError **error)
{
DBusConnection *connection;
- DBusMessage*message;
- DBusMessage*result;
DBusError derror;
- g_return_val_if_fail (helper (!error || !*error), FALSE);
-
/* initialize the error */
dbus_error_init (derror);
@@ -111,9 +105,31 @@
if (error)
dbus_set_g_error (error, derror);
dbus_error_free (derror);
- return FALSE;
+ return NULL;
}
+ return connection;
+}
+
+
+static gboolean
+xfsm_shutdown_helper_hal_check (XfsmShutdownHelper *helper,
+GError **error)
+{
+ DBusConnection *connection;
+ DBusMessage*message;
+ DBusMessage*result;
+ DBusError derror;
+
+ g_return_val_if_fail (helper (!error || !*error), FALSE);
+
+ connection = xfsm_shutdown_helper_dbus_connect (error);
+ if (!connection)
+return FALSE;
+
+ /* initialize the error */
+ dbus_error_init (derror);
+
/* this is a simple trick to check whether we are allowed to
* use the org.freedesktop.Hal.Device.SystemPowerManagement
* interface without shutting down/rebooting now.
@@ -166,7 +182,7 @@
static gboolean
xfsm_shutdown_helper_hal_send (XfsmShutdownHelper *helper,
- XfsmShutdownCommand command,
+ XfsmShutdownType command,
GError **error)
{
DBusConnection *connection;
@@ -201,20 +217,13 @@
return FALSE;
}
+ connection = xfsm_shutdown_helper_dbus_connect (error);
+ if(!connection)
+return FALSE;
+
/* initialize the error */
dbus_error_init (derror);
-
[Xfce4-commits] r30321 - in xfce4-session/trunk: . xfce4-tips xfce4-tips/data
Author: kelnos
Date: 2009-07-16 17:31:39 + (Thu, 16 Jul 2009)
New Revision: 30321
Modified:
xfce4-session/trunk/NEWS
xfce4-session/trunk/xfce4-tips/data/Makefile.am
xfce4-session/trunk/xfce4-tips/main.c
Log:
allow xfce4-tips to work properly without 'fortune' installed (bug 2871)
patch from Enrico Troeger enrico.troe...@uvena.de
Modified: xfce4-session/trunk/NEWS
===
--- xfce4-session/trunk/NEWS2009-07-16 07:19:38 UTC (rev 30320)
+++ xfce4-session/trunk/NEWS2009-07-16 17:31:39 UTC (rev 30321)
@@ -3,6 +3,7 @@
- Query HAL to be sure suspend and hibernate are supported. If not,
don't even show the buttons (bug 4952).
+- Allow xfce4-tips to work when 'fortune' is not installed (bug 2871).
4.6.1
=
Modified: xfce4-session/trunk/xfce4-tips/data/Makefile.am
===
--- xfce4-session/trunk/xfce4-tips/data/Makefile.am 2009-07-16 07:19:38 UTC
(rev 30320)
+++ xfce4-session/trunk/xfce4-tips/data/Makefile.am 2009-07-16 17:31:39 UTC
(rev 30321)
@@ -1,10 +1,5 @@
tipsdir = $(datadir)/xfce4/tips
-tips_DATA =\
- tips\
- tips.dat
+tips_DATA =tips
-tips.dat: $(srcdir)/tips
- strfile $(srcdir)/tips tips.dat
-
EXTRA_DIST = $(tips_DATA)
Modified: xfce4-session/trunk/xfce4-tips/main.c
===
--- xfce4-session/trunk/xfce4-tips/main.c 2009-07-16 07:19:38 UTC (rev
30320)
+++ xfce4-session/trunk/xfce4-tips/main.c 2009-07-16 17:31:39 UTC (rev
30321)
@@ -52,9 +52,66 @@
static GtkWidget *dlg = NULL;
static guint option = OPTION_TIPS;
+static gchar *fortune_cmd = NULL;
+static GPtrArray *tips = NULL;
+static void
+read_tips_from_file (void)
+{
+ gchar *data;
+ gchar *entry;
+ gsize len;
+ guint i, j;
+ GError *error = NULL;
+ /* read the whole file */
+ g_file_get_contents (TIPSDIR /tips, data, len, error);
+
+ tips = g_ptr_array_new ();
+ if (error != NULL)
+{
+ g_ptr_array_add (tips, g_strdup_printf (_(Could not load tips database
(%s).),
+error-message));
+ g_free (data);
+ g_error_free (error);
+ return;
+}
+
+ entry = g_malloc (len + 1);
+ i = j = 0;
+ while (data[i])
+{
+ if (data[i] == '%')
+{
+ /* add a new tip */
+ entry[j] = '\0';
+ j = 0;
+ if (entry[0])
+g_ptr_array_add (tips, g_strdup(entry));
+ /* skip the following line break character(s) */
+ if (data[i] == '\r' (i + 1) len data[i + 1] == '\n')
+ i += 2;
+ else
+ i += 1;
+}
+ else
+entry[j++] = data[i];
+
+ i++;
+}
+ g_free (data);
+ g_free (entry);
+}
+
+
+static void
+free_tip (gpointer data, gpointer user_data)
+{
+ g_free (data);
+}
+
+
static gboolean
autostart_enabled (void)
{
@@ -95,45 +152,91 @@
item_cb (GtkWidget *btn,
gpointer data)
{
- option = GPOINTER_TO_UINT(data);
+ option = GPOINTER_TO_UINT (data);
gtk_window_set_title (GTK_WINDOW (dlg), _(titles[option]));
}
+static gchar*
+run_fortune (void)
+{
+ GError *error = NULL;
+ gchar *out = NULL;
+ gchar *err = NULL;
+ gchar *buffer = NULL;
+
+ if (fortune_cmd != NULL g_spawn_command_line_sync (fortune_cmd, out,
err, NULL, error))
+{
+ if (out != NULL *out != '\0')
+{
+ /* check output for valid UTF-8 */
+ if (g_utf8_validate (out, -1, NULL))
+buffer = out;
+ else
+{
+ /* we got something else than UTF-8, try to convert it from the
user's locale */
+ buffer = g_locale_to_utf8 (out, -1, NULL, NULL, NULL);
+ if (buffer == NULL)
+ {
+/* converting it from the user's locale failed too, we give up
*/
+buffer = g_strdup_printf (_(Invalid output of fortune.));
+ }
+}
+ }
+ else
+buffer = g_strdup_printf (_(Executing fortune failed (%s)), err);
+
+ if (buffer != out)
+g_free (out);
+ g_free(err);
+}
+ else
+{
+ buffer = g_strdup_printf (_(Executing fortune failed (%s)),
error-message);
+ g_error_free (error);
+}
+
+ return buffer;
+}
+
+
+
static void
next_cb(GtkWidget *btn, GtkTextBuffer *textbuf)
{
- gchar buffer[1024];
+ gchar *buffer = NULL;
GtkTextIter start;
GtkTextIter end;
- FILE *fp;
/* clear the text buffer */
- gtk_text_buffer_get_bounds(textbuf, start, end);
- gtk_text_buffer_delete(textbuf, start, end);
+ gtk_text_buffer_get_bounds (textbuf, start, end);
+ gtk_text_buffer_delete (textbuf, start, end);
- switch (option) {
- case OPTION_TIPS:
-strcpy(buffer, fortune TIPSDIR /tips);
-break;
+ switch
[Xfce4-commits] r30297 - in libxfce4ui/trunk: . libxfce4smclient-private
Author: kelnos Date: 2009-07-13 06:36:01 + (Mon, 13 Jul 2009) New Revision: 30297 Modified: libxfce4ui/trunk/configure.in.in libxfce4ui/trunk/libxfce4smclient-private/Makefile.am Log: suppress warnings about breaking strict aliasing rules for EggSMClient at this point, i don't think it's worth trying to fix, and will only make merging upstream changes harder Modified: libxfce4ui/trunk/configure.in.in === --- libxfce4ui/trunk/configure.in.in2009-07-12 21:35:37 UTC (rev 30296) +++ libxfce4ui/trunk/configure.in.in2009-07-13 06:36:01 UTC (rev 30297) @@ -164,6 +164,12 @@ fi AM_CONDITIONAL([ENABLE_SMCLIENT_LIBRARY], [test x$enable_smclient_library = xyes]) +dnl EggSMClient breaks strict aliasing rules. Since I don't think it's +dnl worth fixing it, let's just disable the warning so --enable-debug=full +dnl doesn't error out. +XDT_SUPPORTED_FLAGS([NO_STRICT_ALIASING_CFLAGS], [-fno-strict-aliasing]) +AC_SUBST([NO_STRICT_ALIASING_CFLAGS]) + dnl * dnl *** Optional support for the Glade Interface Designer *** dnl * Modified: libxfce4ui/trunk/libxfce4smclient-private/Makefile.am === --- libxfce4ui/trunk/libxfce4smclient-private/Makefile.am 2009-07-12 21:35:37 UTC (rev 30296) +++ libxfce4ui/trunk/libxfce4smclient-private/Makefile.am 2009-07-13 06:36:01 UTC (rev 30297) @@ -9,6 +9,7 @@ -DG_LOG_DOMAIN=\libxfce4smclient-private\ \ -DPACKAGE_LOCALE_DIR=\$(localedir)\ \ -DPREFIX=\$(prefix)\ \ + $(NO_STRICT_ALIASING_CFLAGS) \ $(PLATFORM_CPPFLAGS) if PLATFORM_OSX ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30009 - xfdesktop/trunk/panel-plugin
Author: kelnos
Date: 2009-06-13 18:11:19 + (Sat, 13 Jun 2009)
New Revision: 30009
Modified:
xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c
Log:
remove deprecated code
Modified: xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c
===
--- xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c 2009-06-13 17:11:09 UTC
(rev 30008)
+++ xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c 2009-06-13 18:11:19 UTC
(rev 30009)
@@ -1,7 +1,7 @@
/*
* desktop-menu-plugin.c - xfce4-panel plugin that displays the desktop menu
*
- * Copyright (C) 2004 Brian Tarricone, bj...@cornell.edu
+ * Copyright (C) 2004-2009 Brian Tarricone, bj...@cornell.edu
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -122,28 +122,9 @@
if(!filename)
return NULL;
-#if GTK_CHECK_VERSION(2, 8, 0)
w = orientation == GTK_ORIENTATION_HORIZONTAL ? -1 : size;
h = orientation == GTK_ORIENTATION_VERTICAL ? -1 : size;
pix = gdk_pixbuf_new_from_file_at_scale(filename, w, h, TRUE, NULL);
-#else
-pix = gdk_pixbuf_new_from_file(filename, NULL);
-if(pix) {
-GdkPixbuf *tmp;
-gdouble aspect;
-
-w = gdk_pixbuf_get_width(pix);
-h = gdk_pixbuf_get_height(pix);
-aspect = (gdouble)w / h;
-
-w = orientation == GTK_ORIENTATION_HORIZONTAL ? size*aspect : size;
-h = orientation == GTK_ORIENTATION_VERTICAL ? size*aspect : size;
-
-tmp = gdk_pixbuf_scale_simple(pix, w, h, GDK_INTERP_BILINEAR);
-g_object_unref(G_OBJECT(pix));
-pix = tmp;
-}
-#endif
g_free(filename);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30010 - in xfdesktop/trunk: . settings
Author: kelnos
Date: 2009-06-13 18:11:32 + (Sat, 13 Jun 2009)
New Revision: 30010
Modified:
xfdesktop/trunk/NEWS
xfdesktop/trunk/settings/main.c
Log:
add image DnD to settings dialog (bug 4337)
Modified: xfdesktop/trunk/NEWS
===
--- xfdesktop/trunk/NEWS2009-06-13 18:11:19 UTC (rev 30009)
+++ xfdesktop/trunk/NEWS2009-06-13 18:11:32 UTC (rev 30010)
@@ -1,3 +1,9 @@
+Xfce 4.7.x
+--
+
+ * Allow DnD to image list in settings dialog (bug 4337).
+
+
Xfce 4.6.2
--
Modified: xfdesktop/trunk/settings/main.c
===
--- xfdesktop/trunk/settings/main.c 2009-06-13 18:11:19 UTC (rev 30009)
+++ xfdesktop/trunk/settings/main.c 2009-06-13 18:11:32 UTC (rev 30010)
@@ -128,7 +128,12 @@
N_ICON_COLS,
};
+enum
+{
+TARGET_TEXT_URI_LIST = 0,
+};
+
/* assumes gdk lock is held on function enter, and should be held
* on function exit */
static void
@@ -355,6 +360,53 @@
}
static GtkTreeIter *
+xfdesktop_settings_image_treeview_add(GtkTreeModel *model,
+ const char *path)
+{
+gboolean added = FALSE;
+GtkTreeIter iter;
+gchar *name = NULL, *name_utf8 = NULL, *name_markup = NULL;
+gchar *lower = NULL, *key = NULL;
+
+/* FIXME: this is probably too slow */
+if(!xfdesktop_image_file_is_valid(path))
+return NULL;
+
+name = g_path_get_basename(path);
+if(name) {
+name_utf8 = g_filename_to_utf8(name, strlen(name),
+ NULL, NULL, NULL);
+if(name_utf8) {
+name_markup = g_markup_printf_escaped(b%s/b,
+ name_utf8);
+
+lower = g_utf8_strdown(name_utf8, -1);
+key = g_utf8_collate_key(lower, -1);
+
+gtk_list_store_append(GTK_LIST_STORE(model), iter);
+gtk_list_store_set(GTK_LIST_STORE(model), iter,
+ COL_NAME, name_markup,
+ COL_FILENAME, path,
+ COL_COLLATE_KEY, key,
+ -1);
+
+added = TRUE;
+}
+}
+
+g_free(name);
+g_free(name_utf8);
+g_free(name_markup);
+g_free(lower);
+g_free(key);
+
+if(added)
+return gtk_tree_iter_copy(iter);
+else
+return NULL;
+}
+
+static GtkTreeIter *
xfdesktop_image_list_add_dir(GtkListStore *ls,
const char *path,
const char *cur_image_file)
@@ -362,7 +414,7 @@
GDir *dir;
gboolean needs_slash = TRUE;
const gchar *file;
-GtkTreeIter iter, *iter_ret = NULL;
+GtkTreeIter *iter, *iter_ret = NULL;
gchar buf[PATH_MAX];
dir = g_dir_open(path, 0, 0);
@@ -376,31 +428,12 @@
g_snprintf(buf, sizeof(buf), needs_slash ? %s/%s : %s%s,
path, file);
-/* FIXME: this is probably too slow */
-if(xfdesktop_image_file_is_valid(buf)) {
-gchar *name, *name_markup, *key = NULL;
-
-name = g_filename_to_utf8(file, strlen(file), NULL, NULL, NULL);
-name_markup = g_markup_printf_escaped(b%s/b, name);
-if(name) {
-gchar *lower = g_utf8_strdown(name, -1);
-key = g_utf8_collate_key(lower, -1);
-g_free(lower);
-}
-
-gtk_list_store_append(ls, iter);
-gtk_list_store_set(ls, iter,
- COL_NAME, name_markup,
- COL_FILENAME, buf,
- COL_COLLATE_KEY, key,
- -1);
-
-if(cur_image_file !strcmp(buf, cur_image_file))
-iter_ret = gtk_tree_iter_copy(iter);
-
-g_free(name);
-g_free(name_markup);
-g_free(key);
+iter = xfdesktop_settings_image_treeview_add(GTK_TREE_MODEL(ls), buf);
+if(iter) {
+if(cur_image_file !iter_ret !strcmp(buf, cur_image_file))
+iter_ret = iter;
+else
+gtk_tree_iter_free(iter);
}
}
@@ -548,7 +581,7 @@
{
gchar prop_image[1024], prop_last[1024], *image_file;
GtkListStore *ls;
-GtkTreeIter iter, *image_file_iter = NULL;
+GtkTreeIter *image_file_iter = NULL;
gboolean do_sort = TRUE;
GtkTreeSelection *sel;
@@ -597,24 +630,9 @@
xfconf_channel_set_string(panel-channel, prop_last, image_file);
for(i = 0; images[i]; ++i) {
-gchar *name, *name_markup;
-
-name = g_strrstr(images[i], G_DIR_SEPARATOR_S);
-if(name)
-name++;
-else
-name = images[i];
-name = g_filename_to_utf8(name, strlen(name), NULL, NULL,
NULL);
-
[Xfce4-commits] r30011 - xfdesktop/trunk/common
Author: kelnos
Date: 2009-06-13 18:54:59 + (Sat, 13 Jun 2009)
New Revision: 30011
Modified:
xfdesktop/trunk/common/xfdesktop-common.c
Log:
no need to use FILE stream here
Modified: xfdesktop/trunk/common/xfdesktop-common.c
===
--- xfdesktop/trunk/common/xfdesktop-common.c 2009-06-13 18:11:32 UTC (rev
30010)
+++ xfdesktop/trunk/common/xfdesktop-common.c 2009-06-13 18:54:59 UTC (rev
30011)
@@ -24,6 +24,10 @@
#include stdio.h
+#ifdef HAVE_FCNTL_H
+#include fcntl.h
+#endif
+
#ifdef HAVE_STRING_H
#include string.h
#endif
@@ -47,6 +51,10 @@
#include xfdesktop-common.h
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
gboolean
xfdesktop_backdrop_list_is_valid(const gchar *path)
{
@@ -258,31 +266,32 @@
xfdesktop_image_file_is_valid(const gchar *filename)
{
GdkPixbufLoader *loader;
-FILE *fp;
+int fd;
gboolean size_read = FALSE;
guchar buf[4096];
-gint len;
+gsize len;
g_return_val_if_fail(filename, FALSE);
-fp = fopen(filename, rb);
-if(!fp)
+fd = open(filename, O_RDONLY|O_BINARY);
+if(fd 0)
return FALSE;
loader = gdk_pixbuf_loader_new();
g_signal_connect(G_OBJECT(loader), size-prepared,
G_CALLBACK(pixbuf_loader_size_cb), size_read);
-while(!feof(fp) !ferror(fp)) {
-if((len=fread(buf, 1, sizeof(buf), fp)) 0) {
+do {
+len = read(fd, buf, sizeof(buf));
+if(len 0) {
if(!gdk_pixbuf_loader_write(loader, buf, len, NULL))
break;
if(size_read)
break;
}
-}
+} while(len 0);
-fclose(fp);
+close(fd);
gdk_pixbuf_loader_close(loader, NULL);
g_object_unref(G_OBJECT(loader));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30012 - xfdesktop/trunk/settings
Author: kelnos Date: 2009-06-13 18:55:11 + (Sat, 13 Jun 2009) New Revision: 30012 Modified: xfdesktop/trunk/settings/main.c Log: it actually isn't slow Modified: xfdesktop/trunk/settings/main.c === --- xfdesktop/trunk/settings/main.c 2009-06-13 18:54:59 UTC (rev 30011) +++ xfdesktop/trunk/settings/main.c 2009-06-13 18:55:11 UTC (rev 30012) @@ -368,7 +368,6 @@ gchar *name = NULL, *name_utf8 = NULL, *name_markup = NULL; gchar *lower = NULL, *key = NULL; -/* FIXME: this is probably too slow */ if(!xfdesktop_image_file_is_valid(path)) return NULL; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30015 - xfdesktop/trunk/src
Author: kelnos
Date: 2009-06-14 00:59:41 + (Sun, 14 Jun 2009)
New Revision: 30015
Modified:
xfdesktop/trunk/src/xfdesktop-icon-view.c
xfdesktop/trunk/src/xfdesktop-icon-view.h
xfdesktop/trunk/src/xfdesktop-marshal.list
Log:
use GtkBindingSet for keyboard handling on desktop
this fixes a bunch of problems and ensures the keybindings are set
correctly regardless of the keymap set. also as a side benefit it lets
the user override the bindings in a gtkrc file
Modified: xfdesktop/trunk/src/xfdesktop-icon-view.c
===
--- xfdesktop/trunk/src/xfdesktop-icon-view.c 2009-06-13 23:17:28 UTC (rev
30014)
+++ xfdesktop/trunk/src/xfdesktop-icon-view.c 2009-06-14 00:59:41 UTC (rev
30015)
@@ -41,6 +41,7 @@
#endif
#include xfdesktop-icon-view.h
+#include xfdesktop-marshal.h
#include libwnck/libwnck.h
#include libxfcegui4/libxfcegui4.h
@@ -72,18 +73,16 @@
#define DUMP_GRID_LAYOUT(icon_view)
#endif
-typedef enum
-{
-XFDESKTOP_DIRECTION_UP = 0,
-XFDESKTOP_DIRECTION_DOWN,
-XFDESKTOP_DIRECTION_LEFT,
-XFDESKTOP_DIRECTION_RIGHT,
-} XfdesktopDirection;
-
enum
{
SIG_ICON_SELECTION_CHANGED = 0,
SIG_ICON_ACTIVATED,
+SIG_SELECT_ALL,
+SIG_UNSELECT_ALL,
+SIG_SELECT_CURSOR_ITEM,
+SIG_TOGGLE_CURSOR_ITEM,
+SIG_MOVE_CURSOR,
+SIG_ACTIVATE_CURSOR_ITEM,
SIG_N_SIGNALS,
};
@@ -136,7 +135,7 @@
GdkColor *selection_box_color;
guchar selection_box_alpha;
-XfdesktopIcon *last_clicked_item;
+XfdesktopIcon *cursor;
XfdesktopIcon *first_clicked_item;
XfdesktopIcon *item_under_pointer;
@@ -228,6 +227,11 @@
static void xfdesktop_icon_view_finalize(GObject *obj);
+static void xfdesktop_icon_view_add_move_binding(GtkBindingSet *binding_set,
+ guint keyval,
+ guint modmask,
+ GtkMovementStep step,
+ gint count);
static void xfdesktop_icon_view_invalidate_icon(XfdesktopIconView *icon_view,
XfdesktopIcon *icon);
#ifdef HAVE_LIBEXO
@@ -265,10 +269,7 @@
gconstpointer user_data);
static void xfdesktop_list_foreach_invalidate(gpointer data,
gpointer user_data);
-static void xfdesktop_grid_find_nearest(XfdesktopIconView *icon_view,
-XfdesktopIcon *icon,
-XfdesktopDirection dir,
-gboolean allow_multiple);
+
static inline void xfdesktop_xy_to_rowcol(XfdesktopIconView *icon_view,
gint x,
gint y,
@@ -307,6 +308,14 @@
gpointer user_data);
#endif
+static void xfdesktop_icon_view_real_select_all(XfdesktopIconView *icon_view);
+static void xfdesktop_icon_view_real_unselect_all(XfdesktopIconView
*icon_view);
+static void xfdesktop_icon_view_real_select_cursor_item(XfdesktopIconView
*icon_view);
+static void xfdesktop_icon_view_real_toggle_cursor_item(XfdesktopIconView
*icon_view);
+static gboolean
xfdesktop_icon_view_real_activate_cursor_item(XfdesktopIconView *icon_view);
+static gboolean xfdesktop_icon_view_real_move_cursor(XfdesktopIconView
*icon_view,
+ GtkMovementStep step,
+ gint count);
enum
{
@@ -331,6 +340,9 @@
{
GObjectClass *gobject_class = (GObjectClass *)klass;
GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
+GtkBindingSet *binding_set;
+
+binding_set = gtk_binding_set_by_class(klass);
//g_type_class_peek(g_type_from_name(XfceDesktop)));
g_type_class_add_private(klass, sizeof(XfdesktopIconViewPrivate));
@@ -347,6 +359,13 @@
widget_class-drag_data_get = xfdesktop_icon_view_drag_data_get;
widget_class-drag_data_received = xfdesktop_icon_view_drag_data_received;
+klass-select_all = xfdesktop_icon_view_real_select_all;
+klass-unselect_all = xfdesktop_icon_view_real_unselect_all;
+klass-select_cursor_item = xfdesktop_icon_view_real_select_cursor_item;
+klass-toggle_cursor_item = xfdesktop_icon_view_real_toggle_cursor_item;
+klass-activate_cursor_item =
xfdesktop_icon_view_real_activate_cursor_item;
+klass-move_cursor = xfdesktop_icon_view_real_move_cursor;
+
__signals[SIG_ICON_SELECTION_CHANGED] =
g_signal_new(icon-selection-changed,
XFDESKTOP_TYPE_ICON_VIEW,
G_SIGNAL_RUN_LAST,
@@ -364,15 +383,71 @@
NULL, NULL,
[Xfce4-commits] r30016 - xfdesktop/branches/xfce_4_6/src
Author: kelnos
Date: 2009-06-14 01:00:40 + (Sun, 14 Jun 2009)
New Revision: 30016
Modified:
xfdesktop/branches/xfce_4_6/src/xfdesktop-icon-view.c
xfdesktop/branches/xfce_4_6/src/xfdesktop-icon-view.h
xfdesktop/branches/xfce_4_6/src/xfdesktop-marshal.list
Log:
use GtkBindingSet for keyboard handling on desktop
this fixes a bunch of problems and ensures the keybindings are set
correctly regardless of the keymap set. also as a side benefit it lets
the user override the bindings in a gtkrc file
Modified: xfdesktop/branches/xfce_4_6/src/xfdesktop-icon-view.c
===
--- xfdesktop/branches/xfce_4_6/src/xfdesktop-icon-view.c 2009-06-14
00:59:41 UTC (rev 30015)
+++ xfdesktop/branches/xfce_4_6/src/xfdesktop-icon-view.c 2009-06-14
01:00:40 UTC (rev 30016)
@@ -41,6 +41,7 @@
#endif
#include xfdesktop-icon-view.h
+#include xfdesktop-marshal.h
#include libwnck/libwnck.h
#include libxfcegui4/libxfcegui4.h
@@ -72,18 +73,16 @@
#define DUMP_GRID_LAYOUT(icon_view)
#endif
-typedef enum
-{
-XFDESKTOP_DIRECTION_UP = 0,
-XFDESKTOP_DIRECTION_DOWN,
-XFDESKTOP_DIRECTION_LEFT,
-XFDESKTOP_DIRECTION_RIGHT,
-} XfdesktopDirection;
-
enum
{
SIG_ICON_SELECTION_CHANGED = 0,
SIG_ICON_ACTIVATED,
+SIG_SELECT_ALL,
+SIG_UNSELECT_ALL,
+SIG_SELECT_CURSOR_ITEM,
+SIG_TOGGLE_CURSOR_ITEM,
+SIG_MOVE_CURSOR,
+SIG_ACTIVATE_CURSOR_ITEM,
SIG_N_SIGNALS,
};
@@ -136,7 +135,7 @@
GdkColor *selection_box_color;
guchar selection_box_alpha;
-XfdesktopIcon *last_clicked_item;
+XfdesktopIcon *cursor;
XfdesktopIcon *first_clicked_item;
XfdesktopIcon *item_under_pointer;
@@ -228,6 +227,11 @@
static void xfdesktop_icon_view_finalize(GObject *obj);
+static void xfdesktop_icon_view_add_move_binding(GtkBindingSet *binding_set,
+ guint keyval,
+ guint modmask,
+ GtkMovementStep step,
+ gint count);
static void xfdesktop_icon_view_invalidate_icon(XfdesktopIconView *icon_view,
XfdesktopIcon *icon);
#ifdef HAVE_LIBEXO
@@ -265,10 +269,7 @@
gconstpointer user_data);
static void xfdesktop_list_foreach_invalidate(gpointer data,
gpointer user_data);
-static void xfdesktop_grid_find_nearest(XfdesktopIconView *icon_view,
-XfdesktopIcon *icon,
-XfdesktopDirection dir,
-gboolean allow_multiple);
+
static inline void xfdesktop_xy_to_rowcol(XfdesktopIconView *icon_view,
gint x,
gint y,
@@ -307,6 +308,14 @@
gpointer user_data);
#endif
+static void xfdesktop_icon_view_real_select_all(XfdesktopIconView *icon_view);
+static void xfdesktop_icon_view_real_unselect_all(XfdesktopIconView
*icon_view);
+static void xfdesktop_icon_view_real_select_cursor_item(XfdesktopIconView
*icon_view);
+static void xfdesktop_icon_view_real_toggle_cursor_item(XfdesktopIconView
*icon_view);
+static gboolean
xfdesktop_icon_view_real_activate_cursor_item(XfdesktopIconView *icon_view);
+static gboolean xfdesktop_icon_view_real_move_cursor(XfdesktopIconView
*icon_view,
+ GtkMovementStep step,
+ gint count);
enum
{
@@ -331,6 +340,9 @@
{
GObjectClass *gobject_class = (GObjectClass *)klass;
GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
+GtkBindingSet *binding_set;
+
+binding_set = gtk_binding_set_by_class(klass);
//g_type_class_peek(g_type_from_name(XfceDesktop)));
g_type_class_add_private(klass, sizeof(XfdesktopIconViewPrivate));
@@ -347,6 +359,13 @@
widget_class-drag_data_get = xfdesktop_icon_view_drag_data_get;
widget_class-drag_data_received = xfdesktop_icon_view_drag_data_received;
+klass-select_all = xfdesktop_icon_view_real_select_all;
+klass-unselect_all = xfdesktop_icon_view_real_unselect_all;
+klass-select_cursor_item = xfdesktop_icon_view_real_select_cursor_item;
+klass-toggle_cursor_item = xfdesktop_icon_view_real_toggle_cursor_item;
+klass-activate_cursor_item =
xfdesktop_icon_view_real_activate_cursor_item;
+klass-move_cursor = xfdesktop_icon_view_real_move_cursor;
+
__signals[SIG_ICON_SELECTION_CHANGED] =
g_signal_new(icon-selection-changed,
XFDESKTOP_TYPE_ICON_VIEW,
G_SIGNAL_RUN_LAST,
@@ -364,15
[Xfce4-commits] r29996 - in xfconf/trunk: common xfconf xfconfd
Author: kelnos Date: 2009-06-06 09:10:57 + (Sat, 06 Jun 2009) New Revision: 29996 Modified: xfconf/trunk/common/xfconf-types.c xfconf/trunk/xfconf/xfconf-channel.h xfconf/trunk/xfconf/xfconf-errors.h xfconf/trunk/xfconf/xfconf-private.h xfconf/trunk/xfconf/xfconf-types.h xfconf/trunk/xfconf/xfconf.h xfconf/trunk/xfconfd/xfconf-backend-factory.c xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.h xfconf/trunk/xfconfd/xfconf-backend.c xfconf/trunk/xfconfd/xfconf-backend.h xfconf/trunk/xfconfd/xfconf-daemon.h Log: patch from nick to silence warnings (bug 5362) Modified: xfconf/trunk/common/xfconf-types.c === --- xfconf/trunk/common/xfconf-types.c 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/common/xfconf-types.c 2009-06-06 09:10:57 UTC (rev 29996) @@ -215,9 +215,9 @@ NULL, ushort_value_copy, NULL, -i, +(gchar *)i, ushort_value_collect, -p, +(gchar *)p, ushort_value_lcopy }; @@ -273,9 +273,9 @@ NULL, ushort_value_copy, NULL, -i, +(gchar *)i, ushort_value_collect, -p, +(gchar *)p, ushort_value_lcopy }; Modified: xfconf/trunk/xfconf/xfconf-channel.h === --- xfconf/trunk/xfconf/xfconf-channel.h2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconf/xfconf-channel.h2009-06-06 09:10:57 UTC (rev 29996) @@ -37,7 +37,7 @@ typedef struct _XfconfChannel XfconfChannel; -GType xfconf_channel_get_type() G_GNUC_CONST; +GType xfconf_channel_get_type(void) G_GNUC_CONST; XfconfChannel *xfconf_channel_get(const gchar *channel_name); Modified: xfconf/trunk/xfconf/xfconf-errors.h === --- xfconf/trunk/xfconf/xfconf-errors.h 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconf/xfconf-errors.h 2009-06-06 09:10:57 UTC (rev 29996) @@ -45,8 +45,8 @@ XFCONF_ERROR_INVALID_CHANNEL, } XfconfError; -GType xfconf_error_get_type() G_GNUC_CONST; -GQuark xfconf_get_error_quark(); +GType xfconf_error_get_type(void) G_GNUC_CONST; +GQuark xfconf_get_error_quark(void); G_END_DECLS Modified: xfconf/trunk/xfconf/xfconf-private.h === --- xfconf/trunk/xfconf/xfconf-private.h2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconf/xfconf-private.h2009-06-06 09:10:57 UTC (rev 29996) @@ -28,14 +28,16 @@ GType *member_types; } XfconfNamedStruct; -DBusGConnection *_xfconf_get_dbus_g_connection(); -DBusGProxy *_xfconf_get_dbus_g_proxy(); +DBusGConnection *_xfconf_get_dbus_g_connection(void); +DBusGProxy *_xfconf_get_dbus_g_proxy(void); XfconfNamedStruct *_xfconf_named_struct_lookup(const gchar *struct_name); -void _xfconf_channel_shutdown(); +void _xfconf_channel_shutdown(void); +const gchar *_xfconf_channel_get_name(XfconfChannel *channel); +const gchar *_xfconf_channel_get_property_base(XfconfChannel *channel); -void _xfconf_g_bindings_init(); -void _xfconf_g_bindings_shutdown(); +void _xfconf_g_bindings_init(void); +void _xfconf_g_bindings_shutdown(void); #endif /* __XFCONF_PRIVATE_H__ */ Modified: xfconf/trunk/xfconf/xfconf-types.h === --- xfconf/trunk/xfconf/xfconf-types.h 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconf/xfconf-types.h 2009-06-06 09:10:57 UTC (rev 29996) @@ -31,13 +31,13 @@ G_BEGIN_DECLS -GType xfconf_uint16_get_type() G_GNUC_CONST; +GType xfconf_uint16_get_type(void) G_GNUC_CONST; guint16 xfconf_g_value_get_uint16(const GValue *value); void xfconf_g_value_set_uint16(GValue *value, guint16 v_uint16); -GType xfconf_int16_get_type() G_GNUC_CONST; +GType xfconf_int16_get_type(void) G_GNUC_CONST; gint16 xfconf_g_value_get_int16(const GValue *value); void xfconf_g_value_set_int16(GValue *value, Modified: xfconf/trunk/xfconf/xfconf.h === --- xfconf/trunk/xfconf/xfconf.h2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconf/xfconf.h2009-06-06 09:10:57 UTC (rev 29996) @@ -34,7 +34,7 @@ G_BEGIN_DECLS gboolean xfconf_init(GError **error); -void xfconf_shutdown(); +void xfconf_shutdown(void); void xfconf_named_struct_register(const gchar *struct_name, guint n_members, @@ -42,7 +42,7 @@ void xfconf_array_free(GPtrArray *arr); -gchar **xfconf_list_channels() G_GNUC_WARN_UNUSED_RESULT; +gchar **xfconf_list_channels(void) G_GNUC_WARN_UNUSED_RESULT; G_END_DECLS Modified: xfconf/trunk/xfconfd/xfconf-backend-factory.c === ---
[Xfce4-commits] r29997 - xfconf/trunk/xfconf
Author: kelnos
Date: 2009-06-07 00:55:12 + (Sun, 07 Jun 2009)
New Revision: 29997
Modified:
xfconf/trunk/xfconf/xfconf-binding.c
Log:
silence warning when --enable-checks was not specified
Modified: xfconf/trunk/xfconf/xfconf-binding.c
===
--- xfconf/trunk/xfconf/xfconf-binding.c2009-06-06 09:10:57 UTC (rev
29996)
+++ xfconf/trunk/xfconf/xfconf-binding.c2009-06-07 00:55:12 UTC (rev
29997)
@@ -300,8 +300,10 @@
binding-call = NULL;
if(error) {
+#ifdef XFCONF_ENABLE_CHECKS
g_warning(Initial query for property \%s\ failed: %s,
binding-xfconf_property, error-message);
+#endif
g_error_free(error);
return;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29991 - in xfce4-settings/trunk: . xfce4-settings-helper
Author: kelnos
Date: 2009-06-04 09:19:51 + (Thu, 04 Jun 2009)
New Revision: 29991
Modified:
xfce4-settings/trunk/NEWS
xfce4-settings/trunk/xfce4-settings-helper/main.c
Log:
avoid timing out xfce4-session on startup (bug 5040)
xfce4-settings-helper was trying to be clever to migrate itself from
autostart to the actual session. it was doing a poor job. this should
keep the cleverness, but make sure it always connects to the session
manager and makes sure the SM can continue. it also allows the copy of
x-s-h that was started via the session (and not autostart) to force
itself to start, even if it's already running. the other instance will
lose its hold on the selection, notice, and quit.
Modified: xfce4-settings/trunk/NEWS
===
--- xfce4-settings/trunk/NEWS 2009-06-03 21:30:14 UTC (rev 29990)
+++ xfce4-settings/trunk/NEWS 2009-06-04 09:19:51 UTC (rev 29991)
@@ -1,3 +1,7 @@
+4.6.2
+=
+- Avoid causing xfce4-session to time out on startup (bug #5040).
+
4.6.1
=
- Use the folder name for selecting the icon- and style-theme in the
@@ -6,9 +10,9 @@
hotplugging in the code (bug #5084).
- Remove unsigned clamp macro that broke applying the display settings
and select the correct refresh rate (bug #4966).
-- Make sure that the same .desktop file does not appear in the settings-
+- Make sure that the same .desktop file does not appear in the settings
manager more then once if it occurs in different locations in XDG_DATA_DIRS
- (bug #5159)
+ (bug #5159).
4.6.0
=
Modified: xfce4-settings/trunk/xfce4-settings-helper/main.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/main.c 2009-06-03 21:30:14 UTC
(rev 29990)
+++ xfce4-settings/trunk/xfce4-settings-helper/main.c 2009-06-04 09:19:51 UTC
(rev 29991)
@@ -60,8 +60,15 @@
#include displays.h
#endif
+#define SELECTION_NAME _XFCE_SETTINGS_HELPER
+static GdkFilterReturn xfce_settings_helper_selection_watcher (GdkXEvent *xevt,
+ GdkEvent *evt,
+ gpointer
user_data);
+
+static SessionClient *sm_client = NULL;
+
static gboolean opt_version = FALSE;
static gboolean opt_debug = FALSE;
static gchar *opt_sm_client_id = NULL;
@@ -124,15 +131,14 @@
}
-/* returns TRUE if we're now connected to the SM, FALSE otherwise */
+/* returns TRUE if we got started by the SM and our client ID was
+ * valid, FALSE otherwise */
static gboolean
xfce_settings_helper_connect_session (int argc,
char **argv,
const gchar *sm_client_id,
gboolean debug_mode)
{
-SessionClient *sm_client;
-
/* we can't be sure that the SM will save the session later, so we only
* disable the autostart item if we're launching because we got *resumed*
* from a previous session. */
@@ -148,69 +154,96 @@
{
g_warning (Failed to connect to session manager);
client_session_free (sm_client);
-xfce_settings_helper_set_autostart_enabled (TRUE);
+sm_client = NULL;
return FALSE;
}
if (sm_client_id !g_ascii_strcasecmp (sm_client_id,
sm_client-given_client_id))
{
/* we passed a client id, and got the same one back, which means
- * we were definitely restarted as a part of the session. so
- * it's safe to disable the autostart item. */
-xfce_settings_helper_set_autostart_enabled (FALSE);
+ * we were definitely restarted as a part of the session. */
return TRUE;
}
-/* otherwise, let's just ensure the autostart item is enabled. */
-xfce_settings_helper_set_autostart_enabled (TRUE);
+return FALSE;
+}
-return TRUE;
+
+#ifdef GDK_WINDOWING_X11
+static GdkFilterReturn
+xfce_settings_helper_selection_watcher (GdkXEvent *xevt,
+GdkEvent *evt,
+gpointer user_data)
+{
+Window xwin = GPOINTER_TO_UINT(user_data);
+XEvent *xe = (XEvent *)xevt;
+
+if (xe-type == SelectionClear xe-xclient.window == xwin)
+{
+if (sm_client)
+client_session_set_restart_style (sm_client,
SESSION_RESTART_IF_RUNNING);
+signal_handler (SIGINT, NULL);
+}
+
+return GDK_FILTER_CONTINUE;
}
+#endif
-
static gboolean
-xfce_settings_helper_acquire_selection ()
+xfce_settings_helper_acquire_selection (gboolean force)
{
#ifdef GDK_WINDOWING_X11
GdkDisplay *gdpy = gdk_display_get_default ();
+GtkWidget *invisible;
Display *dpy = GDK_DISPLAY_XDISPLAY (gdpy);
GdkWindow *rootwin = gdk_screen_get_root_window (gdk_display_get_screen
(gdpy, 0));
Window xroot = GDK_WINDOW_XID (rootwin);
-Window xwin;
-Atom
[Xfce4-commits] r29992 - in xfce4-settings/branches/xfce_4_6: . xfce4-settings-helper
Author: kelnos
Date: 2009-06-04 09:20:20 + (Thu, 04 Jun 2009)
New Revision: 29992
Modified:
xfce4-settings/branches/xfce_4_6/NEWS
xfce4-settings/branches/xfce_4_6/xfce4-settings-helper/main.c
Log:
avoid timing out xfce4-session on startup (bug 5040)
xfce4-settings-helper was trying to be clever to migrate itself from
autostart to the actual session. it was doing a poor job. this should
keep the cleverness, but make sure it always connects to the session
manager and makes sure the SM can continue. it also allows the copy of
x-s-h that was started via the session (and not autostart) to force
itself to start, even if it's already running. the other instance will
lose its hold on the selection, notice, and quit.
Modified: xfce4-settings/branches/xfce_4_6/NEWS
===
--- xfce4-settings/branches/xfce_4_6/NEWS 2009-06-04 09:19:51 UTC (rev
29991)
+++ xfce4-settings/branches/xfce_4_6/NEWS 2009-06-04 09:20:20 UTC (rev
29992)
@@ -1,3 +1,7 @@
+4.6.2
+=
+- Avoid causing xfce4-session to time out on startup (bug #5040).
+
4.6.1
=
- Use the folder name for selecting the icon- and style-theme in the
@@ -6,9 +10,9 @@
hotplugging in the code (bug #5084).
- Remove unsigned clamp macro that broke applying the display settings
and select the correct refresh rate (bug #4966).
-- Make sure that the same .desktop file does not appear in the settings-
+- Make sure that the same .desktop file does not appear in the settings
manager more then once if it occurs in different locations in XDG_DATA_DIRS
- (bug #5159)
+ (bug #5159).
4.6.0
=
Modified: xfce4-settings/branches/xfce_4_6/xfce4-settings-helper/main.c
===
--- xfce4-settings/branches/xfce_4_6/xfce4-settings-helper/main.c
2009-06-04 09:19:51 UTC (rev 29991)
+++ xfce4-settings/branches/xfce_4_6/xfce4-settings-helper/main.c
2009-06-04 09:20:20 UTC (rev 29992)
@@ -60,8 +60,15 @@
#include displays.h
#endif
+#define SELECTION_NAME _XFCE_SETTINGS_HELPER
+static GdkFilterReturn xfce_settings_helper_selection_watcher (GdkXEvent *xevt,
+ GdkEvent *evt,
+ gpointer
user_data);
+
+static SessionClient *sm_client = NULL;
+
static gboolean opt_version = FALSE;
static gboolean opt_debug = FALSE;
static gchar *opt_sm_client_id = NULL;
@@ -124,15 +131,14 @@
}
-/* returns TRUE if we're now connected to the SM, FALSE otherwise */
+/* returns TRUE if we got started by the SM and our client ID was
+ * valid, FALSE otherwise */
static gboolean
xfce_settings_helper_connect_session (int argc,
char **argv,
const gchar *sm_client_id,
gboolean debug_mode)
{
-SessionClient *sm_client;
-
/* we can't be sure that the SM will save the session later, so we only
* disable the autostart item if we're launching because we got *resumed*
* from a previous session. */
@@ -148,69 +154,96 @@
{
g_warning (Failed to connect to session manager);
client_session_free (sm_client);
-xfce_settings_helper_set_autostart_enabled (TRUE);
+sm_client = NULL;
return FALSE;
}
if (sm_client_id !g_ascii_strcasecmp (sm_client_id,
sm_client-given_client_id))
{
/* we passed a client id, and got the same one back, which means
- * we were definitely restarted as a part of the session. so
- * it's safe to disable the autostart item. */
-xfce_settings_helper_set_autostart_enabled (FALSE);
+ * we were definitely restarted as a part of the session. */
return TRUE;
}
-/* otherwise, let's just ensure the autostart item is enabled. */
-xfce_settings_helper_set_autostart_enabled (TRUE);
+return FALSE;
+}
-return TRUE;
+
+#ifdef GDK_WINDOWING_X11
+static GdkFilterReturn
+xfce_settings_helper_selection_watcher (GdkXEvent *xevt,
+GdkEvent *evt,
+gpointer user_data)
+{
+Window xwin = GPOINTER_TO_UINT(user_data);
+XEvent *xe = (XEvent *)xevt;
+
+if (xe-type == SelectionClear xe-xclient.window == xwin)
+{
+if (sm_client)
+client_session_set_restart_style (sm_client,
SESSION_RESTART_IF_RUNNING);
+signal_handler (SIGINT, NULL);
+}
+
+return GDK_FILTER_CONTINUE;
}
+#endif
-
static gboolean
-xfce_settings_helper_acquire_selection ()
+xfce_settings_helper_acquire_selection (gboolean force)
{
#ifdef GDK_WINDOWING_X11
GdkDisplay *gdpy = gdk_display_get_default ();
+GtkWidget *invisible;
Display *dpy = GDK_DISPLAY_XDISPLAY (gdpy);
GdkWindow *rootwin = gdk_screen_get_root_window
[Xfce4-commits] r29993 - in xfce4-session/branches/xfce_4_6: . xfce4-session
Author: kelnos
Date: 2009-06-04 09:34:55 + (Thu, 04 Jun 2009)
New Revision: 29993
Modified:
xfce4-session/branches/xfce_4_6/ChangeLog
xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-global.c
xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-manager.c
xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-startup.c
Log:
* xfce4-session/xfsm-global.c: Add timing information to verbose
log printouts.
* xfce4-session/xfsm-{manager,startup}.c: Fix a couple warnings.
Modified: xfce4-session/branches/xfce_4_6/ChangeLog
===
--- xfce4-session/branches/xfce_4_6/ChangeLog 2009-06-04 09:20:20 UTC (rev
29992)
+++ xfce4-session/branches/xfce_4_6/ChangeLog 2009-06-04 09:34:55 UTC (rev
29993)
@@ -1,3 +1,9 @@
+2009-06-04 Brian Tarricone bj...@cornell.edu
+
+ * xfce4-session/xfsm-global.c: Add timing information to verbose
+ log printouts.
+ * xfce4-session/xfsm-{manager,startup}.c: Fix a couple warnings.
+
2009-04-15 Stephan Arts step...@xfce.org
* == Released 4.6.1 ===
Modified: xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-global.c
===
--- xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-global.c 2009-06-04
09:20:20 UTC (rev 29992)
+++ xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-global.c 2009-06-04
09:34:55 UTC (rev 29993)
@@ -79,6 +79,7 @@
static FILE *fp = NULL;
gchar *logfile;
va_list valist;
+ GTimeVal tv;
if (G_UNLIKELY (fp == NULL))
{
@@ -86,6 +87,9 @@
fp = fopen (logfile, w);
g_free (logfile);
}
+
+ g_get_current_time(tv);
+ fprintf(fp, [%10lu] , tv.tv_sec);
va_start (valist, format);
vfprintf (fp, format, valist);
Modified: xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-manager.c
===
--- xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-manager.c
2009-06-04 09:20:20 UTC (rev 29992)
+++ xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-manager.c
2009-06-04 09:34:55 UTC (rev 29993)
@@ -1625,7 +1625,8 @@
{
backup = g_strconcat (manager-session_file, .bak, NULL);
unlink (backup);
- link (manager-session_file, backup);
+ if (link (manager-session_file, backup))
+ g_warning (Failed to create session file backup);
g_free (backup);
}
Modified: xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-startup.c
===
--- xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-startup.c
2009-06-04 09:20:20 UTC (rev 29992)
+++ xfce4-session/branches/xfce_4_6/xfce4-session/xfsm-startup.c
2009-06-04 09:34:55 UTC (rev 29993)
@@ -388,6 +388,7 @@
terminal = xfce_rc_read_bool_entry (rc, Terminal, FALSE);
/* try to launch the command */
+ xfsm_verbose (Autostart: running command \%s\\n, exec);
if (!xfce_exec (exec, terminal, startup_notify, error))
{
g_warning (Unable to launch \%s\ (specified by %s): %s,
exec, files[n], error-message);
@@ -519,7 +520,10 @@
{
/* execute the application here */
if (properties-current_directory)
-chdir (properties-current_directory);
+{
+ if (chdir (properties-current_directory))
+g_warning (Unable to chdir to \%s\: %s,
properties-current_directory, strerror (errno));
+}
execvp (argv[0], argv);
_exit (127);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29981 - in xfdesktop/trunk: . src
Author: kelnos
Date: 2009-05-23 08:27:49 + (Sat, 23 May 2009)
New Revision: 29981
Modified:
xfdesktop/trunk/NEWS
xfdesktop/trunk/src/xfdesktop-volume-icon.c
Log:
never show 'umount' when ejectable, always show 'eject' if ejectable (bug 5343)
Modified: xfdesktop/trunk/NEWS
===
--- xfdesktop/trunk/NEWS2009-05-23 08:27:35 UTC (rev 29980)
+++ xfdesktop/trunk/NEWS2009-05-23 08:27:49 UTC (rev 29981)
@@ -2,7 +2,10 @@
--
* Add Catalan and Galician translations of the manual.
- * Fix inability to delete broken symlinks on the desktop.
+ * Fix inability to delete broken symlinks on the desktop (bug 5387).
+ * Never show 'Unmount' in volume context menus.
+ * Always show 'Eject' in volume context menus, regardless of whether
+or not it's mounted (bug 5343).
Xfce 4.6.1
Modified: xfdesktop/trunk/src/xfdesktop-volume-icon.c
===
--- xfdesktop/trunk/src/xfdesktop-volume-icon.c 2009-05-23 08:27:35 UTC (rev
29980)
+++ xfdesktop/trunk/src/xfdesktop-volume-icon.c 2009-05-23 08:27:49 UTC (rev
29981)
@@ -554,6 +554,7 @@
XfdesktopVolumeIcon *volume_icon = XFDESKTOP_VOLUME_ICON(icon);
ThunarVfsVolume *volume = volume_icon-priv-volume;
GtkWidget *mi, *img;
+gboolean mounted, ejectable;
img = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
gtk_widget_show(img);
@@ -568,20 +569,11 @@
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
-if(thunar_vfs_volume_is_ejectable(volume)
-thunar_vfs_volume_is_mounted(volume))
-{
-img = gtk_image_new_from_icon_name(media-eject, GTK_ICON_SIZE_MENU);
-gtk_widget_show(img);
-mi = gtk_image_menu_item_new_with_mnemonic(_(E_ject Volume));
-gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
-gtk_widget_show(mi);
-gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
-g_signal_connect(G_OBJECT(mi), activate,
- G_CALLBACK(xfdesktop_volume_icon_menu_eject),
- icon);
-} else {
-if(thunar_vfs_volume_is_mounted(volume)) {
+mounted = thunar_vfs_volume_is_mounted(volume);
+ejectable = thunar_vfs_volume_is_ejectable(volume);
+
+if(!mounted || (mounted !ejectable)) {
+if(mounted) {
img = gtk_image_new_from_stock(GTK_STOCK_DISCONNECT,
GTK_ICON_SIZE_MENU);
mi = gtk_image_menu_item_new_with_mnemonic(_(_Unmount Volume));
} else {
@@ -596,11 +588,23 @@
G_CALLBACK(xfdesktop_volume_icon_menu_toggle_mount),
icon);
}
-
+
+if(ejectable) {
+img = gtk_image_new_from_icon_name(media-eject, GTK_ICON_SIZE_MENU);
+gtk_widget_show(img);
+mi = gtk_image_menu_item_new_with_mnemonic(_(E_ject Volume));
+gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
+gtk_widget_show(mi);
+gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+g_signal_connect(G_OBJECT(mi), activate,
+ G_CALLBACK(xfdesktop_volume_icon_menu_eject),
+ icon);
+}
+
mi = gtk_separator_menu_item_new();
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
-
+
img = gtk_image_new_from_stock(GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU);
gtk_widget_show(img);
mi = gtk_image_menu_item_new_with_mnemonic(_(_Properties...));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29982 - xfdesktop/branches/xfce_4_6/src
Author: kelnos
Date: 2009-05-23 08:28:12 + (Sat, 23 May 2009)
New Revision: 29982
Modified:
xfdesktop/branches/xfce_4_6/src/xfdesktop-regular-file-icon.c
Log:
fix warning
Modified: xfdesktop/branches/xfce_4_6/src/xfdesktop-regular-file-icon.c
===
--- xfdesktop/branches/xfce_4_6/src/xfdesktop-regular-file-icon.c
2009-05-23 08:27:49 UTC (rev 29981)
+++ xfdesktop/branches/xfce_4_6/src/xfdesktop-regular-file-icon.c
2009-05-23 08:28:12 UTC (rev 29982)
@@ -80,7 +80,6 @@
static void xfdesktop_regular_file_icon_update_info(XfdesktopFileIcon *icon,
ThunarVfsInfo *info);
static gboolean xfdesktop_regular_file_can_write_parent(XfdesktopFileIcon
*icon);
-static gboolean xfdesktop_regular_file_can_write_file(XfdesktopFileIcon *icon);
static gboolean xfdesktop_regular_file_icon_rename_file(XfdesktopFileIcon
*icon,
const gchar *new_name);
static gboolean xfdesktop_regular_file_icon_delete_file(XfdesktopFileIcon
*icon);
@@ -522,16 +521,6 @@
}
-static gboolean
-xfdesktop_regular_file_can_write_file(XfdesktopFileIcon *icon)
-{
-XfdesktopRegularFileIcon *file_icon = XFDESKTOP_REGULAR_FILE_ICON(icon);
-
-g_return_val_if_fail(file_icon file_icon-priv-info, FALSE);
-
-return (file_icon-priv-info-flags THUNAR_VFS_FILE_FLAGS_WRITABLE);
-}
-
static void
xfdesktop_delete_file_error(ThunarVfsJob *job,
GError *error,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29974 - xfdesktop/branches/xfce_4_6/src
Author: kelnos
Date: 2009-05-23 02:27:49 + (Sat, 23 May 2009)
New Revision: 29974
Modified:
xfdesktop/branches/xfce_4_6/src/xfdesktop-regular-file-icon.c
Log:
fix detection of rename/delete ability
Modified: xfdesktop/branches/xfce_4_6/src/xfdesktop-regular-file-icon.c
===
--- xfdesktop/branches/xfce_4_6/src/xfdesktop-regular-file-icon.c
2009-05-22 13:19:13 UTC (rev 29973)
+++ xfdesktop/branches/xfce_4_6/src/xfdesktop-regular-file-icon.c
2009-05-23 02:27:49 UTC (rev 29974)
@@ -79,6 +79,7 @@
static G_CONST_RETURN ThunarVfsInfo
*xfdesktop_regular_file_icon_peek_info(XfdesktopFileIcon *icon);
static void xfdesktop_regular_file_icon_update_info(XfdesktopFileIcon *icon,
ThunarVfsInfo *info);
+static gboolean xfdesktop_regular_file_can_write_parent(XfdesktopFileIcon
*icon);
static gboolean xfdesktop_regular_file_can_write_file(XfdesktopFileIcon *icon);
static gboolean xfdesktop_regular_file_icon_rename_file(XfdesktopFileIcon
*icon,
const gchar *new_name);
@@ -127,9 +128,9 @@
file_icon_class-peek_info = xfdesktop_regular_file_icon_peek_info;
file_icon_class-update_info = xfdesktop_regular_file_icon_update_info;
-file_icon_class-can_rename_file = xfdesktop_regular_file_can_write_file;
+file_icon_class-can_rename_file = xfdesktop_regular_file_can_write_parent;
file_icon_class-rename_file = xfdesktop_regular_file_icon_rename_file;
-file_icon_class-can_delete_file = xfdesktop_regular_file_can_write_file;
+file_icon_class-can_delete_file = xfdesktop_regular_file_can_write_parent;
file_icon_class-delete_file = xfdesktop_regular_file_icon_delete_file;
}
@@ -497,6 +498,31 @@
}
static gboolean
+xfdesktop_regular_file_can_write_parent(XfdesktopFileIcon *icon)
+{
+XfdesktopRegularFileIcon *file_icon = XFDESKTOP_REGULAR_FILE_ICON(icon);
+ThunarVfsPath *parent;
+ThunarVfsInfo *parent_info;
+gboolean writable;
+
+g_return_val_if_fail(file_icon file_icon-priv-info, FALSE);
+
+parent = thunar_vfs_path_get_parent(file_icon-priv-info-path);
+if(!parent)
+return FALSE;
+
+parent_info = thunar_vfs_info_new_for_path(parent, NULL);
+if(!parent_info)
+return FALSE;
+
+writable = (parent_info-flags THUNAR_VFS_FILE_FLAGS_WRITABLE);
+thunar_vfs_info_unref(parent_info);
+
+return writable;
+
+}
+
+static gboolean
xfdesktop_regular_file_can_write_file(XfdesktopFileIcon *icon)
{
XfdesktopRegularFileIcon *file_icon = XFDESKTOP_REGULAR_FILE_ICON(icon);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29976 - in xfdesktop/trunk: . src
Author: kelnos
Date: 2009-05-23 02:31:07 + (Sat, 23 May 2009)
New Revision: 29976
Modified:
xfdesktop/trunk/NEWS
xfdesktop/trunk/src/xfdesktop-regular-file-icon.c
Log:
fix detection of rename/delete ability
Modified: xfdesktop/trunk/NEWS
===
--- xfdesktop/trunk/NEWS2009-05-23 02:28:52 UTC (rev 29975)
+++ xfdesktop/trunk/NEWS2009-05-23 02:31:07 UTC (rev 29976)
@@ -2,6 +2,7 @@
--
* Add Catalan and Galician translations of the manual.
+ * Fix inability to delete broken symlinks on the desktop.
Xfce 4.6.1
Modified: xfdesktop/trunk/src/xfdesktop-regular-file-icon.c
===
--- xfdesktop/trunk/src/xfdesktop-regular-file-icon.c 2009-05-23 02:28:52 UTC
(rev 29975)
+++ xfdesktop/trunk/src/xfdesktop-regular-file-icon.c 2009-05-23 02:31:07 UTC
(rev 29976)
@@ -79,6 +79,7 @@
static G_CONST_RETURN ThunarVfsInfo
*xfdesktop_regular_file_icon_peek_info(XfdesktopFileIcon *icon);
static void xfdesktop_regular_file_icon_update_info(XfdesktopFileIcon *icon,
ThunarVfsInfo *info);
+static gboolean xfdesktop_regular_file_can_write_parent(XfdesktopFileIcon
*icon);
static gboolean xfdesktop_regular_file_can_write_file(XfdesktopFileIcon *icon);
static gboolean xfdesktop_regular_file_icon_rename_file(XfdesktopFileIcon
*icon,
const gchar *new_name);
@@ -127,9 +128,9 @@
file_icon_class-peek_info = xfdesktop_regular_file_icon_peek_info;
file_icon_class-update_info = xfdesktop_regular_file_icon_update_info;
-file_icon_class-can_rename_file = xfdesktop_regular_file_can_write_file;
+file_icon_class-can_rename_file = xfdesktop_regular_file_can_write_parent;
file_icon_class-rename_file = xfdesktop_regular_file_icon_rename_file;
-file_icon_class-can_delete_file = xfdesktop_regular_file_can_write_file;
+file_icon_class-can_delete_file = xfdesktop_regular_file_can_write_parent;
file_icon_class-delete_file = xfdesktop_regular_file_icon_delete_file;
}
@@ -497,6 +498,31 @@
}
static gboolean
+xfdesktop_regular_file_can_write_parent(XfdesktopFileIcon *icon)
+{
+XfdesktopRegularFileIcon *file_icon = XFDESKTOP_REGULAR_FILE_ICON(icon);
+ThunarVfsPath *parent;
+ThunarVfsInfo *parent_info;
+gboolean writable;
+
+g_return_val_if_fail(file_icon file_icon-priv-info, FALSE);
+
+parent = thunar_vfs_path_get_parent(file_icon-priv-info-path);
+if(!parent)
+return FALSE;
+
+parent_info = thunar_vfs_info_new_for_path(parent, NULL);
+if(!parent_info)
+return FALSE;
+
+writable = (parent_info-flags THUNAR_VFS_FILE_FLAGS_WRITABLE);
+thunar_vfs_info_unref(parent_info);
+
+return writable;
+
+}
+
+static gboolean
xfdesktop_regular_file_can_write_file(XfdesktopFileIcon *icon)
{
XfdesktopRegularFileIcon *file_icon = XFDESKTOP_REGULAR_FILE_ICON(icon);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29979 - xfdesktop/branches/xfce_4_6/po-doc
Author: kelnos Date: 2009-05-23 03:49:31 + (Sat, 23 May 2009) New Revision: 29979 Added: xfdesktop/branches/xfce_4_6/po-doc/ca.po Log: ok, seriously, this is all of them Added: xfdesktop/branches/xfce_4_6/po-doc/ca.po === --- xfdesktop/branches/xfce_4_6/po-doc/ca.po(rev 0) +++ xfdesktop/branches/xfce_4_6/po-doc/ca.po2009-05-23 03:49:31 UTC (rev 29979) @@ -0,0 +1,910 @@ +# translation of ca.po to Catalan +# xfdesktop for Xfce desktop environment. +# Copyright (C) 2009 The Xfce development team. +# This file is distributed under the same license as the xfdesktop package. +# Carles Muñoz Gorriz carle...@internautas.org, 2009. +# +msgid +msgstr +Project-Id-Version: xfdesktop VERSION\n +POT-Creation-Date: 2009-04-21 12:05+0200\n +PO-Revision-Date: 2009-04-13 22:23+0100\n +Last-Translator: Carles Muñoz Gorriz carle...@internautas.org\n +Language-Team: Catalan\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n +Plural-Forms: nplurals=2; plural=(n != 1);\n + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: ../doc/C/xfdesktop.xml.in:167(None) +msgid @@image: 'images/root_menu.png'; md5=989216cb94de22e9819179a10d4ead37 +msgstr @@image: 'images/root_menu.png'; md5=989216cb94de22e9819179a10d4ead37 + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: ../doc/C/xfdesktop.xml.in:220(None) +msgid @@image: 'images/root_menu2.png'; md5=1a442b4c1866c677cf2c023fa1be0b68 +msgstr @@image: 'images/root_menu2.png'; md5=1a442b4c1866c677cf2c023fa1be0b68 + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: ../doc/C/xfdesktop.xml.in:255(None) +msgid +@@image: 'images/xfdesktop-background-tab.png'; md5=THIS FILE DOESN'T EXIST +msgstr +@@image: 'images/xfdesktop-background-tab.png'; md5=THIS FILE DOESN'T EXIST + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: ../doc/C/xfdesktop.xml.in:380(None) +msgid +@@image: 'images/select_bg_color.png'; md5=6f7023b842ebcfd1d9e412b0b4a831e5 +msgstr +@@image: 'images/select_bg_color.png'; md5=6f7023b842ebcfd1d9e412b0b4a831e5 + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: ../doc/C/xfdesktop.xml.in:442(None) +msgid @@image: 'images/xfdesktop-menus-tab.png'; md5=THIS FILE DOESN'T EXIST +msgstr @@image: 'images/xfdesktop-menus-tab.png'; md5=THIS FILE DOESN'T EXIST + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: ../doc/C/xfdesktop.xml.in:546(None) +msgid @@image: 'images/xfdesktop-icons-tab.png'; md5=THIS FILE DOESN'T EXIST +msgstr @@image: 'images/xfdesktop-icons-tab.png'; md5=THIS FILE DOESN'T EXIST + +#: ../doc/C/xfdesktop.xml.in:12(title) +msgid Xfce 4 Desktop Manager +msgstr Gestor d'escriptori de Xfce 4 + +#: ../doc/C/xfdesktop.xml.in:15(year) +msgid 2008 +msgstr 2008 + +#: ../doc/C/xfdesktop.xml.in:15(holder) +msgid Jérôme Guelfucci +msgstr Jérôme Guelfucci + +#: ../doc/C/xfdesktop.xml.in:19(year) +msgid 2004-2007 +msgstr 2004-2007 + +#: ../doc/C/xfdesktop.xml.in:19(holder) +msgid Brian Tarricone +msgstr Brian Tarricone + +#: ../doc/C/xfdesktop.xml.in:23(year) ../doc/C/xfdesktop.xml.in:27(year) +msgid 2004 +msgstr 2004 + +#: ../doc/C/xfdesktop.xml.in:23(holder) +msgid Jasper Huijsmans +msgstr Jasper Huijsmans + +#: ../doc/C/xfdesktop.xml.in:27(holder) +msgid François Le Clainche +msgstr François Le Clainche + +#: ../doc/C/xfdesktop.xml.in:47(firstname) +msgid Brian +msgstr Brian + +#: ../doc/C/xfdesktop.xml.in:47(surname) +msgid Tarricone +msgstr Tarricone + +#: ../doc/C/xfdesktop.xml.in:49(email) +msgid kel...@xfce.org +msgstr kel...@xfce.org + +#: ../doc/C/xfdesktop.xml.in:53(firstname) +msgid Jasper +msgstr Jasper + +#: ../doc/C/xfdesktop.xml.in:53(surname) +msgid Huijsmans +msgstr Huijsmans + +#: ../doc/C/xfdesktop.xml.in:55(email) +msgid jas...@xfce.org +msgstr jas...@xfce.org + +#: ../doc/C/xfdesktop.xml.in:60(firstname) +msgid François +msgstr François + +#: ../doc/C/xfdesktop.xml.in:60(surname) +msgid Le Clainche +msgstr Le Clainche + +#: ../doc/C/xfdesktop.xml.in:62(email) +msgid fleclain...@wanadoo.fr +msgstr fleclain...@wanadoo.fr + +#: ../doc/C/xfdesktop.xml.in:67(firstname) +msgid Jérôme +msgstr Jérôme + +#: ../doc/C/xfdesktop.xml.in:67(surname) +msgid Guelfucci +msgstr Guelfucci + +#: ../doc/C/xfdesktop.xml.in:69(email) +msgid jerome.guelfu...@gmail.com +msgstr jerome.guelfu
[Xfce4-commits] r29968 - xfdesktop/trunk/panel-plugin
Author: kelnos Date: 2009-05-17 09:52:51 + (Sun, 17 May 2009) New Revision: 29968 Modified: xfdesktop/trunk/panel-plugin/Makefile.am Log: add libexo to CFLAGS and LIBS for panel plugin Modified: xfdesktop/trunk/panel-plugin/Makefile.am === --- xfdesktop/trunk/panel-plugin/Makefile.am2009-05-15 18:47:30 UTC (rev 29967) +++ xfdesktop/trunk/panel-plugin/Makefile.am2009-05-17 09:52:51 UTC (rev 29968) @@ -10,6 +10,7 @@ $(LIBXFCEGUI4_CFLAGS) \ $(LIBXFCE4PANEL_CFLAGS) \ $(THUNAR_VFS_CFLAGS) \ + $(LIBEXO_CFLAGS) \ -DDATADIR=\$(datadir)\ \ -DLOCALEDIR=\$(localedir)\ \ -DBINDIR=\$(bindir)\ @@ -24,7 +25,8 @@ $(LIBX11_LIBS) \ $(LIBXFCEGUI4_LIBS) \ $(LIBXFCE4PANEL_LIBS) \ - $(THUNAR_VFS_LIBS) + $(THUNAR_VFS_LIBS) \ + $(LIBEXO_LIBS) if HAVE_CYGWIN xfce4_menu_plugin_LDFLAGS = \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29969 - xfdesktop/branches/xfce_4_6/panel-plugin
Author: kelnos Date: 2009-05-17 09:54:11 + (Sun, 17 May 2009) New Revision: 29969 Modified: xfdesktop/branches/xfce_4_6/panel-plugin/Makefile.am Log: add libexo to CFLAGS and LIBS for panel plugin Modified: xfdesktop/branches/xfce_4_6/panel-plugin/Makefile.am === --- xfdesktop/branches/xfce_4_6/panel-plugin/Makefile.am2009-05-17 09:52:51 UTC (rev 29968) +++ xfdesktop/branches/xfce_4_6/panel-plugin/Makefile.am2009-05-17 09:54:11 UTC (rev 29969) @@ -10,6 +10,7 @@ $(LIBXFCEGUI4_CFLAGS) \ $(LIBXFCE4PANEL_CFLAGS) \ $(THUNAR_VFS_CFLAGS) \ + $(LIBEXO_CFLAGS) \ -DDATADIR=\$(datadir)\ \ -DLOCALEDIR=\$(localedir)\ \ -DBINDIR=\$(bindir)\ @@ -24,7 +25,8 @@ $(LIBX11_LIBS) \ $(LIBXFCEGUI4_LIBS) \ $(LIBXFCE4PANEL_LIBS) \ - $(THUNAR_VFS_LIBS) + $(THUNAR_VFS_LIBS) \ + $(LIBEXO_LIBS) if HAVE_CYGWIN xfce4_menu_plugin_LDFLAGS = \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29967 - xfconf/trunk/xfconf
Author: kelnos
Date: 2009-05-15 18:47:30 + (Fri, 15 May 2009)
New Revision: 29967
Modified:
xfconf/trunk/xfconf/Makefile.am
Log:
actually work around stupid dbus-binding-tool bug properly
Modified: xfconf/trunk/xfconf/Makefile.am
===
--- xfconf/trunk/xfconf/Makefile.am 2009-05-15 08:10:21 UTC (rev 29966)
+++ xfconf/trunk/xfconf/Makefile.am 2009-05-15 18:47:30 UTC (rev 29967)
@@ -51,15 +51,20 @@
xfconf-dbus-bindings.h
xfconf-dbus-bindings.h: $(top_srcdir)/common/xfconf-dbus.xml Makefile
- dbus-binding-tool --mode=glib-client $ $@
- sed -i -e 's/^\([[:space:]]\+GValue[[:space:]]\+[^=]\)\+;$/\1 = { 0,
};/' $@
-# the above line fixes a bug in dbus-binding-tool's output
+ dbus-binding-tool --mode=glib-client $ $(@).tmp
+ sed -e 's/^\([[:space:]]\+GValue[[:space:]]\+[^=]\+\).*;$$/\1 = { 0,
};/' $(@).tmp $@
+ -rm -f $(@).tmp
+# the above fixes a bug in dbus-binding-tool's output
# dbus-binding-tool doesn't initialise GValues to { 0, } properly
if HAVE_GNUC_VISIBILITY
TESTS = abicheck.sh
endif
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ xfconf-dbus-bindings.h.tmp
+
endif
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29962 - in xfconf/trunk: . xfconf
Author: kelnos
Date: 2009-05-15 04:06:01 + (Fri, 15 May 2009)
New Revision: 29962
Modified:
xfconf/trunk/NEWS
xfconf/trunk/xfconf/Makefile.am
xfconf/trunk/xfconf/xfconf-binding.c
Log:
hopefully speed up app start time (for apps that do a decent number of
property bindings) by making the initial property fetch async
Modified: xfconf/trunk/NEWS
===
--- xfconf/trunk/NEWS 2009-05-15 01:00:30 UTC (rev 29961)
+++ xfconf/trunk/NEWS 2009-05-15 04:06:01 UTC (rev 29962)
@@ -1,3 +1,10 @@
+Xfce 4.6.2
+==
+
+ * Speed up startup of many apps that use bindings by retrieving the
+initial value of the binding asynchronously.
+
+
Xfce 4.6.1
==
Modified: xfconf/trunk/xfconf/Makefile.am
===
--- xfconf/trunk/xfconf/Makefile.am 2009-05-15 01:00:30 UTC (rev 29961)
+++ xfconf/trunk/xfconf/Makefile.am 2009-05-15 04:06:01 UTC (rev 29962)
@@ -52,6 +52,9 @@
xfconf-dbus-bindings.h: $(top_srcdir)/common/xfconf-dbus.xml Makefile
dbus-binding-tool --mode=glib-client $ $@
+ sed -i -e 's/^\([[:space:]]\+GValue[[:space:]]\+[^=]\)\+;$/\1 = { 0,
};/' $@
+# the above line fixes a bug in dbus-binding-tool's output
+# dbus-binding-tool doesn't initialise GValues to { 0, } properly
if HAVE_GNUC_VISIBILITY
TESTS = abicheck.sh
Modified: xfconf/trunk/xfconf/xfconf-binding.c
===
--- xfconf/trunk/xfconf/xfconf-binding.c2009-05-15 01:00:30 UTC (rev
29961)
+++ xfconf/trunk/xfconf/xfconf-binding.c2009-05-15 04:06:01 UTC (rev
29962)
@@ -31,6 +31,7 @@
#include xfconf-private.h
#include xfconf-alias.h
#include xfconf-common-private.h
+#include xfconf-dbus-bindings.h
typedef struct
{
@@ -43,6 +44,9 @@
GObject *object;
gchar *object_property;
GType object_property_type;
+
+/* async call to get initial value */
+DBusGProxyCall *call;
} XfconfGBinding;
typedef struct
@@ -76,6 +80,9 @@
if(G_UNLIKELY(!binding))
return;
+if(G_UNLIKELY(binding-call))
+dbus_g_proxy_cancel_call(_xfconf_get_dbus_g_proxy(), binding-call);
+
if(binding-object) {
g_signal_handlers_disconnect_by_func(G_OBJECT(binding-object),
G_CALLBACK(xfconf_g_binding_object_property_changed),
@@ -282,6 +289,31 @@
g_value_unset(dst_val);
}
+static void
+xfconf_g_binding_initial_value_received(DBusGProxy *proxy,
+GValue value,
+GError *error,
+gpointer user_data)
+{
+XfconfGBinding *binding = user_data;
+
+binding-call = NULL;
+
+if(error) {
+g_warning(Initial query for property \%s\ failed: %s,
+ binding-xfconf_property, error-message);
+g_error_free(error);
+return;
+}
+
+xfconf_g_binding_channel_property_changed(binding-channel,
+ binding-xfconf_property,
+ value,
+ binding);
+g_value_unset(value);
+}
+
+
static XfconfGBinding *
xfconf_g_binding_init(XfconfChannel *channel,
const gchar *xfconf_property,
@@ -291,9 +323,8 @@
GType object_property_type)
{
XfconfGBinding *binding;
-gchar buf[1024];
+gchar buf[1024], *channel_name = NULL;
GSList *bindings;
-GValue value = { 0, };
binding = g_slice_new0(XfconfGBinding);
binding-channel = channel;
@@ -340,11 +371,13 @@
bindings, (GDestroyNotify)g_slist_free);
}
-if(xfconf_channel_get_property(channel, xfconf_property, value)) {
-xfconf_g_binding_channel_property_changed(channel, xfconf_property,
- value, binding);
-g_value_unset(value);
-}
+g_object_get(G_OBJECT(channel), channel-name, channel_name, NULL);
+binding-call =
xfconf_client_get_property_async(_xfconf_get_dbus_g_proxy(),
+ channel_name,
+ xfconf_property,
+
xfconf_g_binding_initial_value_received,
+ binding);
+g_free(channel_name);
binding-id = ++__last_binding_id;
if(G_UNLIKELY(binding-id == 0)) {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29963 - xfconf/trunk
Author: kelnos Date: 2009-05-15 04:11:24 + (Fri, 15 May 2009) New Revision: 29963 Modified: xfconf/trunk/configure.ac.in Log: add svn version tag Modified: xfconf/trunk/configure.ac.in === --- xfconf/trunk/configure.ac.in2009-05-15 04:06:01 UTC (rev 29962) +++ xfconf/trunk/configure.ac.in2009-05-15 04:11:24 UTC (rev 29963) @@ -11,7 +11,7 @@ m4_define([xfconf_version_major], [4]) m4_define([xfconf_version_minor], [7]) m4_define([xfconf_version_micro], [0]) -m4_define([xfconf_version_nano], []) +m4_define([xfconf_version_nano], [svn]) m4_define([xfconf_version_build], [...@revision@]) m4_define([xfconf_version_tag], [svn]) m4_define([xfconf_version], [xfconf_version_major().xfconf_version_minor().xfconf_version_micro()ifelse(xfconf_version_nano(), [], [], [.xfconf_version_nano()])ifelse(xfconf_version_tag(), [svn], [xfconf_version_tag()-xfconf_version_build()], [xfconf_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29964 - xfconf/trunk
Author: kelnos Date: 2009-05-15 05:27:14 + (Fri, 15 May 2009) New Revision: 29964 Modified: xfconf/trunk/configure.ac.in Log: Revert add svn version tag Modified: xfconf/trunk/configure.ac.in === --- xfconf/trunk/configure.ac.in2009-05-15 04:11:24 UTC (rev 29963) +++ xfconf/trunk/configure.ac.in2009-05-15 05:27:14 UTC (rev 29964) @@ -11,7 +11,7 @@ m4_define([xfconf_version_major], [4]) m4_define([xfconf_version_minor], [7]) m4_define([xfconf_version_micro], [0]) -m4_define([xfconf_version_nano], [svn]) +m4_define([xfconf_version_nano], []) m4_define([xfconf_version_build], [...@revision@]) m4_define([xfconf_version_tag], [svn]) m4_define([xfconf_version], [xfconf_version_major().xfconf_version_minor().xfconf_version_micro()ifelse(xfconf_version_nano(), [], [], [.xfconf_version_nano()])ifelse(xfconf_version_tag(), [svn], [xfconf_version_tag()-xfconf_version_build()], [xfconf_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29931 - libexo/tags
Author: kelnos Date: 2009-05-08 04:16:37 + (Fri, 08 May 2009) New Revision: 29931 Added: libexo/tags/exo-0.3.93/ Removed: libexo/tags/libexo-0.3.93/ Log: rename tag to correct naming scheme ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29924 - in xfce4-dev-tools/trunk: . m4macros
Author: kelnos
Date: 2009-05-04 07:50:17 + (Mon, 04 May 2009)
New Revision: 29924
Modified:
xfce4-dev-tools/trunk/ChangeLog
xfce4-dev-tools/trunk/m4macros/xdt-features.m4
Log:
* m4macros/xdt-features.m4: Add a bunch more compiler warning
options when --enable-debug={yes,full} is specified.
Modified: xfce4-dev-tools/trunk/ChangeLog
===
--- xfce4-dev-tools/trunk/ChangeLog 2009-05-01 00:20:23 UTC (rev 29923)
+++ xfce4-dev-tools/trunk/ChangeLog 2009-05-04 07:50:17 UTC (rev 29924)
@@ -1,3 +1,8 @@
+2009-05-04 Brian Tarricone bj...@cornell.edu
+
+ * m4macros/xdt-features.m4: Add a bunch more compiler warning
+ options when --enable-debug={yes,full} is specified.
+
2009-02-25 Stephan Arts step...@xfce.org
* == 4.6.0 Released! ==
Modified: xfce4-dev-tools/trunk/m4macros/xdt-features.m4
===
--- xfce4-dev-tools/trunk/m4macros/xdt-features.m4 2009-05-01 00:20:23 UTC
(rev 29923)
+++ xfce4-dev-tools/trunk/m4macros/xdt-features.m4 2009-05-04 07:50:17 UTC
(rev 29924)
@@ -31,7 +31,29 @@
AC_PREREQ([2.53])
+dnl XDT_SUPPORTED_FLAGS(VAR, FLAGS)
+dnl
+dnl For each token in FLAGS, checks to be sure the compiler supports
+dnl the flag, and if so, adds each one to VAR.
+dnl
+AC_DEFUN([XDT_SUPPORTED_FLAGS],
+[
+ for flag in $2; do
+AC_MSG_CHECKING([if $CC supports $flag])
+saved_CFLAGS=$CFLAGS
+CFLAGS=$CFLAGS $flag
+AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no])
+CFLAGS=$saved_CFLAGS
+AC_MSG_RESULT([$flag_supported])
+if test x$flag_supported = xyes; then
+ $1=$$1 $flag
+fi
+ done
+])
+
+
+
dnl XDT_FEATURE_DEBUG()
dnl
AC_DEFUN([XDT_FEATURE_DEBUG],
@@ -45,26 +67,42 @@
if test x$enable_debug != xno; then
AC_DEFINE([DEBUG], [1], [Define for debugging support])
-if test x$GCC = xyes; then
- xdt_cv_additional_CFLAGS=-Wall
-fi
-xdt_cv_additional_CFLAGS=$xdt_cv_additional_CFLAGS
-DXFCE_DISABLE_DEPRECATED
+xdt_cv_additional_CFLAGS=-DXFCE_DISABLE_DEPRECATED \
+ -Wall -Wextra \
+ -Wno-missing-field-initializers \
+ -Wno-unused-parameter -Wold-style-definition \
+ -Wdeclaration-after-statement \
+ -Wmissing-declarations -Wredundant-decls \
+ -Wmissing-noreturn -Wshadow -Wpointer-arith \
+ -Wcast-align -Wformat-security \
+ -Winit-self -Wmissing-include-dirs -Wundef \
+ -Wmissing-format-attribute -Wnested-externs \
+ -fstack-protector -D_FORTIFY_SOURCE=2
if test x$enable_debug = xfull; then
AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support])
- if test x$GCC = xyes; then
-xdt_cv_additional_CFLAGS=-g3 -Werror $xdt_cv_additional_CFLAGS
- fi
+ xdt_cv_additional_CFLAGS=$xdt_cv_additional_CFLAGS -g3 -Werror
AC_MSG_RESULT([full])
else
- if test x$GCC = xyes; then
-xdt_cv_additional_CFLAGS=-g $xdt_cv_additional_CFLAGS
- fi
+ xdt_cv_additional_CFLAGS=$xdt_cv_additional_CFLAGS -g
AC_MSG_RESULT([yes])
fi
-CFLAGS=$CFLAGS $xdt_cv_additional_CFLAGS
-CXXFLAGS=$CXXFLAGS $xdt_cv_additional_CFLAGS
+XDT_SUPPORTED_FLAGS([supported_CFLAGS], [$xdt_cv_additional_CFLAGS])
+
+ifelse([$CXX], , , [
+ dnl FIXME: should test on c++ compiler, but the following line causes
+ dnlautoconf errors for projects that don't check for a
+ dnlc++ compiler at all.
+ dnl AC_LANG_PUSH([C++])
+ dnl XDT_SUPPORTED_FLAGS([supported_CXXFLAGS],
[$xdt_cv_additional_CFLAGS])
+ dnl AC_LANG_POP()
+ dnlinstead, just use supported_CFLAGS...
+ supported_CXXFLAGS=$supported_CFLAGS
+])
+
+CFLAGS=$CFLAGS $supported_CFLAGS
+CXXFLAGS=$CXXFLAGS $supported_CXXFLAGS
else
AC_MSG_RESULT([no])
fi
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29884 - xfdesktop/branches/xfce_4_6
Author: kelnos Date: 2009-04-22 03:40:59 + (Wed, 22 Apr 2009) New Revision: 29884 Modified: xfdesktop/branches/xfce_4_6/NEWS xfdesktop/branches/xfce_4_6/configure.ac.in Log: fix build for docs dir Modified: xfdesktop/branches/xfce_4_6/NEWS === --- xfdesktop/branches/xfce_4_6/NEWS2009-04-22 00:49:04 UTC (rev 29883) +++ xfdesktop/branches/xfce_4_6/NEWS2009-04-22 03:40:59 UTC (rev 29884) @@ -1,3 +1,9 @@ +Xfce 4.6.2 +-- + + * Add Catalan and Galician translations of the manual. + + Xfce 4.6.1 -- Modified: xfdesktop/branches/xfce_4_6/configure.ac.in === --- xfdesktop/branches/xfce_4_6/configure.ac.in 2009-04-22 00:49:04 UTC (rev 29883) +++ xfdesktop/branches/xfce_4_6/configure.ac.in 2009-04-22 03:40:59 UTC (rev 29884) @@ -254,12 +254,18 @@ doc/C/Makefile doc/C/xfdesktop.xml doc/C/images/Makefile +doc/ca/Makefile +doc/ca/xfdesktop.xml +doc/ca/images/Makefile doc/da/Makefile doc/da/xfdesktop.xml doc/da/images/Makefile doc/fr/Makefile doc/fr/xfdesktop.xml doc/fr/images/Makefile +doc/gl/Makefile +doc/gl/xfdesktop.xml +doc/gl/images/Makefile doc/it/Makefile doc/it/xfdesktop.xml doc/it/images/Makefile ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29885 - xfdesktop/trunk
Author: kelnos Date: 2009-04-22 03:41:22 + (Wed, 22 Apr 2009) New Revision: 29885 Modified: xfdesktop/trunk/NEWS xfdesktop/trunk/configure.ac.in Log: fix build for docs dir Modified: xfdesktop/trunk/NEWS === --- xfdesktop/trunk/NEWS2009-04-22 03:40:59 UTC (rev 29884) +++ xfdesktop/trunk/NEWS2009-04-22 03:41:22 UTC (rev 29885) @@ -1,3 +1,9 @@ +Xfce 4.6.2 +-- + + * Add Catalan and Galician translations of the manual. + + Xfce 4.6.1 -- Modified: xfdesktop/trunk/configure.ac.in === --- xfdesktop/trunk/configure.ac.in 2009-04-22 03:40:59 UTC (rev 29884) +++ xfdesktop/trunk/configure.ac.in 2009-04-22 03:41:22 UTC (rev 29885) @@ -254,12 +254,18 @@ doc/C/Makefile doc/C/xfdesktop.xml doc/C/images/Makefile +doc/ca/Makefile +doc/ca/xfdesktop.xml +doc/ca/images/Makefile doc/da/Makefile doc/da/xfdesktop.xml doc/da/images/Makefile doc/fr/Makefile doc/fr/xfdesktop.xml doc/fr/images/Makefile +doc/gl/Makefile +doc/gl/xfdesktop.xml +doc/gl/images/Makefile doc/it/Makefile doc/it/xfdesktop.xml doc/it/images/Makefile ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29692 - in xfdesktop/trunk: . src
Author: kelnos
Date: 2009-04-02 06:23:41 + (Thu, 02 Apr 2009)
New Revision: 29692
Modified:
xfdesktop/trunk/NEWS
xfdesktop/trunk/src/main.c
xfdesktop/trunk/src/xfce-desktop.c
xfdesktop/trunk/src/xfce-desktop.h
Log:
reload image and icon view when 'xfdesktop --reload' is run (bug 5156)
Modified: xfdesktop/trunk/NEWS
===
--- xfdesktop/trunk/NEWS2009-04-02 05:43:16 UTC (rev 29691)
+++ xfdesktop/trunk/NEWS2009-04-02 06:23:41 UTC (rev 29692)
@@ -2,7 +2,10 @@
--
* Fix desktop menu failing to load on FreeBSD (bug 3370).
- * Ensure root window properties get deleted when xfdesktop quits (bug 5154).
+ * Ensure root window properties get deleted when xfdesktop
+quits (bug 5154).
+ * Reload the backdrop and icon view when 'xfdesktop --reload'
+is run (bug 5156).
Xfce 4.6.0
Modified: xfdesktop/trunk/src/main.c
===
--- xfdesktop/trunk/src/main.c 2009-04-02 05:43:16 UTC (rev 29691)
+++ xfdesktop/trunk/src/main.c 2009-04-02 06:23:41 UTC (rev 29692)
@@ -152,8 +152,17 @@
static gboolean
reload_idle_cb(gpointer data)
{
-//settings_reload_all(); /* FIXME */
+XfceDesktop **desktops = data;
+gint i, nscreens;
+
+nscreens = gdk_display_get_n_screens(gdk_display_get_default());
+for(i = 0; i nscreens; ++i) {
+if(desktops[i])
+xfce_desktop_refresh(desktops[i]);
+}
+
menu_reload();
+
return FALSE;
}
@@ -162,7 +171,7 @@
{
if(evt-data_format == 8) {
if(!strcmp(RELOAD_MESSAGE, evt-data.b)) {
-g_idle_add ((GSourceFunc)reload_idle_cb, NULL);
+g_idle_add((GSourceFunc)reload_idle_cb, user_data);
return TRUE;
} else if(!strcmp(MENU_MESSAGE, evt-data.b)) {
xfce_desktop_popup_root_menu(XFCE_DESKTOP(w), 0,
@@ -331,7 +340,7 @@
channel = xfconf_channel_new(XFDESKTOP_CHANNEL);
nscreens = gdk_display_get_n_screens(gdpy);
-desktops = g_new(GtkWidget *, nscreens);
+desktops = g_new0(GtkWidget *, nscreens);
for(i = 0; i nscreens; i++) {
g_snprintf(buf, sizeof(buf), /backdrop/screen%d/, i);
desktops[i] = xfce_desktop_new(gdk_display_get_screen(gdpy, i),
@@ -341,7 +350,7 @@
g_signal_connect(G_OBJECT(desktops[i]), scroll-event,
G_CALLBACK(scroll_cb), NULL);
g_signal_connect(G_OBJECT(desktops[i]), client-event,
- G_CALLBACK(client_message_received), NULL);
+ G_CALLBACK(client_message_received), desktops);
menu_attach(XFCE_DESKTOP(desktops[i]));
windowlist_attach(XFCE_DESKTOP(desktops[i]));
gtk_widget_show(desktops[i]);
Modified: xfdesktop/trunk/src/xfce-desktop.c
===
--- xfdesktop/trunk/src/xfce-desktop.c 2009-04-02 05:43:16 UTC (rev 29691)
+++ xfdesktop/trunk/src/xfce-desktop.c 2009-04-02 06:23:41 UTC (rev 29692)
@@ -1377,3 +1377,43 @@
xfce_desktop_do_menu_popup(desktop, button, activate_time,
signals[SIG_POPULATE_SECONDARY_ROOT_MENU]);
}
+
+void
+xfce_desktop_refresh(XfceDesktop *desktop)
+{
+gchar buf[256];
+guint i, max;
+
+g_return_if_fail(XFCE_IS_DESKTOP(desktop));
+
+if(!GTK_WIDGET_REALIZED(desktop))
+return;
+
+/* reload image */
+if(desktop-priv-xinerama_stretch)
+max = 1;
+else
+max = desktop-priv-nbackdrops;
+for(i = 0; i max; ++i) {
+GValue val = { 0, };
+
+g_snprintf(buf, sizeof(buf), %smonitor%d/image-path,
+ desktop-priv-property_prefix, i);
+xfconf_channel_get_property(desktop-priv-channel, buf, val);
+
+xfce_desktop_image_filename_changed(desktop-priv-channel, buf,
+val, desktop);
+
+if(G_VALUE_TYPE(val))
+g_value_unset(val);
+}
+
+#ifdef ENABLE_DESKTOP_ICONS
+/* reload icon view */
+if(desktop-priv-icon_view) {
+gtk_widget_destroy(desktop-priv-icon_view);
+desktop-priv-icon_view = NULL;
+}
+xfce_desktop_setup_icon_view(desktop);
+#endif
+}
Modified: xfdesktop/trunk/src/xfce-desktop.h
===
--- xfdesktop/trunk/src/xfce-desktop.h 2009-04-02 05:43:16 UTC (rev 29691)
+++ xfdesktop/trunk/src/xfce-desktop.h 2009-04-02 06:23:41 UTC (rev 29692)
@@ -114,6 +114,8 @@
guint button,
guint activate_time);
+void xfce_desktop_refresh(XfceDesktop *desktop);
+
G_END_DECLS
#endif
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29694 - in xfdesktop/trunk: . settings
Author: kelnos
Date: 2009-04-02 06:43:49 + (Thu, 02 Apr 2009)
New Revision: 29694
Modified:
xfdesktop/trunk/NEWS
xfdesktop/trunk/settings/main.c
Log:
run 'xfdesktop --reload' when the 1st img is added to an img list (bug 5001)
Modified: xfdesktop/trunk/NEWS
===
--- xfdesktop/trunk/NEWS2009-04-02 06:34:40 UTC (rev 29693)
+++ xfdesktop/trunk/NEWS2009-04-02 06:43:49 UTC (rev 29694)
@@ -8,6 +8,8 @@
is run (bug 5156).
* Make default button in 'delete multiple' dialog consistent with
default in 'delete single' dialog (bug 5140).
+ * Reload the desktop when the first image is added to an image
+list (bug 5001).
Xfce 4.6.0
Modified: xfdesktop/trunk/settings/main.c
===
--- xfdesktop/trunk/settings/main.c 2009-04-02 06:34:40 UTC (rev 29693)
+++ xfdesktop/trunk/settings/main.c 2009-04-02 06:43:49 UTC (rev 29694)
@@ -876,8 +876,14 @@
g_free(pdata);
}
-if(panel-image_list_loaded)
+if(panel-image_list_loaded) {
xfdesktop_settings_save_backdrop_list(panel, model);
+
+/* if we just added the first image, instruct xfdesktop
+ * to load it */
+if(gtk_tree_model_iter_n_children(model, NULL) == 1)
+g_spawn_command_line_async(xfdesktop --reload, NULL);
+}
}
gtk_widget_destroy(chooser);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29695 - in xfdesktop/trunk: . settings
Author: kelnos
Date: 2009-04-02 07:02:16 + (Thu, 02 Apr 2009)
New Revision: 29695
Modified:
xfdesktop/trunk/NEWS
xfdesktop/trunk/settings/main.c
Log:
auto-select images as they're added to the list (bug 5014)
Modified: xfdesktop/trunk/NEWS
===
--- xfdesktop/trunk/NEWS2009-04-02 06:43:49 UTC (rev 29694)
+++ xfdesktop/trunk/NEWS2009-04-02 07:02:16 UTC (rev 29695)
@@ -10,6 +10,8 @@
default in 'delete single' dialog (bug 5140).
* Reload the desktop when the first image is added to an image
list (bug 5001).
+ * Auto-select new images as they are added to the settings dialog's
+image list (bug 5014).
Xfce 4.6.0
Modified: xfdesktop/trunk/settings/main.c
===
--- xfdesktop/trunk/settings/main.c 2009-04-02 06:43:49 UTC (rev 29694)
+++ xfdesktop/trunk/settings/main.c 2009-04-02 07:02:16 UTC (rev 29695)
@@ -855,6 +855,12 @@
COL_FILENAME, filename,
-1);
+/* auto-select the first one added */
+if(l == filenames) {
+GtkTreeSelection *sel =
gtk_tree_view_get_selection(GTK_TREE_VIEW(panel-image_treeview));
+gtk_tree_selection_select_iter(sel, iter);
+}
+
pdata-iters = g_slist_prepend(pdata-iters,
gtk_tree_iter_copy(iter));
g_free(filename);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29676 - xfdesktop/trunk/doc/C
Author: kelnos Date: 2009-03-19 18:03:52 + (Thu, 19 Mar 2009) New Revision: 29676 Modified: xfdesktop/trunk/doc/C/xfdesktop.html xfdesktop/trunk/doc/C/xfdesktop.xml.in Log: fix various typos and incorrect information (bug 5129) Modified: xfdesktop/trunk/doc/C/xfdesktop.html === --- xfdesktop/trunk/doc/C/xfdesktop.html2009-03-19 15:02:17 UTC (rev 29675) +++ xfdesktop/trunk/doc/C/xfdesktop.html2009-03-19 18:03:52 UTC (rev 29676) @@ -1,6 +1,6 @@ -htmlheadmeta http-equiv=Content-Type content=text/html; charset=ISO-8859-1titleXfce 4 Desktop Manager/titlelink rel=stylesheet href=../xfce.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.74.0link rel=home href=#xfdesktop title=Xfce 4 Desktop Managerlink rel=next href=#xfdesktop-intro title=Introduction/headbody bgcolor=white text=black link=#FF vlink=#840084 alink=#FFdiv class=article lang=endiv class=titlepagedivdivh2 class=titlea name=xfdesktop/aXfce 4 Desktop Manager/h2/divdivdiv class=authorgroupdiv class=authorh3 class=authorspan class=firstnameBrian/span span class=surnameTarricone/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a class=email href=mailto:kel...@xfce.org;kel...@xfce.org/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameJaspe r/span span class=surnameHuijsmans/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a class=email href=mailto:jas...@xfce.org;jas...@xfce.org/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameFran�ois/span span class=surnameLe Clainche/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a class=email href=mailto:fleclain...@wanadoo.fr;fleclain...@wanadoo.fr/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameJ�r�me/span span class=surnameGuelfucci/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a class=email href=mailto:jerome.guelfu...@gmail.com;jerome.guelfu...@gmail.com/agt;/code/p/div/div/div/div/divdivspan xmlns=http://www.w3.org/TR/xhtml1/transitional; class=releaseinfo - This manual describes strong xmlns= class=applicationcodexfdesktop/code/strong version 4.5.99.1. -br/br/span/divdivp class=copyrightCopyright � 2008 J�r�me Guelfucci/p/divdivp class=copyrightCopyright � 2004-2007 Brian Tarricone/p/divdivp class=copyrightCopyright � 2004 Jasper Huijsmans/p/divdivp class=copyrightCopyright � 2004 Fran�ois Le Clainche/p/div/divhr/divdiv class=tocpbTable of Contents/b/pdldtspan class=sect1a href=#xfdesktop-introIntroduction/a/span/dtdtspan class=sect1a href=#xfdesktop-backdropBackdrop/a/span/dtdtspan class=sect1a href=#xfdesktop-iconsIcons/a/span/dtdddldtspan class=sect2a href=#xfdesktop-window-iconsMinimized Window Icons/a/span/dtdtspan class=sect2a href=#xfdesktop-file-iconsFile/Launcher Icons/a/span/dt/dl/dddtspan class=sect1a href=#xfdesktop-menuThe Desktop Menu/a/span/dtdtspan class=sect1a href=#xfdesktop-window-listThe Window List Menu/a/span/dtd tspan class=sect1a href=#xfdesktop-settingsDesktop Settings/a/span/dtdddldtspan class=sect2a href=#xfdesktop-settings-backgroundBackground Tab/a/span/dtdtspan class=sect2a href=#xfdesktop-settings-menusMenus Tab/a/span/dtdtspan class=sect2a href=#xfdesktop-settings-iconsIcons Tab/a/span/dt/dl/dddtspan class=sect1a href=#xfdesktop-hidden-optionsHidden Options/a/span/dtdtspan class=sect1a href=#xfdesktop-miscMiscellaneous/a/span/dtdtspan class=sect1a href=#xfdesktop-copyrightAbout xfdesktop/a/span/dt/dl/divdiv class=sect1 lang=endiv class=titlepagedivdivh2 class=title style=clear: botha name=xfdesktop-intro/aIntroduction/h2/div/div/divp +htmlheadmeta http-equiv=Content-Type content=text/html; charset=ISO-8859-1titleXfce 4 Desktop Manager/titlelink rel=stylesheet href=../xfce.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.72.0link rel=start href=#xfdesktop title=Xfce 4 Desktop Managerlink rel=next href=#xfdesktop-intro title=Introduction/headbody bgcolor=white text=black link=#FF vlink=#840084 alink=#FFdiv class=article lang=endiv class=titlepagedivdivh1 class=titlea name=xfdesktop/aXfce 4 Desktop Manager/h1/divdivdiv class=authorgroupdiv class=authorh3 class=authorspan class=firstnameBrian/span span class=surnameTarricone/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:kel...@xfce.org;kel...@xfce.org/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameJasper/span spa n class=surnameHuijsmans/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:jas...@xfce.org;jas...@xfce.org/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameFran�ois/span span class=surnameLe Clainche/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:fleclain...@wanadoo.fr;fleclain...@wanadoo.fr/agt;/code/p
[Xfce4-commits] r29670 - in xfce-utils/trunk: . scripts
Author: kelnos
Date: 2009-03-17 08:13:37 + (Tue, 17 Mar 2009)
New Revision: 29670
Modified:
xfce-utils/trunk/NEWS
xfce-utils/trunk/scripts/xinitrc.in.in
Log:
use '.' instead of 'source' to be sh-compatible
Modified: xfce-utils/trunk/NEWS
===
--- xfce-utils/trunk/NEWS 2009-03-16 11:17:09 UTC (rev 29669)
+++ xfce-utils/trunk/NEWS 2009-03-17 08:13:37 UTC (rev 29670)
@@ -3,6 +3,7 @@
- Reset icon theme name if the migrated icon theme name (possibly 'Rodent')
doesn't exist anymore.
+- Remove a bash-ishm ('source') from xinitrc.
4.6.0
Modified: xfce-utils/trunk/scripts/xinitrc.in.in
===
--- xfce-utils/trunk/scripts/xinitrc.in.in 2009-03-16 11:17:09 UTC (rev
29669)
+++ xfce-utils/trunk/scripts/xinitrc.in.in 2009-03-17 08:13:37 UTC (rev
29670)
@@ -33,7 +33,7 @@
fi
if test -f $XDG_CONFIG_HOME/user-dirs.dirs; then
-source $XDG_CONFIG_HOME/user-dirs.dirs
+. $XDG_CONFIG_HOME/user-dirs.dirs
# i'm deliberately not 'export'-ing the XDG_ vars, because you shouldn't
# rely on the env vars inside apps, since the file could be changed at
# any time by the user. this is solely here for migration purposes.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29671 - xfdesktop/trunk
Author: kelnos Date: 2009-03-17 09:01:35 + (Tue, 17 Mar 2009) New Revision: 29671 Modified: xfdesktop/trunk/configure.ac.in Log: add docs/it/* to makefile generation (bug 5114) Modified: xfdesktop/trunk/configure.ac.in === --- xfdesktop/trunk/configure.ac.in 2009-03-17 08:13:37 UTC (rev 29670) +++ xfdesktop/trunk/configure.ac.in 2009-03-17 09:01:35 UTC (rev 29671) @@ -260,6 +260,9 @@ doc/fr/Makefile doc/fr/xfdesktop.xml doc/fr/images/Makefile +doc/it/Makefile +doc/it/xfdesktop.xml +doc/it/images/Makefile doc/ja/Makefile doc/ja/xfdesktop.xml doc/ja/images/Makefile ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29661 - in xfce-utils/trunk: . scripts
Author: kelnos
Date: 2009-03-15 00:01:26 + (Sun, 15 Mar 2009)
New Revision: 29661
Modified:
xfce-utils/trunk/NEWS
xfce-utils/trunk/scripts/xfconf-migration-4.6.pl.in
Log:
ensure that there's a valid icon theme set after migration
Modified: xfce-utils/trunk/NEWS
===
--- xfce-utils/trunk/NEWS 2009-03-14 14:55:12 UTC (rev 29660)
+++ xfce-utils/trunk/NEWS 2009-03-15 00:01:26 UTC (rev 29661)
@@ -1,6 +1,13 @@
-4.6.0 (Xfce 4.6.0)
-==
+4.6.1
+=
+- Reset icon theme name if the migrated icon theme name (possibly 'Rodent')
+ doesn't exist anymore.
+
+
+4.6.0
+=
+
- Fix sysconfdir and datadir not being expanded properly in
xinitrc (bug #4924).
- Export GTK_PATH variable in xinitrc so that GTK+ has a chance to find
Modified: xfce-utils/trunk/scripts/xfconf-migration-4.6.pl.in
===
--- xfce-utils/trunk/scripts/xfconf-migration-4.6.pl.in 2009-03-14 14:55:12 UTC
(rev 29660)
+++ xfce-utils/trunk/scripts/xfconf-migration-4.6.pl.in 2009-03-15 00:01:26 UTC
(rev 29661)
@@ -256,6 +256,80 @@
return $mcs.'.xml';
}
+sub icon_theme_exists
+{
+my ($dirref,$themename) = @_;
+my @dirs = @{$dirref};
+
+foreach my $d (@dirs) {
+return 1 if(-f $d/$themename/index.theme);
+}
+
+return 0;
+}
+
+sub migrate_icon_theme
+{
+my ($ref,$chan) = @_;
+my %opts = %{$ref};
+my $opt = 'Net/IconThemeName';
+
+# we don't ship rodent anymore, so some distros cause it to be removed
+# when xfce gets upgraded from 4.4 to 4.6. arguably, they should be
+# fixing this themselves, but i'd rather just stop the complaints.
+# if the user still has rodent installed, we won't change anything.
+
+return if(!defined($opts{$opt}));
+my $val = $opts{$opt}-{'value'};
+
+my @icondirs;
+if(defined($ENV{'XDG_DATA_HOME'})) {
+@icondirs = ( $ENV{'XDG_DATA_HOME'} . '/icons' );
+} else {
+@icondirs = ( $ENV{'HOME'} . '/.local/share/icons' );
+}
+if(defined($ENV{'XDG_DATA_DIRS'})) {
+push(@icondirs, split(/:/, $ENV{'XDG_DATA_DIRS'}));
+} else {
+push(@icondirs, ( '/usr/share/icons', '/usr/local/share/icons' ));
+}
+
+if(!icon_theme_exists(\...@icondirs, $val)) {
+$val = undef;
+foreach my $itheme (('Tango', 'gnome', 'crystalsvg')) {
+if(icon_theme_exists(\...@icondirs, $itheme)) {
+$val = $itheme;
+last;
+}
+}
+
+if(!defined($val)) {
+# pick the first one that is not 'hicolor'
+foreach my $d (@icondirs) {
+opendir(DIR, $d) and do {
+my @subdirs = grep { $_ ne 'hicolor' -d $d/$_ }
readdir(DIR);
+foreach my $sd (@subdirs) {
+if(-f $d/$sd/index.theme) {
+$val = $sd;
+last;
+}
+}
+closedir(DIR);
+};
+last if(defined($val));
+}
+
+if(!defined($val)) {
+# ok, their system is kinda b0rked; not much we can do
+warn(Couldn't find a suitable icon theme to migrate to);
+return;
+}
+}
+}
+
+xfconf_set($chan, 'string', '/Net/IconThemeName', $val);
+}
+
sub migrate_xsettings
{
my $mcs = 'gtk';
@@ -283,8 +357,7 @@
'/Net/CursorBlinkTime', 'int');
save_xfconf_prop($ref, $chan, 'Net/DndDragThreshold',
'/Net/DndDragThreshold', 'int');
-save_xfconf_prop($ref, $chan, 'Net/IconThemeName',
- '/Net/IconThemeName', 'string');
+migrate_icon_theme($ref, $chan);
save_xfconf_prop($ref, $chan, 'Net/ThemeName',
'/Net/ThemeName', 'string');
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29651 - in xfconf/trunk: . xfconfd
Author: kelnos
Date: 2009-03-11 23:35:58 + (Wed, 11 Mar 2009)
New Revision: 29651
Modified:
xfconf/trunk/NEWS
xfconf/trunk/configure.ac.in
xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
Log:
be a bit safer when writing out channel files
Modified: xfconf/trunk/NEWS
===
--- xfconf/trunk/NEWS 2009-03-11 18:00:30 UTC (rev 29650)
+++ xfconf/trunk/NEWS 2009-03-11 23:35:58 UTC (rev 29651)
@@ -1,3 +1,10 @@
+Xfce 4.6.1
+==
+
+ * Be a bit safer when writing out channel xml files: flush data to disk
+using fdatasync()/fsync() before renaming over the old file.
+
+
Xfce 4.6.0
==
Modified: xfconf/trunk/configure.ac.in
===
--- xfconf/trunk/configure.ac.in2009-03-11 18:00:30 UTC (rev 29650)
+++ xfconf/trunk/configure.ac.in2009-03-11 23:35:58 UTC (rev 29651)
@@ -13,7 +13,7 @@
m4_define([xfconf_version_micro], [0])
m4_define([xfconf_version_nano], [])
m4_define([xfconf_version_build], [...@revision@])
-m4_define([xfconf_version_tag], [])
+m4_define([xfconf_version_tag], [svn])
m4_define([xfconf_version],
[xfconf_version_major().xfconf_version_minor().xfconf_version_micro()ifelse(xfconf_version_nano(),
[], [], [.xfconf_version_nano()])ifelse(xfconf_version_tag(), [svn],
[xfconf_version_tag()-xfconf_version_build()], [xfconf_version_tag()])])
dnl init autoconf
@@ -45,7 +45,7 @@
sys/stat.h sys/time.h sys/types.h sys/wait.h \
unistd.h])
dnl AC_CHECK_FUNCS([fdwalk getdtablesize setlocale setsid sysconf])
-AC_CHECK_FUNCS([setlocale])
+AC_CHECK_FUNCS([fdatasync fsync setlocale])
dnl version information
XFCONF_VERSION=xfconf_version
Modified: xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
===
--- xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c2009-03-11
18:00:30 UTC (rev 29650)
+++ xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c2009-03-11
23:35:58 UTC (rev 29651)
@@ -1,7 +1,7 @@
/*
* xfconf
*
- * Copyright (c) 2007 Brian Tarricone bj...@cornell.edu
+ * Copyright (c) 2007-2009 Brian Tarricone bj...@cornell.edu
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1934,6 +1934,19 @@
if(fputs(/channel\n, fp) == EOF)
goto out;
+if(fflush(fp))
+goto out;
+
+#if defined(HAVE_FDATASYNC)
+if(fdatasync(fileno(fp)))
+goto out;
+#elif defined(HAVE_FSYNC)
+if(fsync(fileno(fp)))
+goto out;
+#else
+sync();
+#endif
+
if(fclose(fp)) {
fp = NULL;
goto out;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29640 - in xfce4-session/trunk: . settings
Author: kelnos
Date: 2009-03-02 07:12:11 + (Mon, 02 Mar 2009)
New Revision: 29640
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/settings/xfae-model.c
Log:
* settings/xfae-model.c: Don't crash in xfae_item_free() when passed
a NULL pointer (bug 5020).
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2009-03-01 22:47:35 UTC (rev 29639)
+++ xfce4-session/trunk/ChangeLog 2009-03-02 07:12:11 UTC (rev 29640)
@@ -1,3 +1,8 @@
+2009-03-01 Brian Tarricone bj...@cornell.edu
+
+ * settings/xfae-model.c: Don't crash in xfae_item_free() when passed
+ a NULL pointer (bug 5020).
+
2009-02-25 Stephan Arts step...@xfce.org
* == Released 4.6.0 ==
Modified: xfce4-session/trunk/NEWS
===
--- xfce4-session/trunk/NEWS2009-03-01 22:47:35 UTC (rev 29639)
+++ xfce4-session/trunk/NEWS2009-03-02 07:12:11 UTC (rev 29640)
@@ -1,3 +1,9 @@
+4.6.1
+=
+
+- Fix crash in settings dialog when a .desktop file with a missing
+ Application key is opened (bug 5020).
+
4.6.0
=
Modified: xfce4-session/trunk/settings/xfae-model.c
===
--- xfce4-session/trunk/settings/xfae-model.c 2009-03-01 22:47:35 UTC (rev
29639)
+++ xfce4-session/trunk/settings/xfae-model.c 2009-03-02 07:12:11 UTC (rev
29640)
@@ -505,6 +505,9 @@
static void
xfae_item_free (XfaeItem *item)
{
+ if (G_UNLIKELY (item == NULL))
+return;
+
if (item-icon != NULL)
g_object_unref (G_OBJECT (item-icon));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29558 - in xfdesktop/trunk: . modules/menu
Author: kelnos
Date: 2009-02-24 00:57:47 + (Tue, 24 Feb 2009)
New Revision: 29558
Modified:
xfdesktop/trunk/NEWS
xfdesktop/trunk/modules/menu/desktop-menu.c
Log:
menu: discard fiel change notifications on files we don't care about (bug 4979)
Modified: xfdesktop/trunk/NEWS
===
--- xfdesktop/trunk/NEWS2009-02-24 00:57:17 UTC (rev 29557)
+++ xfdesktop/trunk/NEWS2009-02-24 00:57:47 UTC (rev 29558)
@@ -1,6 +1,7 @@
Xfce 4.6rc2 (Xfce 4.5.99.2):
* Fix menu plugin crash when selecting custom menu file (bug 4879).
+ * Only regen the monitor on changes to files we care about (bug 4979).
Xfce 4.6rc1 (Xfce 4.5.99.1):
Modified: xfdesktop/trunk/modules/menu/desktop-menu.c
===
--- xfdesktop/trunk/modules/menu/desktop-menu.c 2009-02-24 00:57:17 UTC (rev
29557)
+++ xfdesktop/trunk/modules/menu/desktop-menu.c 2009-02-24 00:57:47 UTC (rev
29558)
@@ -145,6 +145,7 @@
gpointer user_data)
{
XfceDesktopMenu *desktop_menu = user_data;
+const gchar *filename;
XfceMenuItemCache *cache = xfce_menu_item_cache_get_default();
#ifdef DEBUG
@@ -154,6 +155,16 @@
TRACE(entering (%d,%s), event, buf);
}
#endif
+
+/* bug #4979: only trigger on files we care about */
+filename = thunar_vfs_path_get_name(event_path);
+if(!g_str_has_suffix(filename, .desktop)
+!g_str_has_suffix(filename, .menu)
+!g_str_has_suffix(filename, .directory))
+{
+DBG(menu: ignoring change on \%s\, filename);
+return;
+}
xfce_menu_item_cache_invalidate(cache);
if(!desktop_menu-idle_id)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29537 - in xfce-utils/trunk: . xfrun
Author: kelnos
Date: 2009-02-22 19:09:58 + (Sun, 22 Feb 2009)
New Revision: 29537
Modified:
xfce-utils/trunk/NEWS
xfce-utils/trunk/xfrun/xfrun-dbus.c
xfce-utils/trunk/xfrun/xfrun-dialog.c
xfce-utils/trunk/xfrun/xfrun-dialog.h
Log:
make sure text in dialog gets selected (bug 2836)
Modified: xfce-utils/trunk/NEWS
===
--- xfce-utils/trunk/NEWS 2009-02-22 16:58:44 UTC (rev 29536)
+++ xfce-utils/trunk/NEWS 2009-02-22 19:09:58 UTC (rev 29537)
@@ -1,10 +1,12 @@
-4.6.0 (Xfce 4.6.0)?
-===
+4.6.0 (Xfce 4.6.0)
+==
- Fix sysconfdir and datadir not being expanded properly in
xinitrc (bug #4924).
- Export GTK_PATH variable in xinitrc so that GTK+ has a chance to find
the Xfce theme engine even in a custom prefix (bug #4925).
+- Ensure that xfrun dialog text is selected when the dialog is reshown
+ via the dbus interface (bug 2836).
4.5.99.1 (Xfce 4.6rc1)
Modified: xfce-utils/trunk/xfrun/xfrun-dbus.c
===
--- xfce-utils/trunk/xfrun/xfrun-dbus.c 2009-02-22 16:58:44 UTC (rev 29536)
+++ xfce-utils/trunk/xfrun/xfrun-dbus.c 2009-02-22 19:09:58 UTC (rev 29537)
@@ -174,6 +174,7 @@
/* this handles setting the dialog to the right screen */
xfce_gtk_window_center_on_monitor(GTK_WINDOW(dialog),
gscreen, 0);
+xfrun_dialog_select_text(XFRUN_DIALOG(dialog));
gtk_widget_show(dialog);
reply = dbus_message_new_method_return(message);
Modified: xfce-utils/trunk/xfrun/xfrun-dialog.c
===
--- xfce-utils/trunk/xfrun/xfrun-dialog.c 2009-02-22 16:58:44 UTC (rev
29536)
+++ xfce-utils/trunk/xfrun/xfrun-dialog.c 2009-02-22 19:09:58 UTC (rev
29537)
@@ -674,3 +674,10 @@
g_return_val_if_fail(XFRUN_IS_DIALOG(dialog), NULL);
return dialog-priv-working_directory;
}
+
+void
+xfrun_dialog_select_text(XfrunDialog *dialog)
+{
+gtk_editable_select_region(GTK_EDITABLE(XFRUN_DIALOG(dialog)-priv-entry),
+ 0, -1);
+}
Modified: xfce-utils/trunk/xfrun/xfrun-dialog.h
===
--- xfce-utils/trunk/xfrun/xfrun-dialog.h 2009-02-22 16:58:44 UTC (rev
29536)
+++ xfce-utils/trunk/xfrun/xfrun-dialog.h 2009-02-22 19:09:58 UTC (rev
29537)
@@ -63,6 +63,9 @@
void xfrun_dialog_set_working_directory(XfrunDialog *dialog,
const gchar
*working_directory);
+
+void xfrun_dialog_select_text (XfrunDialog *dialog);
+
G_CONST_RETURN gchar *xfrun_dialog_get_working_directory
(XfrunDialog *dialog);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29540 - xfdesktop/trunk
Author: kelnos Date: 2009-02-23 00:45:59 + (Mon, 23 Feb 2009) New Revision: 29540 Modified: xfdesktop/trunk/configure.ac.in Log: add da and ja docs dirs Modified: xfdesktop/trunk/configure.ac.in === --- xfdesktop/trunk/configure.ac.in 2009-02-22 21:56:42 UTC (rev 29539) +++ xfdesktop/trunk/configure.ac.in 2009-02-23 00:45:59 UTC (rev 29540) @@ -254,9 +254,15 @@ doc/C/Makefile doc/C/xfdesktop.xml doc/C/images/Makefile +doc/da/Makefile +doc/da/xfdesktop.xml +doc/da/images/Makefile doc/fr/Makefile doc/fr/xfdesktop.xml doc/fr/images/Makefile +doc/ja/Makefile +doc/ja/xfdesktop.xml +doc/ja/images/Makefile modules/Makefile modules/menu/Makefile modules/menu/directory-data/Makefile ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29504 - in xfce4-session/trunk: . settings
Author: kelnos
Date: 2009-02-18 09:04:35 + (Wed, 18 Feb 2009)
New Revision: 29504
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/settings/xfae-window.c
Log:
* settings/xfae-window.c: Fix a crash in xfce4-session-settings when
trying to add a new autostarted application. XfaeWindow is no longer
a GtkWindow and can thus not be used as a parent in
gtk_window_set_transient_for() anymore (bug 4934).
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2009-02-17 21:51:47 UTC (rev 29503)
+++ xfce4-session/trunk/ChangeLog 2009-02-18 09:04:35 UTC (rev 29504)
@@ -1,3 +1,10 @@
+2009-02-13 Jannis Pohlmann jan...@xfce.org
+
+ * settings/xfae-window.c: Fix a crash in xfce4-session-settings when
+ trying to add a new autostarted application. XfaeWindow is no longer
+ a GtkWindow and can thus not be used as a parent in
+ gtk_window_set_transient_for() anymore (bug 4934).
+
2009-02-01 Brian Tarricone bj...@cornell.edu
* xfce4-session/xfsm-shutdown-helper.c: Fix sudo shutdown helper;
Modified: xfce4-session/trunk/NEWS
===
--- xfce4-session/trunk/NEWS2009-02-17 21:51:47 UTC (rev 29503)
+++ xfce4-session/trunk/NEWS2009-02-18 09:04:35 UTC (rev 29504)
@@ -5,6 +5,7 @@
- Fix sudo shutdown helper for sysetms without HAL (bug 4849).
- Avoid a spurious error dialog when using the sudo shutdown helper
to shut down the system (bug 4849).
+- Fix crash in autostart editor when adding a new app (bug 4934).
4.5.99.1 (Xfce 4.6rc1)
==
Modified: xfce4-session/trunk/settings/xfae-window.c
===
--- xfce4-session/trunk/settings/xfae-window.c 2009-02-17 21:51:47 UTC (rev
29503)
+++ xfce4-session/trunk/settings/xfae-window.c 2009-02-18 09:04:35 UTC (rev
29504)
@@ -257,6 +257,7 @@
xfae_window_add (XfaeWindow *window)
{
GtkTreeModel *model;
+ GtkWidget*parent;
GtkWidget*dialog;
GError *error = NULL;
gchar*name;
@@ -264,7 +265,8 @@
gchar*command;
dialog = xfae_dialog_new ();
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
+ parent = gtk_widget_get_toplevel (GTK_WIDGET (window));
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
{
gtk_widget_hide (dialog);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29505 - in xfce4-session/trunk: . settings
Author: kelnos Date: 2009-02-18 09:06:41 + (Wed, 18 Feb 2009) New Revision: 29505 Modified: xfce4-session/trunk/ChangeLog xfce4-session/trunk/settings/xfce4-session-settings.glade Log: * settings/xfce4-session-settings.glade: Don't mark gtk stock ids as translatable. Patch from Stefan Stuhr (bug 4719). Modified: xfce4-session/trunk/ChangeLog === --- xfce4-session/trunk/ChangeLog 2009-02-18 09:04:35 UTC (rev 29504) +++ xfce4-session/trunk/ChangeLog 2009-02-18 09:06:41 UTC (rev 29505) @@ -1,3 +1,8 @@ +2009-02-18 Brian Tarricone bj...@cornell.edu + + * settings/xfce4-session-settings.glade: Don't mark gtk stock ids as + translatable. Patch from Stefan Stuhr (bug 4719). + 2009-02-13 Jannis Pohlmann jan...@xfce.org * settings/xfae-window.c: Fix a crash in xfce4-session-settings when Modified: xfce4-session/trunk/settings/xfce4-session-settings.glade === --- xfce4-session/trunk/settings/xfce4-session-settings.glade 2009-02-18 09:04:35 UTC (rev 29504) +++ xfce4-session/trunk/settings/xfce4-session-settings.glade 2009-02-18 09:06:41 UTC (rev 29505) @@ -732,7 +732,7 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property -property name=label translatable=yesgtk-help/property +property name=labelgtk-help/property property name=use_stockTrue/property property name=response_id-11/property /widget @@ -742,7 +742,7 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property -property name=label translatable=yesgtk-close/property +property name=labelgtk-close/property property name=use_stockTrue/property property name=response_id0/property /widget @@ -836,7 +836,7 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property -property name=label translatable=yesgtk-close/property +property name=labelgtk-close/property property name=use_stockTrue/property property name=response_id0/property /widget ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29506 - xfdesktop/trunk/settings
Author: kelnos Date: 2009-02-18 09:17:00 + (Wed, 18 Feb 2009) New Revision: 29506 Modified: xfdesktop/trunk/settings/xfdesktop-settings.glade Log: don't mark gtk stock ids translatable. patch from stefan stuhr (bug 4721) Modified: xfdesktop/trunk/settings/xfdesktop-settings.glade === --- xfdesktop/trunk/settings/xfdesktop-settings.glade 2009-02-18 09:06:41 UTC (rev 29505) +++ xfdesktop/trunk/settings/xfdesktop-settings.glade 2009-02-18 09:17:00 UTC (rev 29506) @@ -1182,7 +1182,7 @@ property name=can_focusTrue/property property name=receives_defaultTrue/property property name=eventsGDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK/property -property name=label translatable=yesgtk-help/property +property name=labelgtk-help/property property name=use_stockTrue/property property name=response_id-11/property /widget @@ -1193,7 +1193,7 @@ property name=can_focusTrue/property property name=receives_defaultTrue/property property name=eventsGDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK/property -property name=label translatable=yesgtk-close/property +property name=labelgtk-close/property property name=use_stockTrue/property property name=response_id-3/property /widget ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29429 - in xfce4-session/trunk: . xfce4-session
Author: kelnos
Date: 2009-02-02 06:11:53 + (Mon, 02 Feb 2009)
New Revision: 29429
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/xfce4-session/xfsm-shutdown-helper.c
Log:
* xfce4-session/xfsm-shutdown-helper.c: Fix sudo shutdown helper;
use the correct offset into the command string table. Also
ignore EINTR on errors, as the shutdown helper sometimes gets
killed before replying to the SM (bug 4849).
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2009-02-02 05:57:54 UTC (rev 29428)
+++ xfce4-session/trunk/ChangeLog 2009-02-02 06:11:53 UTC (rev 29429)
@@ -1,5 +1,12 @@
-2009-10-26 Brian Tarricone bj...@cornell.edu
+2009-02-01 Brian Tarricone bj...@cornell.edu
+ * xfce4-session/xfsm-shutdown-helper.c: Fix sudo shutdown helper;
+ use the correct offset into the command string table. Also
+ ignore EINTR on errors, as the shutdown helper sometimes gets
+ killed before replying to the SM (bug 4849).
+
+2009-01-26 Brian Tarricone bj...@cornell.edu
+
* xfce4-session/main.c: Respect the ICEAUTHORITY environment
variable (bug 4369).
Modified: xfce4-session/trunk/NEWS
===
--- xfce4-session/trunk/NEWS2009-02-02 05:57:54 UTC (rev 29428)
+++ xfce4-session/trunk/NEWS2009-02-02 06:11:53 UTC (rev 29429)
@@ -2,6 +2,9 @@
==
- Respect the ICEAUTHORITY env var (bug 4369).
+- Fix sudo shutdown helper for sysetms without HAL (bug 4849).
+- Avoid a spurious error dialog when using the sudo shutdown helper
+ to shut down the system (bug 4849).
4.5.99.1 (Xfce 4.6rc1)
==
Modified: xfce4-session/trunk/xfce4-session/xfsm-shutdown-helper.c
===
--- xfce4-session/trunk/xfce4-session/xfsm-shutdown-helper.c2009-02-02
05:57:54 UTC (rev 29428)
+++ xfce4-session/trunk/xfce4-session/xfsm-shutdown-helper.c2009-02-02
06:11:53 UTC (rev 29429)
@@ -547,12 +547,14 @@
}
/* send it to our associated sudo'ed process */
- fprintf (helper-outfile, %s\n, command_table[command]);
+ /* -2 is not a magic number, it's to get the right offset in
command_table array */
+ /* because in enum, XFSM_SHUTDOWN_HALT = 2 and XFSM_SHUTDOWN_REBOOT = 3
*/
+ fprintf (helper-outfile, %s\n, command_table[command - 2]);
fflush (helper-outfile);
if (ferror (helper-outfile))
{
- if (error)
+ if (error errno != EINTR)
{
g_set_error (error, G_FILE_ERROR, g_file_error_from_errno
(errno),
_(Error sending command to shutdown helper: %s),
@@ -563,7 +565,7 @@
if (fgets (response, 256, helper-infile) == NULL)
{
- if (error)
+ if (error errno != EINTR)
{
g_set_error (error, G_FILE_ERROR, g_file_error_from_errno
(errno),
_(Error receiving response from shutdown helper:
%s),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29430 - in xfdesktop/trunk: . panel-plugin
Author: kelnos
Date: 2009-02-02 06:29:25 + (Mon, 02 Feb 2009)
New Revision: 29430
Modified:
xfdesktop/trunk/NEWS
xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c
Log:
don't use the custom menu file name if it's not valid (bug 4879)
Modified: xfdesktop/trunk/NEWS
===
--- xfdesktop/trunk/NEWS2009-02-02 06:11:53 UTC (rev 29429)
+++ xfdesktop/trunk/NEWS2009-02-02 06:29:25 UTC (rev 29430)
@@ -1,3 +1,8 @@
+Xfce 4.6rc2 (Xfce 4.5.99.2):
+
+ * Fix menu plugin crash when selecting custom menu file (bug 4879).
+
+
Xfce 4.6rc1 (Xfce 4.5.99.1):
Modified: xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c
===
--- xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c 2009-02-02 06:11:53 UTC
(rev 29429)
+++ xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c 2009-02-02 06:29:25 UTC
(rev 29430)
@@ -522,6 +522,11 @@
g_free(dmp-menu_file);
dmp-menu_file = gtk_file_chooser_get_filename(fc);
+if(!dmp-menu_file|| !g_file_test(dmp-menu_file, G_FILE_TEST_EXISTS)) {
+g_free(dmp-menu_file);
+dmp-menu_file = NULL;
+return;
+}
if(dmp-desktop_menu) {
const gchar *cur_file =
xfce_desktop_menu_get_menu_file(dmp-desktop_menu);
@@ -594,7 +599,7 @@
hbox = g_object_get_data(G_OBJECT(tb), dmp-child-hbox);
gtk_widget_set_sensitive(hbox, TRUE);
-if(dmp-menu_file) {
+if(dmp-menu_file g_file_test(dmp-menu_file, G_FILE_TEST_EXISTS)) {
if(dmp-desktop_menu)
xfce_desktop_menu_destroy(dmp-desktop_menu);
dmp-desktop_menu = xfce_desktop_menu_new(dmp-menu_file, TRUE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29384 - in xfce4-session/trunk: . xfce4-session
Author: kelnos
Date: 2009-01-26 09:50:20 + (Mon, 26 Jan 2009)
New Revision: 29384
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/xfce4-session/main.c
Log:
* xfce4-session/main.c: Respect the ICEAUTHORITY environment
variable (bug 4369).
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2009-01-26 01:38:57 UTC (rev 29383)
+++ xfce4-session/trunk/ChangeLog 2009-01-26 09:50:20 UTC (rev 29384)
@@ -1,3 +1,8 @@
+2009-10-26 Brian Tarricone bj...@cornell.edu
+
+ * xfce4-session/main.c: Respect the ICEAUTHORITY environment
+ variable (bug 4369).
+
2009-01-26 Jannis Pohlmann jan...@xfce.org
* == Released 4.5.99.1 ==
Modified: xfce4-session/trunk/NEWS
===
--- xfce4-session/trunk/NEWS2009-01-26 01:38:57 UTC (rev 29383)
+++ xfce4-session/trunk/NEWS2009-01-26 09:50:20 UTC (rev 29384)
@@ -1,5 +1,11 @@
+4.5.99.2 (Xfce 4.6rc2)
+==
+
+- Respect the ICEAUTHORITY env var (bug 4369).
+
4.5.99.1 (Xfce 4.6rc1)
==
+
- Translation updates: cs, da, fr, nb_NO, pt_BR, sv, zh_CN.
4.5.93 (Xfce 4.6beta3)
Modified: xfce4-session/trunk/xfce4-session/main.c
===
--- xfce4-session/trunk/xfce4-session/main.c2009-01-26 01:38:57 UTC (rev
29383)
+++ xfce4-session/trunk/xfce4-session/main.c2009-01-26 09:50:20 UTC (rev
29384)
@@ -99,8 +99,11 @@
xfce_unsetenv (GDM_LANG);
}
- /* check access to $HOME/.ICEauthority */
- authfile = xfce_get_homefile (.ICEauthority, NULL);
+ /* check access to $ICEAUTHORITY or $HOME/.ICEauthority if unset */
+ if (g_getenv (ICEAUTHORITY))
+authfile = g_strdup (g_getenv (ICEAUTHORITY));
+ else
+authfile = xfce_get_homefile (.ICEauthority, NULL);
fd = open (authfile, O_RDWR | O_CREAT, 0600);
if (fd 0)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29403 - xfce4-settings/trunk/xfce4-settings-helper
Author: kelnos
Date: 2009-01-27 07:51:59 + (Tue, 27 Jan 2009)
New Revision: 29403
Modified:
xfce4-settings/trunk/xfce4-settings-helper/workspaces.c
Log:
revert nick's broken commit from r39342. it breaks workspace name
setting, breaks libwnck api compat, and wasn't necessary anyway.
Modified: xfce4-settings/trunk/xfce4-settings-helper/workspaces.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/workspaces.c 2009-01-27
00:53:45 UTC (rev 29402)
+++ xfce4-settings/trunk/xfce4-settings-helper/workspaces.c 2009-01-27
07:51:59 UTC (rev 29403)
@@ -38,8 +38,7 @@
{
GObject parent;
-WnckScreen *screen;
-
+WnckScreen **screens;
XfconfChannel *channel;
};
@@ -51,7 +50,10 @@
static void xfce_workspaces_helper_class_init(XfceWorkspacesHelperClass
*klass);
static void xfce_workspaces_helper_init(XfceWorkspacesHelper *helper);
static void xfce_workspaces_helper_finalize(GObject *obj);
-static void xfce_workspaces_helper_set_workspace_names(XfceWorkspacesHelper
*helper);
+
+static void xfce_workspaces_helper_set_names_prop(XfceWorkspacesHelper *helper,
+ GdkScreen *screen,
+ gchar **names);
static void xfce_workspaces_helper_update_all_names(XfceWorkspacesHelper
*helper);
static void xfce_workspaces_helper_prop_changed(XfconfChannel *channel,
const gchar *property,
@@ -73,18 +75,55 @@
static void
xfce_workspaces_helper_init(XfceWorkspacesHelper *helper)
{
+gint w, s, n_screens, n_workspaces;
+gchar **names;
+GdkDisplay *display;
+GdkScreen *screen;
+
helper-channel = xfconf_channel_new(WORKSPACES_CHANNEL);
+names = xfconf_channel_get_string_list(helper-channel,
+ WORKSPACE_NAMES_PROP);
-xfce_workspaces_helper_set_workspace_names(helper);
+/* FIXME: need to do this for all screens? */
+display = gdk_display_get_default();
+n_screens = gdk_display_get_n_screens(display);
+helper-screens = g_new0(WnckScreen *, n_screens + 1);
+for(s = 0; s n_screens; ++s) {
+helper-screens[s] = wnck_screen_get(s);
+wnck_screen_force_update(helper-screens[s]);
-helper-screen = wnck_screen_get_default();
-g_signal_connect_swapped(G_OBJECT(helper-screen), workspace-created,
-
G_CALLBACK(xfce_workspaces_helper_update_all_names),
- helper);
-g_signal_connect_swapped(G_OBJECT(helper-screen), workspace-destroyed,
-
G_CALLBACK(xfce_workspaces_helper_update_all_names),
- helper);
+if(s == 0) {
+/* here we assume that all screens will always have the same
+ * number of workspaces, and any changes to this number will
+ * occur at the same time. this may not be a great assumption,
+ * but it'll do. */
+g_signal_connect_swapped(G_OBJECT(helper-screens[s]),
workspace-created,
+
G_CALLBACK(xfce_workspaces_helper_update_all_names),
+ helper);
+g_signal_connect_swapped(G_OBJECT(helper-screens[s]),
workspace-destroyed,
+
G_CALLBACK(xfce_workspaces_helper_update_all_names),
+ helper);
+}
+n_workspaces = wnck_screen_get_workspace_count(helper-screens[s]);
+if(G_UNLIKELY(!names))
+names = g_new0(gchar *, n_workspaces + 1);
+else if(g_strv_length(names) n_workspaces)
+names = g_renew(gchar *, names, n_workspaces + 1);
+
+for(w = g_strv_length(names); w n_workspaces; ++w) {
+/* some of them may not have been set in xfconf */
+names[w] = g_strdup_printf(_(Workspace %d), w + 1);
+}
+names[w] = NULL;
+
+screen = gdk_display_get_screen(display, s);
+xfce_workspaces_helper_set_names_prop(helper, screen, names);
+
+}
+
+g_strfreev(names);
+
g_signal_connect(G_OBJECT(helper-channel),
property-changed:: WORKSPACE_NAMES_PROP,
G_CALLBACK(xfce_workspaces_helper_prop_changed), helper);
@@ -95,82 +134,59 @@
{
XfceWorkspacesHelper *helper = XFCE_WORKSPACES_HELPER(obj);
-g_signal_handlers_disconnect_by_func(G_OBJECT(helper-screen),
+g_signal_handlers_disconnect_by_func(G_OBJECT(helper-channel),
+
G_CALLBACK(xfce_workspaces_helper_prop_changed),
+ helper);
+g_object_unref(G_OBJECT(helper-channel));
+
+g_signal_handlers_disconnect_by_func(G_OBJECT(helper-screens[0]),
G_CALLBACK(xfce_workspaces_helper_update_all_names),
[Xfce4-commits] r29055 - in xfconf/trunk: common xfconf xfconf-query xfconfd
Author: kelnos
Date: 2008-12-27 04:45:19 + (Sat, 27 Dec 2008)
New Revision: 29055
Modified:
xfconf/trunk/common/xfconf-errors.c
xfconf/trunk/common/xfconf-types.c
xfconf/trunk/xfconf-query/main.c
xfconf/trunk/xfconf/xfconf-binding.c
xfconf/trunk/xfconf/xfconf-channel.c
xfconf/trunk/xfconf/xfconf-private.h
xfconf/trunk/xfconf/xfconf.c
xfconf/trunk/xfconfd/xfconf-backend-factory.c
xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
xfconf/trunk/xfconfd/xfconf-backend.c
xfconf/trunk/xfconfd/xfconf-daemon.c
xfconf/trunk/xfconfd/xfconf-locking-utils.c
Log:
fix a bunch of warnings
Modified: xfconf/trunk/common/xfconf-errors.c
===
--- xfconf/trunk/common/xfconf-errors.c 2008-12-27 04:06:10 UTC (rev 29054)
+++ xfconf/trunk/common/xfconf-errors.c 2008-12-27 04:45:19 UTC (rev 29055)
@@ -48,7 +48,7 @@
**/
GQuark
-xfconf_get_error_quark()
+xfconf_get_error_quark(void)
{
if(!xfconf_error_quark)
xfconf_error_quark = g_quark_from_static_string(xfconf-error-quark);
@@ -60,7 +60,7 @@
* dbus error names -- the 'nick' value is used, which can have dashes in it,
* which dbus doesn't like. */
GType
-xfconf_error_get_type()
+xfconf_error_get_type(void)
{
static GType type = 0;
Modified: xfconf/trunk/common/xfconf-types.c
===
--- xfconf/trunk/common/xfconf-types.c 2008-12-27 04:06:10 UTC (rev 29054)
+++ xfconf/trunk/common/xfconf-types.c 2008-12-27 04:45:19 UTC (rev 29055)
@@ -205,7 +205,7 @@
GType
-xfconf_uint16_get_type()
+xfconf_uint16_get_type(void)
{
static GType uint16_type = 0;
GTypeFundamentalInfo finfo = { 0 };
@@ -263,7 +263,7 @@
}
GType
-xfconf_int16_get_type()
+xfconf_int16_get_type(void)
{
static GType int16_type = 0;
GTypeFundamentalInfo finfo = { 0 };
Modified: xfconf/trunk/xfconf/xfconf-binding.c
===
--- xfconf/trunk/xfconf/xfconf-binding.c2008-12-27 04:06:10 UTC (rev
29054)
+++ xfconf/trunk/xfconf/xfconf-binding.c2008-12-27 04:45:19 UTC (rev
29055)
@@ -28,6 +28,7 @@
#define DATA_KEY (I_(--xfconf-g-bindings))
#include xfconf.h
+#include xfconf-private.h
#include xfconf-alias.h
#include xfconf-common-private.h
@@ -359,7 +360,7 @@
void
-_xfconf_g_bindings_init()
+_xfconf_g_bindings_init(void)
{
if(G_UNLIKELY(__bindings))
return;
@@ -369,7 +370,7 @@
}
void
-_xfconf_g_bindings_shutdown()
+_xfconf_g_bindings_shutdown(void)
{
if(G_UNLIKELY(!__bindings))
return;
Modified: xfconf/trunk/xfconf/xfconf-channel.c
===
--- xfconf/trunk/xfconf/xfconf-channel.c2008-12-27 04:06:10 UTC (rev
29054)
+++ xfconf/trunk/xfconf/xfconf-channel.c2008-12-27 04:45:19 UTC (rev
29055)
@@ -98,9 +98,6 @@
PROP_PROPERTY_BASE,
};
-static void xfconf_channel_class_init(XfconfChannelClass *klass);
-
-static void xfconf_channel_init(XfconfChannel *instance);
static void xfconf_channel_set_g_property(GObject *object,
guint property_id,
const GValue *value,
@@ -278,7 +275,7 @@
void
-_xfconf_channel_shutdown()
+_xfconf_channel_shutdown(void)
{
if(G_LIKELY(__channel_singletons)) {
g_hash_table_destroy(__channel_singletons);
@@ -2247,7 +2244,7 @@
/* this really belongs in xfconf.c, but i don't feel like including
* xfconf-dbus-bindings.h twice, or copying the ERROR macros */
gchar **
-xfconf_list_channels()
+xfconf_list_channels(void)
{
DBusGProxy *proxy = _xfconf_get_dbus_g_proxy();
gchar **channels = NULL;
Modified: xfconf/trunk/xfconf/xfconf-private.h
===
--- xfconf/trunk/xfconf/xfconf-private.h2008-12-27 04:06:10 UTC (rev
29054)
+++ xfconf/trunk/xfconf/xfconf-private.h2008-12-27 04:45:19 UTC (rev
29055)
@@ -20,6 +20,8 @@
#ifndef __XFCONF_PRIVATE_H__
#define __XFCONF_PRIVATE_H__
+#include dbus/dbus-glib.h
+
typedef struct
{
guint n_members;
Modified: xfconf/trunk/xfconf/xfconf.c
===
--- xfconf/trunk/xfconf/xfconf.c2008-12-27 04:06:10 UTC (rev 29054)
+++ xfconf/trunk/xfconf/xfconf.c2008-12-27 04:45:19 UTC (rev 29055)
@@ -43,7 +43,7 @@
/* private api */
DBusGConnection *
-_xfconf_get_dbus_g_connection()
+_xfconf_get_dbus_g_connection(void)
{
if(!xfconf_refcnt) {
g_critical(xfconf_init() must be called before attempting to use
libxfconf!);
@@ -54,7 +54,7 @@
}
DBusGProxy *
-_xfconf_get_dbus_g_proxy()
+_xfconf_get_dbus_g_proxy(void)
{
if(!xfconf_refcnt) {
g_critical(xfconf_init() must be called before attempting to use
libxfconf!);
@@ -80,7 +80,7 @@
static void
[Xfce4-commits] r29056 - in xfce4-session/trunk: . po xfce4-session
Author: kelnos
Date: 2008-12-27 04:59:51 + (Sat, 27 Dec 2008)
New Revision: 29056
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/po/xfce4-session.pot
xfce4-session/trunk/xfce4-session/shutdown.c
Log:
* xfce4-session/shutdown.c: Change Log off text to Log out to be
consistent with the rest of the UI.
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2008-12-27 04:45:19 UTC (rev 29055)
+++ xfce4-session/trunk/ChangeLog 2008-12-27 04:59:51 UTC (rev 29056)
@@ -1,3 +1,8 @@
+2008-12-03 Brian Tarricone bj...@cornell.edu
+
+ * xfce4-session/shutdown.c: Change Log off text to Log out to be
+ consistent with the rest of the UI.
+
2008-11-27 Brian Tarricone bj...@cornell.edu
* xfce4-session/xfsm-manager.c: On suspend/hibernate, ignore errors
Modified: xfce4-session/trunk/po/xfce4-session.pot
===
--- xfce4-session/trunk/po/xfce4-session.pot2008-12-27 04:45:19 UTC (rev
29055)
+++ xfce4-session/trunk/po/xfce4-session.pot2008-12-27 04:59:51 UTC (rev
29056)
@@ -8,7 +8,7 @@
msgstr
Project-Id-Version: PACKAGE VERSION\n
Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2008-11-30 21:05+0100\n
+POT-Creation-Date: 2008-12-26 20:55-0800\n
PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n
Last-Translator: FULL NAME em...@address\n
Language-Team: LANGUAGE l...@li.org\n
@@ -314,7 +314,7 @@
#: ../xfce4-session/shutdown.c:360
#, c-format
-msgid span size='large'bLog off %s/b/span
+msgid span size='large'bLog out %s/b/span
msgstr
#: ../xfce4-session/shutdown.c:401
Modified: xfce4-session/trunk/xfce4-session/shutdown.c
===
--- xfce4-session/trunk/xfce4-session/shutdown.c2008-12-27 04:45:19 UTC
(rev 29055)
+++ xfce4-session/trunk/xfce4-session/shutdown.c2008-12-27 04:59:51 UTC
(rev 29056)
@@ -357,7 +357,7 @@
pw = getpwuid (getuid ());
if (G_LIKELY(pw pw-pw_name *pw-pw_name))
{
- gchar *text = g_strdup_printf (_(span size='large'bLog off
%s/b/span), pw-pw_name);
+ gchar *text = g_strdup_printf (_(span size='large'bLog out
%s/b/span), pw-pw_name);
GtkWidget *label = g_object_new (GTK_TYPE_LABEL,
label, text,
use-markup, TRUE,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29057 - in xfce4-session/trunk: . engines/balou po
Author: kelnos
Date: 2008-12-27 05:00:00 + (Sat, 27 Dec 2008)
New Revision: 29057
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/engines/balou/config.c
xfce4-session/trunk/po/xfce4-session.pot
Log:
* engines/balou/config.c: Use xfce_message_dialog() instead of
xfce_err(), fix string a bit.
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2008-12-27 04:59:51 UTC (rev 29056)
+++ xfce4-session/trunk/ChangeLog 2008-12-27 05:00:00 UTC (rev 29057)
@@ -1,3 +1,8 @@
+2008-12-26 Brian Tarricone bj...@cornell.edu
+
+ * engines/balou/config.c: Use xfce_message_dialog() instead of
+ xfce_err(), fix string a bit.
+
2008-12-03 Brian Tarricone bj...@cornell.edu
* xfce4-session/shutdown.c: Change Log off text to Log out to be
Modified: xfce4-session/trunk/engines/balou/config.c
===
--- xfce4-session/trunk/engines/balou/config.c 2008-12-27 04:59:51 UTC (rev
29056)
+++ xfce4-session/trunk/engines/balou/config.c 2008-12-27 05:00:00 UTC (rev
29057)
@@ -330,9 +330,16 @@
if (!config_do_install_theme (file, treeview))
{
- xfce_err (_(Unable to install splash theme from file %s,
- please check that the file is a valid splash
- theme archive.), file);
+ gchar *primary = g_strdup_printf (_(Unable to install splash theme
from file \%s\),
+file);
+ xfce_message_dialog (GTK_WINDOW (toplevel),
+ _(Theme File Error),
+ GTK_STOCK_DIALOG_ERROR,
+ primary,
+ _(Please check that the file is a valid splash
+ theme archive.),
+ GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
+ g_free (primary);
}
g_free (file);
Modified: xfce4-session/trunk/po/xfce4-session.pot
===
--- xfce4-session/trunk/po/xfce4-session.pot2008-12-27 04:59:51 UTC (rev
29056)
+++ xfce4-session/trunk/po/xfce4-session.pot2008-12-27 05:00:00 UTC (rev
29057)
@@ -8,7 +8,7 @@
msgstr
Project-Id-Version: PACKAGE VERSION\n
Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2008-12-26 20:55-0800\n
+POT-Creation-Date: 2008-12-26 20:57-0800\n
PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n
Last-Translator: FULL NAME em...@address\n
Language-Team: LANGUAGE l...@li.org\n
@@ -26,45 +26,51 @@
#: ../engines/balou/config.c:333
#, c-format
-msgid
-Unable to install splash theme from file %s, please check that the file is a
-valid splash theme archive.
+msgid Unable to install splash theme from file \%s\
msgstr
-#: ../engines/balou/config.c:386
+#: ../engines/balou/config.c:336
+msgid Theme File Error
+msgstr
+
+#: ../engines/balou/config.c:339
+msgid Please check that the file is a valid splash theme archive.
+msgstr
+
+#: ../engines/balou/config.c:393
#, c-format
msgid Unable to remove splash theme \%s\ from directory %s.
msgstr
-#: ../engines/balou/config.c:471
+#: ../engines/balou/config.c:478
msgid Choose theme filename...
msgstr
-#: ../engines/balou/config.c:604
+#: ../engines/balou/config.c:611
msgid _Install new theme
msgstr
-#: ../engines/balou/config.c:613
+#: ../engines/balou/config.c:620
msgid _Remove theme
msgstr
-#: ../engines/balou/config.c:630
+#: ../engines/balou/config.c:637
msgid _Export theme
msgstr
-#: ../engines/balou/config.c:845
+#: ../engines/balou/config.c:852
msgid Balou theme
msgstr
-#: ../engines/balou/config.c:930
+#: ../engines/balou/config.c:937
msgid Configure Balou...
msgstr
-#: ../engines/balou/config.c:973
+#: ../engines/balou/config.c:980
msgid Balou
msgstr
-#: ../engines/balou/config.c:974
+#: ../engines/balou/config.c:981
msgid Balou Splash Engine
msgstr
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29047 - in xfconf/trunk: . xfconf-perl
Author: kelnos
Date: 2008-12-25 11:30:01 + (Thu, 25 Dec 2008)
New Revision: 29047
Modified:
xfconf/trunk/NEWS
xfconf/trunk/xfconf-perl/Makefile.PL.in
Log:
fix perl binding link order on cygwin patch from
yselkow...@users.sourceforge.net (bug 4735)
Modified: xfconf/trunk/NEWS
===
--- xfconf/trunk/NEWS 2008-12-24 18:17:20 UTC (rev 29046)
+++ xfconf/trunk/NEWS 2008-12-25 11:30:01 UTC (rev 29047)
@@ -1,7 +1,8 @@
-Xfce 4.6rc1 (Xfce 4.5.99.0)
+Xfce 4.6beta3 (Xfce 4.5.93)
===
* Install xfconfd to $(libexecdir) instead of $(bindir).
+ * Fix perl bindings link order on Cygwin (bug 4735).
Xfce 4.6beta2 (Xfce 4.5.92)
Modified: xfconf/trunk/xfconf-perl/Makefile.PL.in
===
--- xfconf/trunk/xfconf-perl/Makefile.PL.in 2008-12-24 18:17:20 UTC (rev
29046)
+++ xfconf/trunk/xfconf-perl/Makefile.PL.in 2008-12-25 11:30:01 UTC (rev
29047)
@@ -79,7 +79,7 @@
our $xfconf = ExtUtils::Depends-new('Xfconf', 'Glib');
$xfconf-set_inc($pkgcfg{cflags} . -I. -Ibuild . $libxfconf_cflags);
-$xfconf-set_libs($pkgcfg{libs} . $libxfconf_libs);
+$xfconf-set_libs($libxfconf_libs . . $pkgcfg{libs});
$xfconf-add_pm('Xfconf.pm' = '$(INST_LIBDIR)/Xfconf.pm');
#$xfconf-add_pm('Array.pm' = '$(INST_LIBDIR)/Xfconf/Array.pm');
$xfconf-add_xs(@xs_files);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29048 - in xfconf/trunk: . xfconf-perl
Author: kelnos Date: 2008-12-25 11:30:12 + (Thu, 25 Dec 2008) New Revision: 29048 Modified: xfconf/trunk/NEWS xfconf/trunk/configure.ac.in xfconf/trunk/xfconf-perl/Makefile.am Log: allow passing arbitrary options to the perl bindings' Makefile.PL via configure --with-perl-options=foo. patch from yselkow...@users.sourceforge.net (bug 4735) Modified: xfconf/trunk/NEWS === --- xfconf/trunk/NEWS 2008-12-25 11:30:01 UTC (rev 29047) +++ xfconf/trunk/NEWS 2008-12-25 11:30:12 UTC (rev 29048) @@ -3,6 +3,8 @@ * Install xfconfd to $(libexecdir) instead of $(bindir). * Fix perl bindings link order on Cygwin (bug 4735). + * Allow passing arbitrary options to the perl bindings' Makefile.PL +generation script (bug 4735). Xfce 4.6beta2 (Xfce 4.5.92) Modified: xfconf/trunk/configure.ac.in === --- xfconf/trunk/configure.ac.in2008-12-25 11:30:01 UTC (rev 29047) +++ xfconf/trunk/configure.ac.in2008-12-25 11:30:12 UTC (rev 29048) @@ -105,6 +105,14 @@ AC_SUBST([PERL_EXTUTILS_DEPENDS_REQUIRED_VERSION]) AC_SUBST([PERL_EXTUTILS_PKGCONFIG_REQUIRED_VERSION]) +dnl Options to pass when configuring Perl bindings +AC_ARG_WITH([perl-options], +[AC_HELP_STRING([--with-perl-options=OPTIONS], +[options to pass on command-line when generating Perl bindings build file])], +[perl_makeopts=$withval], [perl_makeopts=]) +PERL_MAKE_OPTIONS=$perl_makeopts +AC_SUBST(PERL_MAKE_OPTIONS) + dnl check alignment for struct returns AC_DEFUN([BT_GLIB_CHECK_ALIGNOF], [ Modified: xfconf/trunk/xfconf-perl/Makefile.am === --- xfconf/trunk/xfconf-perl/Makefile.am2008-12-25 11:30:01 UTC (rev 29047) +++ xfconf/trunk/xfconf-perl/Makefile.am2008-12-25 11:30:12 UTC (rev 29048) @@ -20,7 +20,7 @@ test -f $$f || $(LN_S) $(srcdir)/$$f $$f; \ done; \ fi - top_builddir=$(top_srcdir) $(PERL) Makefile.PL PREFIX=$(prefix) + top_builddir=$(top_srcdir) $(PERL) Makefile.PL PREFIX=$(prefix) $(PERL_MAKE_OPTIONS) all-local: Makefile.perl $(MAKE) -f Makefile.perl ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29022 - xfdesktop/trunk
Author: kelnos
Date: 2008-12-13 23:01:53 + (Sat, 13 Dec 2008)
New Revision: 29022
Modified:
xfdesktop/trunk/README
Log:
remove menu icon info since that's done via the GUI now
Modified: xfdesktop/trunk/README
===
--- xfdesktop/trunk/README 2008-12-13 22:05:59 UTC (rev 29021)
+++ xfdesktop/trunk/README 2008-12-13 23:01:53 UTC (rev 29022)
@@ -92,19 +92,3 @@
The final three entries set the color of the label text. See above for the
differences between NORMAL, SELECTED, and ACTIVE.
-
-.:.
-
-You may also want to show or hide the icons in the desktop menu (right-click)
-and the window menu (middle-click). This is controlled by the global gtk
-gtk-menu-images style property, which can be set by adding something like
-the following to your ~/.gtkrc-2.0 file:
-
-style menu-images {
-gtk-menu-images = false
-}
-widget_class * style menu-images
-
-Unfortunately, this will act on all gtk menus, not just on the desktop or
-window menu. There is currently no way to set this property just for these
-two menus.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29013 - xfce-utils/trunk
Author: kelnos Date: 2008-12-12 08:17:02 + (Fri, 12 Dec 2008) New Revision: 29013 Modified: xfce-utils/trunk/NEWS Log: correct bug number in NEWS Modified: xfce-utils/trunk/NEWS === --- xfce-utils/trunk/NEWS 2008-12-12 07:36:19 UTC (rev 29012) +++ xfce-utils/trunk/NEWS 2008-12-12 08:17:02 UTC (rev 29013) @@ -1,7 +1,7 @@ 4.5.93 (Xfce 4.6beta3) == -- Add --xfce-version option to print the Xfce release version (bug 1471). +- Add --xfce-version option to print the Xfce release version (bug 3754). 4.5.92 (Xfce 4.6beta2) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29011 - /
Author: kelnos Date: 2008-12-12 05:20:19 + (Fri, 12 Dec 2008) New Revision: 29011 Removed: xfce4-terminal/ Log: moved to http://svn.xfce.org/svn/xfce-archive/xfce4-terminal ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29012 - in xfce-utils/trunk: . xfce4-about
Author: kelnos
Date: 2008-12-12 07:36:19 + (Fri, 12 Dec 2008)
New Revision: 29012
Modified:
xfce-utils/trunk/NEWS
xfce-utils/trunk/xfce4-about/info.c
Log:
add --xfce-version option (bug 1471)
Modified: xfce-utils/trunk/NEWS
===
--- xfce-utils/trunk/NEWS 2008-12-12 05:20:19 UTC (rev 29011)
+++ xfce-utils/trunk/NEWS 2008-12-12 07:36:19 UTC (rev 29012)
@@ -1,3 +1,9 @@
+4.5.93 (Xfce 4.6beta3)
+==
+
+- Add --xfce-version option to print the Xfce release version (bug 1471).
+
+
4.5.92 (Xfce 4.6beta2)
==
Modified: xfce-utils/trunk/xfce4-about/info.c
===
--- xfce-utils/trunk/xfce4-about/info.c 2008-12-12 05:20:19 UTC (rev 29011)
+++ xfce-utils/trunk/xfce4-about/info.c 2008-12-12 07:36:19 UTC (rev 29012)
@@ -4,6 +4,7 @@
*2003 Jasper Huijsmans (huysm...@users.sourceforge.net)
*2003,2006 Benedikt Meurer (be...@xfce.org)
*2005,2006 Jean-François Wauthy (pol...@xfce.org)
+ *2007 Cody A.W. Somerville cody-somervi...@ubuntu.com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -411,6 +412,15 @@
GtkWidget *info_help_button;
GdkPixbuf *logo_pb;
+ if(argc = 2 !strcmp (argv[1], --xfce-version)) {
+#ifdef RELEASE_LABEL
+g_printf (%s (%s)\n, xfce_version_string (), RELEASE_LABEL);
+#else
+g_printf (%s\n, xfce_version_string ());
+#endif
+exit (0);
+ }
+
xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, UTF-8);
gtk_init (argc, argv);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28980 - in xfdesktop/trunk: . common
Author: kelnos
Date: 2008-12-05 07:04:14 + (Fri, 05 Dec 2008)
New Revision: 28980
Modified:
xfdesktop/trunk/NEWS
xfdesktop/trunk/common/xfdesktop-common.c
xfdesktop/trunk/configure.ac.in
Log:
avoid infinite loop if all files in a backdrop list are invalid
Modified: xfdesktop/trunk/NEWS
===
--- xfdesktop/trunk/NEWS2008-12-04 13:55:16 UTC (rev 28979)
+++ xfdesktop/trunk/NEWS2008-12-05 07:04:14 UTC (rev 28980)
@@ -1,3 +1,9 @@
+Xfce 4.6beta3 (Xfce 4.5.93):
+
+
+ * Avoid an infinite loop if all files in a backdrop list are invalid.
+
+
Xfce 4.6beta2 (Xfce 4.5.92):
Modified: xfdesktop/trunk/common/xfdesktop-common.c
===
--- xfdesktop/trunk/common/xfdesktop-common.c 2008-12-04 13:55:16 UTC (rev
28979)
+++ xfdesktop/trunk/common/xfdesktop-common.c 2008-12-05 07:04:14 UTC (rev
28980)
@@ -178,7 +178,7 @@
static gboolean __initialized = FALSE;
static gint previndex = -1;
gchar **files, *file = NULL;
-gint n_items = 0, cur_file, i;
+gint n_items = 0, cur_file, i, tries = 0;
g_return_val_if_fail(filename (!error || !*error), NULL);
@@ -213,6 +213,14 @@
}
do {
+if(tries++ == n_items) {
+/* this isn't precise, but if we've failed to get a good
+ * image after all this time, let's just give up */
+g_warning(Unable to find good image from list; giving up);
+g_strfreev(files);
+return NULL;
+}
+
do {
#ifdef HAVE_SRANDOM
cur_file = random() % n_items;
@@ -220,6 +228,7 @@
cur_file = rand() % n_items;
#endif
} while(cur_file == previndex G_LIKELY(previndex != -1));
+
} while(!xfdesktop_image_file_is_valid(files[cur_file]));
previndex = cur_file;
Modified: xfdesktop/trunk/configure.ac.in
===
--- xfdesktop/trunk/configure.ac.in 2008-12-04 13:55:16 UTC (rev 28979)
+++ xfdesktop/trunk/configure.ac.in 2008-12-05 07:04:14 UTC (rev 28980)
@@ -8,7 +8,7 @@
m4_define([xfdesktop_version_minor], [5])
m4_define([xfdesktop_version_micro], [92])
m4_define([xfdesktop_version_build], [EMAIL PROTECTED]@])
-m4_define([xfdesktop_version_tag],[])
+m4_define([xfdesktop_version_tag],[svn])
m4_define([xfdesktop_version],
[xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_tag(),
[svn], [xfdesktop_version_tag()-xfdesktop_version_build()],
[xfdesktop_version_tag()])])
dnl minimum required versions
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28936 - in xfce4-session/trunk: . xfce4-session
Author: kelnos
Date: 2008-11-28 00:07:10 + (Fri, 28 Nov 2008)
New Revision: 28936
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/configure.in.in
xfce4-session/trunk/xfce4-session/shutdown.c
Log:
* configure.in.in: Check for pwd.h and getpwuid ().
* xfce4-session/shutdown.c: Display the currently logged-in user
in a label in the shutdown dialog.
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2008-11-27 21:28:06 UTC (rev 28935)
+++ xfce4-session/trunk/ChangeLog 2008-11-28 00:07:10 UTC (rev 28936)
@@ -1,3 +1,9 @@
+2008-11-27 Brian Tarricone [EMAIL PROTECTED]
+
+ * configure.in.in: Check for pwd.h and getpwuid ().
+ * xfce4-session/shutdown.c: Display the currently logged-in user
+ in a label in the shutdown dialog.
+
2008-11-15 Brian Tarricone [EMAIL PROTECTED]
* xfce4-session/xfsm-startup.c: Be sure to properly signal that
Modified: xfce4-session/trunk/configure.in.in
===
--- xfce4-session/trunk/configure.in.in 2008-11-27 21:28:06 UTC (rev 28935)
+++ xfce4-session/trunk/configure.in.in 2008-11-28 00:07:10 UTC (rev 28936)
@@ -49,10 +49,10 @@
dnl check for standard header files
AC_HEADER_STDC
AC_CHECK_HEADERS([asm/unistd.h errno.h fcntl.h limits.h \
- netdb.h signal.h stdarg.h sys/param.h sys/resource.h \
+ netdb.h pwd.h signal.h stdarg.h sys/param.h sys/resource.h \
sys/socket.h sys/time.h sys/wait.h sys/utsname.h time.h \
unistd.h])
-AC_CHECK_FUNCS([getaddrinfo gethostbyname gethostname setsid \
+AC_CHECK_FUNCS([getaddrinfo gethostbyname gethostname getpwuid setsid \
sigaction strdup sync vfork])
dnl Check for X11 installed
Modified: xfce4-session/trunk/xfce4-session/shutdown.c
===
--- xfce4-session/trunk/xfce4-session/shutdown.c2008-11-27 21:28:06 UTC
(rev 28935)
+++ xfce4-session/trunk/xfce4-session/shutdown.c2008-11-28 00:07:10 UTC
(rev 28936)
@@ -40,6 +40,15 @@
#include unistd.h
#endif
+#ifdef HAVE_GETPWUID
+#ifdef HAVE_SYS_TYPES_H
+#include sys/types.h
+#endif
+#ifdef HAVE_PWD_H
+#include pwd.h
+#endif
+#endif
+
#ifdef HAVE_ASM_UNISTD_H
#include asm/unistd.h /* for __NR_ioprio_set */
#endif
@@ -198,6 +207,9 @@
GdkPixmap *screenshot_pm = NULL;
GdkGC *screenshot_gc;
#endif
+#ifdef HAVE_GETPWUID
+ struct passwd *pw;
+#endif
g_return_val_if_fail(saveSession != NULL, FALSE);
g_return_val_if_fail(shutdownType != NULL, FALSE);
@@ -341,6 +353,26 @@
gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
gtk_widget_show(vbox);
+#ifdef HAVE_GETPWUID
+ pw = getpwuid (getuid ());
+ if (G_LIKELY(pw pw-pw_name *pw-pw_name))
+{
+ gchar *text = g_strdup_printf (_(span size='large'bLog off
%s/b/span), pw-pw_name);
+ GtkWidget *label = g_object_new (GTK_TYPE_LABEL,
+ label, text,
+ use-markup, TRUE,
+ justify, GTK_JUSTIFY_CENTER,
+ xalign, 0.5,
+ yalign, 0.5,
+ NULL);
+
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+ g_free (text);
+}
+#endif
+
hbox = gtk_hbox_new (TRUE, BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28938 - in xfce4-session/trunk: . xfce4-session
Author: kelnos
Date: 2008-11-28 06:14:37 + (Fri, 28 Nov 2008)
New Revision: 28938
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/xfce4-session/xfsm-manager.c
Log:
* xfce4-session/xfsm-manager.c: On suspend/hibernate, ignore errors
of type DBUS_GERROR_NO_REPLY, not type _TIMEOUT (bug 4628).
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2008-11-28 02:20:05 UTC (rev 28937)
+++ xfce4-session/trunk/ChangeLog 2008-11-28 06:14:37 UTC (rev 28938)
@@ -1,8 +1,13 @@
2008-11-27 Brian Tarricone [EMAIL PROTECTED]
+ * xfce4-session/xfsm-manager.c: On suspend/hibernate, ignore errors
+ of type DBUS_GERROR_NO_REPLY, not type _TIMEOUT (bug 4628).
+
+2008-11-27 Brian Tarricone [EMAIL PROTECTED]
+
* configure.in.in: Check for pwd.h and getpwuid ().
* xfce4-session/shutdown.c: Display the currently logged-in user
- in a label in the shutdown dialog.
+ in a label in the shutdown dialog (bug 3083).
2008-11-15 Brian Tarricone [EMAIL PROTECTED]
Modified: xfce4-session/trunk/NEWS
===
--- xfce4-session/trunk/NEWS2008-11-28 02:20:05 UTC (rev 28937)
+++ xfce4-session/trunk/NEWS2008-11-28 06:14:37 UTC (rev 28938)
@@ -1,11 +1,14 @@
-4.5.90.0
-
+4.5.93 (Xfce 4.6beta3)
+==
- Don't let autostart get run twice when using the failsafe session
(bug 4486).
+- Display username in logout dialog (bug 3083).
+- Ignore DBUS_GERROR_NO_REPLY errors on suspend/hibernate (bug 4629).
-4.5.92
-==
+4.5.92 (Xfce 4.6beta2)
+==
+
- Hook up Help button in settings dialog.
- Implement support for the RestartImmediately restart style hint.
- Fix possible crash with uninitialised GError (bug 4202).
@@ -27,8 +30,9 @@
it wants to cancel shutdown. Also fixes a similar problem when
interaction is requested during a phase 2 save-yourself (bug 4284).
-4.5.91
-==
+4.5.91 (Xfce 4.6beta1)
+==
+
- Start up session in parallel to greatly shorten startup time (bug 4312).
- Add a D-Bus interface for some limited amount of remote control.
- Implement support for the ShutdownCommand SM property when a
@@ -44,8 +48,9 @@
used, however.
-4.5.90
-==
+4.5.90 (Xfce 4.6alpha)
+==
+
- Modified settings-dialogs to work with the new settings-manager
- Fix compile-issues with -Wall -Werror in mice theme-engine and
settings-dialogs
- Let xfce4-session start xfsettingsd automatically
Modified: xfce4-session/trunk/xfce4-session/xfsm-manager.c
===
--- xfce4-session/trunk/xfce4-session/xfsm-manager.c2008-11-28 02:20:05 UTC
(rev 28937)
+++ xfce4-session/trunk/xfce4-session/xfsm-manager.c2008-11-28 06:14:37 UTC
(rev 28938)
@@ -1104,7 +1104,7 @@
manager-shutdown_type,
error)
(error-domain != DBUS_GERROR
- || error-code != DBUS_GERROR_TIMED_OUT)))
+ || error-code != DBUS_GERROR_NO_REPLY)))
{
xfce_message_dialog (NULL, _(Shutdown Failed),
GTK_STOCK_DIALOG_ERROR,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28838 - xfce4-settings/trunk/dialogs/accessibility-settings
Author: kelnos Date: 2008-11-17 21:47:59 + (Mon, 17 Nov 2008) New Revision: 28838 Modified: xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade Log: ouch, fix bad typo Modified: xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade === --- xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade 2008-11-17 21:12:37 UTC (rev 28837) +++ xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade 2008-11-17 21:47:59 UTC (rev 28838) @@ -141,7 +141,7 @@ widget class=GtkCheckButton id=slow-keys-enabled property name=visibleTrue/property property name=can_focusTrue/property -property name=tooltip translatable=yesTo helps to prevent accidental key strokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted/property +property name=tooltip translatable=yesTo help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted/property property name=label translatable=yesUse slow _keys/property property name=use_underlineTrue/property property name=response_id0/property ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28839 - xfce4-settings/trunk/po
Author: kelnos Date: 2008-11-17 21:48:13 + (Mon, 17 Nov 2008) New Revision: 28839 Modified: xfce4-settings/trunk/po/ca.po xfce4-settings/trunk/po/cs.po xfce4-settings/trunk/po/da.po xfce4-settings/trunk/po/de.po xfce4-settings/trunk/po/es.po xfce4-settings/trunk/po/fi.po xfce4-settings/trunk/po/fr.po xfce4-settings/trunk/po/id.po xfce4-settings/trunk/po/ja.po xfce4-settings/trunk/po/nl.po xfce4-settings/trunk/po/pt_BR.po xfce4-settings/trunk/po/xfce4-settings.pot Log: update-po Modified: xfce4-settings/trunk/po/ca.po === --- xfce4-settings/trunk/po/ca.po 2008-11-17 21:47:59 UTC (rev 28838) +++ xfce4-settings/trunk/po/ca.po 2008-11-17 21:48:13 UTC (rev 28839) @@ -8,7 +8,7 @@ msgstr Project-Id-Version: xfce 4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2008-11-16 18:09-0800\n +POT-Creation-Date: 2008-11-17 13:48-0800\n PO-Revision-Date: 2008-11-16 10:54+0100\n Last-Translator: Carles Muñoz Gorriz [EMAIL PROTECTED]\n Language-Team: Catalan\n @@ -121,15 +121,14 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22 msgid -To help prevent accidental multiple keystrokes, bounce keys imposes a -minimum delay between keystrokes +To help prevent accidental keystrokes, slow keys requires that a key is held +for a certain minimum amount of time before the keystroke will be accepted msgstr #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23 msgid -To helps to prevent accidental key strokes, slow keys requires that a key is -held for a certain minimum amount of time before the keystroke will be -accepted +To help prevent accidental multiple keystrokes, bounce keys imposes a +minimum delay between keystrokes msgstr #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24 Modified: xfce4-settings/trunk/po/cs.po === --- xfce4-settings/trunk/po/cs.po 2008-11-17 21:47:59 UTC (rev 28838) +++ xfce4-settings/trunk/po/cs.po 2008-11-17 21:48:13 UTC (rev 28839) @@ -8,7 +8,7 @@ msgstr Project-Id-Version: xfce 4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2008-11-16 18:09-0800\n +POT-Creation-Date: 2008-11-17 13:48-0800\n PO-Revision-Date: 2008-11-01 22:16+0100\n Last-Translator: Michal Várady [EMAIL PROTECTED]\n Language-Team: Czech\n @@ -120,15 +120,14 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22 msgid -To help prevent accidental multiple keystrokes, bounce keys imposes a -minimum delay between keystrokes +To help prevent accidental keystrokes, slow keys requires that a key is held +for a certain minimum amount of time before the keystroke will be accepted msgstr #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23 msgid -To helps to prevent accidental key strokes, slow keys requires that a key is -held for a certain minimum amount of time before the keystroke will be -accepted +To help prevent accidental multiple keystrokes, bounce keys imposes a +minimum delay between keystrokes msgstr #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24 Modified: xfce4-settings/trunk/po/da.po === --- xfce4-settings/trunk/po/da.po 2008-11-17 21:47:59 UTC (rev 28838) +++ xfce4-settings/trunk/po/da.po 2008-11-17 21:48:13 UTC (rev 28839) @@ -7,7 +7,7 @@ msgstr Project-Id-Version: xfce4-settings 4.5.9\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2008-11-16 18:09-0800\n +POT-Creation-Date: 2008-11-17 13:48-0800\n PO-Revision-Date: 2008-11-02 22:34+0100\n Last-Translator: Lars Jensen [EMAIL PROTECTED]\n Language-Team: Dansk [EMAIL PROTECTED]\n @@ -121,15 +121,14 @@ #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22 msgid -To help prevent accidental multiple keystrokes, bounce keys imposes a -minimum delay between keystrokes +To help prevent accidental keystrokes, slow keys requires that a key is held +for a certain minimum amount of time before the keystroke will be accepted msgstr #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23 msgid -To helps to prevent accidental key strokes, slow keys requires that a key is -held for a certain minimum amount of time before the keystroke will be -accepted +To help prevent accidental multiple keystrokes, bounce keys imposes a +minimum delay between keystrokes msgstr #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24 Modified: xfce4-settings/trunk/po/de.po === --- xfce4-settings/trunk/po/de.po 2008-11-17 21:47:59 UTC (rev 28838) +++ xfce4-settings/trunk/po/de.po 2008-11-17 21:48:13 UTC (rev 28839) @@ -10,7 +10,7 @@ msgstr Project-Id-Version: xfce4-settings 0.0.1-svn\n Report-Msgid-Bugs-To: \n
[Xfce4-commits] r28810 - in xfce4-session/trunk: . xfce4-session
Author: kelnos
Date: 2008-11-15 12:04:41 + (Sat, 15 Nov 2008)
New Revision: 28810
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/xfce4-session/xfsm-manager.c
Log:
* xfce4-session/xfsm-manager.c: Fix autostart getting run twice when
the failsafe session is used (bug 4486).
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2008-11-15 11:02:53 UTC (rev 28809)
+++ xfce4-session/trunk/ChangeLog 2008-11-15 12:04:41 UTC (rev 28810)
@@ -5,6 +5,11 @@
2008-11-12 Brian Tarricone [EMAIL PROTECTED]
+ * xfce4-session/xfsm-manager.c: Fix autostart getting run twice when
+ the failsafe session is used (bug 4486).
+
+2008-11-12 Brian Tarricone [EMAIL PROTECTED]
+
* settings/main.c: Hook up Help button.
* settings/xfce4-session-settings.glade: Fix Help button response
and button order.
Modified: xfce4-session/trunk/NEWS
===
--- xfce4-session/trunk/NEWS2008-11-15 11:02:53 UTC (rev 28809)
+++ xfce4-session/trunk/NEWS2008-11-15 12:04:41 UTC (rev 28810)
@@ -1,3 +1,10 @@
+4.5.90.0
+
+
+- Hook up Help button in settings dialog.
+- Don't let autostart get run twice when using the failsafe session
+ (bug 4486).
+
4.5.92
==
- Hook up Help button in settings dialog.
Modified: xfce4-session/trunk/xfce4-session/xfsm-manager.c
===
--- xfce4-session/trunk/xfce4-session/xfsm-manager.c2008-11-15 11:02:53 UTC
(rev 28809)
+++ xfce4-session/trunk/xfce4-session/xfsm-manager.c2008-11-15 12:04:41 UTC
(rev 28810)
@@ -910,14 +910,13 @@
xfsm_manager_start_client_save_timeout (manager, client);
}
- if ((manager-failsafe_mode || previous_id != NULL)
- manager-state == XFSM_MANAGER_STARTUP)
+ if (previous_id != NULL manager-state == XFSM_MANAGER_STARTUP)
{
- /* Only continue the startup if we are either in Failsafe mode (which
- * means that we don't have any previous_id at all) or the previous_id
- * matched one of the starting_properties. If there was no match
- * above, previous_id will be NULL here.
- * See http://bugs.xfce.org/view_bug_page.php?f_id=212 for details.
+ /* Only continue the startup if the previous_id matched one of
+ * the starting_properties. If there was no match above,
+ * previous_id will be NULL here. We don't need to continue when
+ * in failsafe mode because in that case the failsafe session is
+ * started all at once.
*/
if (g_queue_peek_head (manager-starting_properties) == NULL)
xfsm_startup_session_continue (manager);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28812 - in xfce4-session/trunk: . xfce4-session
Author: kelnos
Date: 2008-11-15 12:26:49 + (Sat, 15 Nov 2008)
New Revision: 28812
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/xfce4-session/xfsm-startup.c
Log:
* xfce4-session/xfsm-startup.c: Be sure to properly signal that
startup is complete when running from the failsafe session.
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2008-11-15 12:06:38 UTC (rev 28811)
+++ xfce4-session/trunk/ChangeLog 2008-11-15 12:26:49 UTC (rev 28812)
@@ -1,13 +1,18 @@
-2008-11-14 Stephan Arts [EMAIL PROTECTED]
+2008-11-15 Brian Tarricone [EMAIL PROTECTED]
- * NEWS, po/POTFILES.in, configure.in.in: Update files for 4.6 beta2
- release
+ * xfce4-session/xfsm-startup.c: Be sure to properly signal that
+ startup is complete when running from the failsafe session.
-2008-11-12 Brian Tarricone [EMAIL PROTECTED]
+2008-11-15 Brian Tarricone [EMAIL PROTECTED]
* xfce4-session/xfsm-manager.c: Fix autostart getting run twice when
the failsafe session is used (bug 4486).
+2008-11-14 Stephan Arts [EMAIL PROTECTED]
+
+ * NEWS, po/POTFILES.in, configure.in.in: Update files for 4.6 beta2
+ release
+
2008-11-12 Brian Tarricone [EMAIL PROTECTED]
* settings/main.c: Hook up Help button.
Modified: xfce4-session/trunk/NEWS
===
--- xfce4-session/trunk/NEWS2008-11-15 12:06:38 UTC (rev 28811)
+++ xfce4-session/trunk/NEWS2008-11-15 12:26:49 UTC (rev 28812)
@@ -1,7 +1,6 @@
4.5.90.0
-- Hook up Help button in settings dialog.
- Don't let autostart get run twice when using the failsafe session
(bug 4486).
Modified: xfce4-session/trunk/xfce4-session/xfsm-startup.c
===
--- xfce4-session/trunk/xfce4-session/xfsm-startup.c2008-11-15 12:06:38 UTC
(rev 28811)
+++ xfce4-session/trunk/xfce4-session/xfsm-startup.c2008-11-15 12:26:49 UTC
(rev 28812)
@@ -450,6 +450,7 @@
{
xfsm_startup_failsafe (manager);
xfsm_startup_autostart ();
+ xfsm_manager_signal_startup_done (manager);
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28784 - in xfce4-settings/trunk: . xfce4-settings-manager
Author: kelnos Date: 2008-11-13 03:27:47 + (Thu, 13 Nov 2008) New Revision: 28784 Modified: xfce4-settings/trunk/NEWS xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c Log: set dialog type hint to 'normal', since it really is just a normal window, and should have a minimize action (bug 4596) Modified: xfce4-settings/trunk/NEWS === --- xfce4-settings/trunk/NEWS 2008-11-12 18:42:25 UTC (rev 28783) +++ xfce4-settings/trunk/NEWS 2008-11-13 03:27:47 UTC (rev 28784) @@ -1,7 +1,11 @@ +4.5.90.0 (Xfce 4.6 rc1) + + * Allow the settings manager window to be minimized (bug 4596). + 4.5.92 (Xfce 4.6 beta2) * Add an option to disable keyboard settings. - * Default to Rodent icon theme instead of hicolor (Bug #4545) + * Default to Rodent icon theme instead of hicolor (Bug 4545). * Use XfcePosixSignalHandler in xfce4-settings-helper to handle signals, since calling gtk_main_quit() from a signal handler may not be safe. @@ -18,13 +22,11 @@ on the X-XfcePluggable and X-XfceHelpFile desktop file keys). * Add embedding support to the accessibility, appearance, mouse and keyboard settings dialogs. - * Don't use g_hash_table_get_keys() which requires GLib 2.14 (bug -#4377). + * Don't use g_hash_table_get_keys() which requires GLib 2.14 (bug 4377). * Move xfsettingsd from xfconf into xfce4-settings. * Rework the way keyboard shortcuts are organized. Support default shortcuts using /default and /custom base properties. - * Add optional UI options to enable/disable sounds in Canberra (bug -#4367). + * Add optional UI options to enable/disable sounds in Canberra (bug 4367). * Add GUI for selecting/changing the keyboard layout. * Translation updates: Dutch, Finnish, German. Modified: xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c === --- xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c 2008-11-12 18:42:25 UTC (rev 28783) +++ xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c 2008-11-13 03:27:47 UTC (rev 28784) @@ -168,9 +168,10 @@ xfce_titled_dialog_set_subtitle(XFCE_TITLED_DIALOG(dialog), dialog-default_subtitle); +gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); gtk_window_set_title(GTK_WINDOW(dialog), dialog-default_title); gtk_window_set_icon_name(GTK_WINDOW(dialog), dialog-default_icon); -gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); +gtk_window_set_type_hint(GTK_WINDOW(dialog), GDK_WINDOW_TYPE_HINT_NORMAL); dialog-content_frame = gtk_vbox_new(FALSE, 0); gtk_widget_show(dialog-content_frame); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28785 - xfdesktop/trunk/settings
Author: kelnos Date: 2008-11-13 04:34:58 + (Thu, 13 Nov 2008) New Revision: 28785 Modified: xfdesktop/trunk/settings/main.c Log: manually stop startup notification when embedded in the main dialog Modified: xfdesktop/trunk/settings/main.c === --- xfdesktop/trunk/settings/main.c 2008-11-13 03:27:47 UTC (rev 28784) +++ xfdesktop/trunk/settings/main.c 2008-11-13 04:34:58 UTC (rev 28785) @@ -1424,6 +1424,8 @@ g_signal_connect(G_OBJECT(plug), delete-event, G_CALLBACK(gtk_main_quit), NULL); +gdk_notify_startup_complete(); + plug_child = glade_xml_get_widget(gxml, alignment1); gtk_widget_reparent(plug_child, plug); gtk_widget_show(plug_child); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28786 - in xfce4-session/trunk: . settings
Author: kelnos
Date: 2008-11-13 04:56:33 + (Thu, 13 Nov 2008)
New Revision: 28786
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/settings/main.c
xfce4-session/trunk/settings/xfce-session-settings.desktop.in
xfce4-session/trunk/settings/xfce4-session-settings.glade
Log:
* settings/main.c: Hook up Help button.
* settings/xfce4-session-settings.glade: Fix Help button response
and button order.
* settings/xfce-session-settings.desktop.in: Mark dialog as
supporting startup notification.
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2008-11-13 04:34:58 UTC (rev 28785)
+++ xfce4-session/trunk/ChangeLog 2008-11-13 04:56:33 UTC (rev 28786)
@@ -1,3 +1,11 @@
+2008-11-12 Brian Tarricone [EMAIL PROTECTED]
+
+ * settings/main.c: Hook up Help button.
+ * settings/xfce4-session-settings.glade: Fix Help button response
+ and button order.
+ * settings/xfce-session-settings.desktop.in: Mark dialog as
+ supporting startup notification.
+
2008-11-06 Brian Tarricone [EMAIL PROTECTED]
* settings/xfce4-session.xml: Add xfce4-settings-helper to the
Modified: xfce4-session/trunk/NEWS
===
--- xfce4-session/trunk/NEWS2008-11-13 04:34:58 UTC (rev 28785)
+++ xfce4-session/trunk/NEWS2008-11-13 04:56:33 UTC (rev 28786)
@@ -1,3 +1,8 @@
+4.5.90.0
+===
+
+- Hook up Help button in settings dialog.
+
4.5.92
==
- Implement support for the RestartImmediately restart style hint.
Modified: xfce4-session/trunk/settings/main.c
===
--- xfce4-session/trunk/settings/main.c 2008-11-13 04:34:58 UTC (rev 28785)
+++ xfce4-session/trunk/settings/main.c 2008-11-13 04:56:33 UTC (rev 28786)
@@ -120,11 +120,10 @@
GtkWidget *dialog = glade_xml_get_widget(gxml,
xfce4_session_settings_dialog);
g_object_unref(gxml);
-while(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_HELP) {
-/* FIXME: load help */
-}
+while(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_HELP)
+xfce_exec(xfhelp4 xfce4-session.html, FALSE, FALSE, NULL);
-gtk_widget_destroy (dialog);
+gtk_widget_destroy(dialog);
} else {
GtkWidget *plug, *plug_child;
@@ -140,7 +139,7 @@
g_object_unref(gxml);
/* Stop startup notification */
-gdk_notify_startup_complete ();
+gdk_notify_startup_complete();
gtk_main();
}
Modified: xfce4-session/trunk/settings/xfce-session-settings.desktop.in
===
--- xfce4-session/trunk/settings/xfce-session-settings.desktop.in
2008-11-13 04:34:58 UTC (rev 28785)
+++ xfce4-session/trunk/settings/xfce-session-settings.desktop.in
2008-11-13 04:56:33 UTC (rev 28786)
@@ -5,6 +5,7 @@
Exec=xfce4-session-settings
Icon=xfce4-session
Terminal=false
+StartupNotify=true
Type=Application
Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
OnlyShowIn=XFCE;
Modified: xfce4-session/trunk/settings/xfce4-session-settings.glade
===
--- xfce4-session/trunk/settings/xfce4-session-settings.glade 2008-11-13
04:34:58 UTC (rev 28785)
+++ xfce4-session/trunk/settings/xfce4-session-settings.glade 2008-11-13
04:56:33 UTC (rev 28786)
@@ -1,6 +1,6 @@
?xml version=1.0 encoding=UTF-8 standalone=no?
!DOCTYPE glade-interface SYSTEM glade-2.0.dtd
-!--Generated with glade3 3.4.5 on Fri Oct 31 16:32:14 2008 --
+!--Generated with glade3 3.4.5 on Wed Nov 12 20:45:14 2008 --
glade-interface
requires lib=xfce4/
widget class=XfceTitledDialog id=xfce4_session_settings_dialog
@@ -727,7 +727,6 @@
child internal-child=action_area
widget class=GtkHButtonBox id=dialog-action_area1
property name=visibleTrue/property
-property name=layout_styleGTK_BUTTONBOX_EDGE/property
child
widget class=GtkButton id=button1
property name=visibleTrue/property
@@ -735,7 +734,7 @@
property name=receives_defaultTrue/property
property name=label translatable=yesgtk-help/property
property name=use_stockTrue/property
-property name=response_id0/property
+property name=response_id-11/property
/widget
/child
child
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28770 - in xfconf/trunk: . xfconfd
Author: kelnos Date: 2008-11-12 07:55:09 + (Wed, 12 Nov 2008) New Revision: 28770 Modified: xfconf/trunk/NEWS xfconf/trunk/xfconfd/Makefile.am xfconf/trunk/xfconfd/org.xfce.Xfconf.service.in Log: install xfconfd to $libexecdir instead of $bindir Modified: xfconf/trunk/NEWS === --- xfconf/trunk/NEWS 2008-11-12 06:55:27 UTC (rev 28769) +++ xfconf/trunk/NEWS 2008-11-12 07:55:09 UTC (rev 28770) @@ -1,3 +1,9 @@ +Xfce 4.6rc1 (Xfce 4.5.99.0) +=== + + * Install xfconfd to $(libexecdir) instead of $(bindir). + + Xfce 4.6beta2 (Xfce 4.5.92) === Modified: xfconf/trunk/xfconfd/Makefile.am === --- xfconf/trunk/xfconfd/Makefile.am2008-11-12 06:55:27 UTC (rev 28769) +++ xfconf/trunk/xfconfd/Makefile.am2008-11-12 07:55:09 UTC (rev 28770) @@ -1,5 +1,5 @@ -bin_PROGRAMS = xfconfd +libexec_PROGRAMS = xfconfd xfconf_backend_sources = @@ -55,7 +55,7 @@ service_DATA = $(service_in_files:.service.in=.service) %.service: %.service.in - sed -e s,[EMAIL PROTECTED]@,$(bindir),g $ $@ + sed -e s,[EMAIL PROTECTED]@,$(libexecdir),g $ $@ CLEANFILES = \ $(service_DATA) Modified: xfconf/trunk/xfconfd/org.xfce.Xfconf.service.in === --- xfconf/trunk/xfconfd/org.xfce.Xfconf.service.in 2008-11-12 06:55:27 UTC (rev 28769) +++ xfconf/trunk/xfconfd/org.xfce.Xfconf.service.in 2008-11-12 07:55:09 UTC (rev 28770) @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.xfce.Xfconf [EMAIL PROTECTED]@/xfconfd [EMAIL PROTECTED]@/xfconfd ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28708 - xfconf/trunk
Author: kelnos Date: 2008-11-10 11:58:26 + (Mon, 10 Nov 2008) New Revision: 28708 Modified: xfconf/trunk/configure.ac.in Log: re-add svn version tag Modified: xfconf/trunk/configure.ac.in === --- xfconf/trunk/configure.ac.in2008-11-10 11:57:38 UTC (rev 28707) +++ xfconf/trunk/configure.ac.in2008-11-10 11:58:26 UTC (rev 28708) @@ -12,7 +12,7 @@ m4_define([xfconf_version_minor], [5]) m4_define([xfconf_version_micro], [92]) m4_define([xfconf_version_build], [EMAIL PROTECTED]@]) -m4_define([xfconf_version_tag], []) +m4_define([xfconf_version_tag], [svn]) m4_define([xfconf_version], [xfconf_version_major().xfconf_version_minor().xfconf_version_micro()ifelse(xfconf_version_tag(), [svn], [xfconf_version_tag()-xfconf_version_build()], [xfconf_version_tag()])]) dnl init autoconf ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28707 - xfconf/trunk/xfconf-perl
Author: kelnos Date: 2008-11-10 11:57:38 + (Mon, 10 Nov 2008) New Revision: 28707 Modified: xfconf/trunk/xfconf-perl/Makefile.am Log: make the perl bindings respect --prefix Modified: xfconf/trunk/xfconf-perl/Makefile.am === --- xfconf/trunk/xfconf-perl/Makefile.am2008-11-10 10:52:06 UTC (rev 28706) +++ xfconf/trunk/xfconf-perl/Makefile.am2008-11-10 11:57:38 UTC (rev 28707) @@ -20,7 +20,7 @@ test -f $$f || $(LN_S) $(srcdir)/$$f $$f; \ done; \ fi - top_builddir=$(top_srcdir) $(PERL) Makefile.PL + top_builddir=$(top_srcdir) $(PERL) Makefile.PL PREFIX=$(prefix) all-local: Makefile.perl $(MAKE) -f Makefile.perl ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28721 - xfce4-settings/trunk/xfce4-settings-helper
Author: kelnos
Date: 2008-11-11 05:14:24 + (Tue, 11 Nov 2008)
New Revision: 28721
Modified:
xfce4-settings/trunk/xfce4-settings-helper/main.c
Log:
set SmRestartIfRunning if started in debug mode
Modified: xfce4-settings/trunk/xfce4-settings-helper/main.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-11-11 00:56:57 UTC
(rev 28720)
+++ xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-11-11 05:14:24 UTC
(rev 28721)
@@ -125,7 +125,8 @@
static gboolean
xfce_settings_helper_connect_session (int argc,
char **argv,
- const gchar *sm_client_id)
+ const gchar *sm_client_id,
+ gboolean debug_mode)
{
SessionClient *sm_client;
@@ -134,7 +135,9 @@
* from a previous session. */
sm_client = client_session_new (argc, argv, NULL,
-SESSION_RESTART_IMMEDIATELY, 40);
+debug_mode ? SESSION_RESTART_IF_RUNNING
+ : SESSION_RESTART_IMMEDIATELY,
+40);
sm_client-die = sm_client_die;
if (sm_client_id)
client_session_set_client_id (sm_client, sm_client_id);
@@ -300,7 +303,7 @@
}
}
-xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id);
+xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id,
opt_debug);
/* create the sub daemons */
pointer_helper = g_object_new (XFCE_TYPE_POINTERS_HELPER, NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28722 - xfce4-settings/trunk/xfce4-settings-helper
Author: kelnos
Date: 2008-11-11 05:14:42 + (Tue, 11 Nov 2008)
New Revision: 28722
Modified:
xfce4-settings/trunk/xfce4-settings-helper/workspaces.c
Log:
fix workspace names setting... seems wnck_workspace_change_name() is
broken if you call it several times in succession for different
workspaces
Modified: xfce4-settings/trunk/xfce4-settings-helper/workspaces.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/workspaces.c 2008-11-11
05:14:24 UTC (rev 28721)
+++ xfce4-settings/trunk/xfce4-settings-helper/workspaces.c 2008-11-11
05:14:42 UTC (rev 28722)
@@ -51,6 +51,9 @@
static void xfce_workspaces_helper_init(XfceWorkspacesHelper *helper);
static void xfce_workspaces_helper_finalize(GObject *obj);
+static void xfce_workspaces_helper_set_names_prop(XfceWorkspacesHelper *helper,
+ GdkScreen *screen,
+ gchar **names);
static void xfce_workspaces_helper_update_all_names(XfceWorkspacesHelper
*helper);
static void xfce_workspaces_helper_prop_changed(XfconfChannel *channel,
const gchar *property,
@@ -72,14 +75,11 @@
static void
xfce_workspaces_helper_init(XfceWorkspacesHelper *helper)
{
-WnckWorkspace *space;
gint i, n_workspaces;
gchar **names;
+GdkDisplay *display;
+GdkScreen *screen;
-helper-channel = xfconf_channel_new(WORKSPACES_CHANNEL);
-names = xfconf_channel_get_string_list(helper-channel,
- WORKSPACE_NAMES_PROP);
-
/* FIXME: need to do this for all screens? */
helper-screen = wnck_screen_get_default();
wnck_screen_force_update(helper-screen);
@@ -90,27 +90,26 @@
G_CALLBACK(xfce_workspaces_helper_update_all_names),
helper);
+helper-channel = xfconf_channel_new(WORKSPACES_CHANNEL);
+names = xfconf_channel_get_string_list(helper-channel,
+ WORKSPACE_NAMES_PROP);
+
n_workspaces = wnck_screen_get_workspace_count(helper-screen);
-i = 0;
-if(names) {
-for(; i n_workspaces names[i]; ++i) {
-space = wnck_screen_get_workspace(helper-screen, i);
-wnck_workspace_change_name(space, names[i]);
-}
-}
-if(i != n_workspaces) {
+if(G_UNLIKELY(!names))
+names = g_new0(gchar *, n_workspaces + 1);
+else if(g_strv_length(names) n_workspaces)
+names = g_renew(gchar *, names, n_workspaces + 1);
+
+for(i = g_strv_length(names); i n_workspaces; ++i) {
/* some of them may not have been set in xfconf */
-names = g_realloc(names, sizeof(gchar *) * (n_workspaces + 1));
-for(; i n_workspaces; ++i) {
-names[i] = g_strdup_printf(_(Workspace %d), i + 1);
-space = wnck_screen_get_workspace(helper-screen, i);
-wnck_workspace_change_name(space, names[i]);
-}
-names[i] = NULL;
-xfconf_channel_set_string_list(helper-channel, WORKSPACE_NAMES_PROP,
- (const gchar **)names);
+names[i] = g_strdup_printf(_(Workspace %d), i + 1);
}
+names[i] = NULL;
+display = gdk_display_get_default();
+screen = gdk_display_get_screen(display,
wnck_screen_get_number(helper-screen));
+xfce_workspaces_helper_set_names_prop(helper, screen, names);
+
g_signal_connect(G_OBJECT(helper-channel),
property-changed:: WORKSPACE_NAMES_PROP,
G_CALLBACK(xfce_workspaces_helper_prop_changed), helper);
@@ -138,18 +137,44 @@
static void
+xfce_workspaces_helper_set_names_prop(XfceWorkspacesHelper *helper,
+ GdkScreen *screen,
+ gchar **names)
+{
+GString *names_str;
+gint i;
+
+names_str = g_string_new(NULL);
+
+for(i = 0; names[i]; ++i)
+g_string_append_len(names_str, names[i], strlen(names[i]) + 1);
+
+gdk_error_trap_push();
+
+gdk_property_change(gdk_screen_get_root_window(screen),
+gdk_atom_intern_static_string(_NET_DESKTOP_NAMES),
+gdk_atom_intern_static_string(UTF8_STRING),
+8, GDK_PROP_MODE_REPLACE,
+(guchar *)names_str-str, names_str-len + 1);
+gdk_flush();
+
+gdk_error_trap_pop();
+
+g_string_free(names_str, TRUE);
+}
+
+static void
xfce_workspaces_helper_update_all_names(XfceWorkspacesHelper *helper)
{
gint i, n_workspaces = wnck_screen_get_workspace_count(helper-screen);
gchar const **names;
-names = g_malloc(sizeof(gchar *) * (n_workspaces + 1));
+names = g_new0(gchar *, n_workspaces + 1);
for(i = 0; i n_workspaces; ++i) {
WnckWorkspace *space = wnck_screen_get_workspace(helper-screen, i);
[Xfce4-commits] r28723 - xfce4-settings/trunk/xfce4-settings-helper
Author: kelnos
Date: 2008-11-11 05:17:12 + (Tue, 11 Nov 2008)
New Revision: 28723
Modified:
xfce4-settings/trunk/xfce4-settings-helper/workspaces.c
Log:
oops, fix warning
Modified: xfce4-settings/trunk/xfce4-settings-helper/workspaces.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/workspaces.c 2008-11-11
05:14:42 UTC (rev 28722)
+++ xfce4-settings/trunk/xfce4-settings-helper/workspaces.c 2008-11-11
05:17:12 UTC (rev 28723)
@@ -169,7 +169,7 @@
gint i, n_workspaces = wnck_screen_get_workspace_count(helper-screen);
gchar const **names;
-names = g_new0(gchar *, n_workspaces + 1);
+names = g_new0(gchar const *, n_workspaces + 1);
for(i = 0; i n_workspaces; ++i) {
WnckWorkspace *space = wnck_screen_get_workspace(helper-screen, i);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28676 - in xfconf/trunk: . xfconfd
Author: kelnos
Date: 2008-11-08 21:52:11 + (Sat, 08 Nov 2008)
New Revision: 28676
Modified:
xfconf/trunk/NEWS
xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
Log:
only consider the file under $XDG_CONFIG_HOME as the user dir. all
others in $XDG_CONFIG_DIRS should be considered system dirs (bug 4592).
Modified: xfconf/trunk/NEWS
===
--- xfconf/trunk/NEWS 2008-11-08 20:50:50 UTC (rev 28675)
+++ xfconf/trunk/NEWS 2008-11-08 21:52:11 UTC (rev 28676)
@@ -13,6 +13,10 @@
* Add libxfconf perl bindings.
* Remove xfconf_channel_remove_property() and
xfconf_channel_remove_properties().
+ * Only treat the XML file under $XDG_CONFIG_HOME as a user file,
+and treat all others as system files. This fixes the problem where
+Xfce-installed defaults get read *after* the user's config when
+Xfce is installed to a user-writable prefix (bug 4592).
Xfce 4.6beta1 (Xfce 4.5.91)
Modified: xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
===
--- xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c2008-11-08
20:50:50 UTC (rev 28675)
+++ xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c2008-11-08
21:52:11 UTC (rev 28676)
@@ -1645,8 +1645,7 @@
GError **error)
{
XfconfChannel *channel = NULL;
-gchar *filename_stem = NULL, **filenames = NULL;
-GSList *system_files = NULL, *user_files = NULL, *l;
+gchar *filename_stem, **filenames, *user_file;
gint i;
XfconfProperty *prop;
@@ -1654,19 +1653,11 @@
filename_stem = g_strdup_printf(CONFIG_FILE_FMT, channel_name);
filenames = xfce_resource_lookup_all(XFCE_RESOURCE_CONFIG, filename_stem);
+user_file = xfce_resource_save_location(XFCE_RESOURCE_CONFIG,
+filename_stem, FALSE);
g_free(filename_stem);
-for(i = 0; filenames[i]; ++i) {
-if(!access(filenames[i], W_OK)) /* we can write, it's ours */
-user_files = g_slist_append(user_files, filenames[i]);
-else if(!access(filenames[i], R_OK)) /* we can read, it's system */
-system_files = g_slist_append(system_files, filenames[i]);
-else /* we can't even read, so skip it */
-g_free(filenames[i]);
-}
-g_free(filenames);
-
-if(!system_files !user_files) {
+if((!filenames || !filenames[0]) !user_file) {
if(error) {
g_set_error(error, XFCONF_ERROR,
XFCONF_ERROR_CHANNEL_NOT_FOUND,
@@ -1680,26 +1671,26 @@
prop-name = g_strdup(/);
channel-properties = g_node_new(prop);
-for(l = system_files; l !channel-locked; l = l-next) {
-xfconf_backend_perchannel_xml_merge_file(xbpx, l-data, TRUE,
+/* read in system files */
+for(i = 0; filenames[i]; ++i) {
+if(user_file !strcmp(filenames[i], user_file))
+continue;
+xfconf_backend_perchannel_xml_merge_file(xbpx, filenames[i], TRUE,
channel, NULL);
}
-if(!channel-locked) {
-for(l = user_files; l; l = l-next) {
-xfconf_backend_perchannel_xml_merge_file(xbpx, l-data, FALSE,
- channel, NULL);
-}
+
+if(!channel-locked user_file) {
+/* read in user file */
+xfconf_backend_perchannel_xml_merge_file(xbpx, user_file, FALSE,
+ channel, NULL);
}
g_tree_insert(xbpx-channels, g_ascii_strdown(channel_name, -1), channel);
out:
+g_strfreev(filenames);
+g_free(user_file);
-g_slist_foreach(user_files, (GFunc)g_free, NULL);
-g_slist_free(user_files);
-g_slist_foreach(system_files, (GFunc)g_free, NULL);
-g_slist_free(system_files);
-
return channel;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28677 - in xfconf/trunk: . xfconf-query
Author: kelnos Date: 2008-11-08 23:05:25 + (Sat, 08 Nov 2008) New Revision: 28677 Modified: xfconf/trunk/NEWS xfconf/trunk/xfconf-query/Makefile.am Log: fix link order for cygwin (bug 4559) Modified: xfconf/trunk/NEWS === --- xfconf/trunk/NEWS 2008-11-08 21:52:11 UTC (rev 28676) +++ xfconf/trunk/NEWS 2008-11-08 23:05:25 UTC (rev 28677) @@ -17,6 +17,8 @@ and treat all others as system files. This fixes the problem where Xfce-installed defaults get read *after* the user's config when Xfce is installed to a user-writable prefix (bug 4592). + * Fix build on Cygwin and other platforms that actually care about +library link order (bug 4559). Xfce 4.6beta1 (Xfce 4.5.91) Modified: xfconf/trunk/xfconf-query/Makefile.am === --- xfconf/trunk/xfconf-query/Makefile.am 2008-11-08 21:52:11 UTC (rev 28676) +++ xfconf/trunk/xfconf-query/Makefile.am 2008-11-08 23:05:25 UTC (rev 28677) @@ -13,8 +13,8 @@ -DLOCALEDIR=\$(localedir)\ xfconf_query_LDADD = \ + $(top_builddir)/common/libxfconf-gvaluefuncs.la \ $(top_builddir)/xfconf/libxfconf-0.la \ - $(top_builddir)/common/libxfconf-gvaluefuncs.la \ $(GLIB_LIBS) \ $(DBUS_GLIB_LIBS) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28643 - in xfce-utils/trunk: . scripts
Author: kelnos
Date: 2008-11-07 11:14:41 + (Fri, 07 Nov 2008)
New Revision: 28643
Modified:
xfce-utils/trunk/NEWS
xfce-utils/trunk/scripts/xfconf-migration-4.6.pl.in
Log:
migrate xfwm4 kbd shortcuts to new xfconf format
Modified: xfce-utils/trunk/NEWS
===
--- xfce-utils/trunk/NEWS 2008-11-07 09:53:02 UTC (rev 28642)
+++ xfce-utils/trunk/NEWS 2008-11-07 11:14:41 UTC (rev 28643)
@@ -4,6 +4,7 @@
- Migrate xfce4-session splash settings to xfconf.
- Be sure $XDG_CONFIG_HOME/autostart exists when creating .desktop
file to disable xfconf migration script.
+- Migrate xfwm4 keyboard shortcuts to new xfconf format.
4.5.91 (Xfce 4.6beta1)
Modified: xfce-utils/trunk/scripts/xfconf-migration-4.6.pl.in
===
--- xfce-utils/trunk/scripts/xfconf-migration-4.6.pl.in 2008-11-07 09:53:02 UTC
(rev 28642)
+++ xfce-utils/trunk/scripts/xfconf-migration-4.6.pl.in 2008-11-07 11:14:41 UTC
(rev 28643)
@@ -45,8 +45,8 @@
sub xfconf_set_keybind
{
-my ($chan,$keystr,$command) = @_;
-my $prop = '/commands/custom/'.$keystr;
+my ($chan,$type,$keystr,$command) = @_;
+my $prop = /$type/custom/$keystr;
$command =~ s/'/'\\''/g;
my $cmd = qq(xfconf-query -n -c $chan -p '$prop' -t string -s '$command');
if($debug) {
@@ -438,21 +438,6 @@
return $mcs.'.xml';
}
-sub migrate_xfwm4_keythemename
-{
-my $mcs = 'xfwm4_keys';
-
-my $ref = parse_mcs_xml_file($mcs);
-return undef if(!defined($ref));
-
-my $chan = 'xfwm4';
-
-save_xfconf_prop($ref, $chan, 'Xfwm/KeyThemeName',
- '/general/keytheme', 'string');
-
-return $mcs.'.xml';
-}
-
sub migrate_wmtweaks
{
my $mcs = 'wmtweaks';
@@ -572,6 +557,23 @@
return $mcs.'.xml';
}
+sub convert_key
+{
+my $keys = shift;
+my $str = '';
+
+$str .= 'Shift' if($keys =~ /Shift\+/);
+$str .= 'Control' if($keys =~ /Control\+/);
+$str .= 'Meta' if($keys =~ /Alt\+/);
+$str .= 'Super' if($keys =~ /Mod4\+/ || $keys =~ /Super\+/);
+if($keys =~ /(^|\+)([A-Za-z0-9_]+)$/) {
+$str .= $2;
+return $str;
+}
+
+return undef;
+}
+
sub migrate_keyboard_shortcuts
{
my $mcs = 'shortcuts';
@@ -602,14 +604,9 @@
my $command = $sc{'command'};
next if(!defined($keys) || !defined($command));
-my $str = '';
-$str .= 'Shift' if($keys =~ /Shift\+/);
-$str .= 'Control' if($keys =~ /Control\+/);
-$str .= 'Meta' if($keys =~ /Alt\+/);
-$str .= 'Super' if($keys =~ /Mod4\+/ || $keys =~ /Super\+/);
-if($keys =~ /(^|\+)([A-Za-z0-9_]+)$/) {
-$str .= $2;
-xfconf_set_keybind($chan, $str, $command);
+my $str = convert_key($keys);
+if(defined($str)) {
+xfconf_set_keybind($chan, 'commands', $str, $command);
$keybind_set = 1;
}
}
@@ -622,6 +619,49 @@
return $mcs.'.xml';
}
+sub migrate_xfwm4_shortcuts
+{
+my $mcs = 'xfwm4_keys';
+my $chan = 'xfce4-keyboard-shortcuts';
+
+my $ref = parse_mcs_xml_file($mcs);
+return undef if(!defined($ref));
+
+return undef if(!defined(${$ref}{'Xfwm/KeyThemeName'}));
+my $keytheme = ${$ref}{'Xfwm/KeyThemeName'}-{'value'};
+
+my $datadirs = defined($ENV{'XDG_DATA_DIRS'}) ? $ENV{'XDG_DATA_DIRS'} :
'/usr/local/share:/usr/share';
+my @themefiles = ( $ENV{'HOME'}./.themes/$keytheme/xfwm4/keythemerc,
+ map { $_./themes/$keytheme/xfwm4/keythemerc }
split(/:/, $datadirs) );
+
+my $keybind_set = 0;
+foreach my $tf (@themefiles) {
+next if(! -f $tf);
+
+open(TF, ''.$tf) and do {
+while(TF) {
+my ($name,$key) = split(/\s*=\s*/, $_, 2);
+next if(!defined($name));
+
+my $newkey = convert_key($key);
+if(defined($newkey)) {
+xfconf_set_keybind($chan, 'xfwm4', $newkey, $name);
+$keybind_set = 1;
+}
+}
+close(TF);
+
+last if($keybind_set);
+};
+}
+
+if($keybind_set) {
+xfconf_set($chan, '/xfwm4/custom/override', 'bool', 'true');
+}
+
+return $mcs.'.xml';
+}
+
sub migrate_xfce4_session
{
my $file = $ENV{'XDG_CONFIG_HOME'}.'/xfce4-session/xfce4-session.rc';
@@ -735,7 +775,7 @@
push(@migrated, $tmp) if(defined(($tmp = migrate_keyboard)));
push(@migrated, $tmp) if(defined(($tmp = migrate_mouse)));
push(@migrated, $tmp) if(defined(($tmp = migrate_xfwm4)));
-push(@migrated, $tmp) if(defined(($tmp = migrate_xfwm4_keythemename)));
+push(@migrated, $tmp) if(defined(($tmp = migrate_xfwm4_shortcuts)));
push(@migrated, $tmp) if(defined(($tmp = migrate_wmtweaks)));
push(@migrated, $tmp) if(defined(($tmp = migrate_workspaces)));
push(@migrated, $tmp) if(defined(($tmp = migrate_xfprint)));
[Xfce4-commits] r28624 - in xfce4-session/trunk: . xfce4-session
Author: kelnos
Date: 2008-11-06 09:40:32 + (Thu, 06 Nov 2008)
New Revision: 28624
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/xfce4-session/xfsm-manager.c
Log:
* xfce4-session/xfsm-manager.c: Only one dbus ShutdownCancelled
signal is enough, really. And I guess it wouldn't get sent
at all if = 1 client was interacting.
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2008-11-06 07:44:54 UTC (rev 28623)
+++ xfce4-session/trunk/ChangeLog 2008-11-06 09:40:32 UTC (rev 28624)
@@ -1,3 +1,9 @@
+2008-11-06 Brian Tarricone [EMAIL PROTECTED]
+
+ * xfce4-session/xfsm-manager.c: Only one dbus ShutdownCancelled
+ signal is enough, really. And I guess it wouldn't get sent
+ at all if = 1 client was interacting.
+
2008-11-05 Brian Tarricone [EMAIL PROTECTED]
* xfce4-session/shutdown.c,doc/README.Kiosk: Add 'SaveShutdown'
Modified: xfce4-session/trunk/xfce4-session/xfsm-manager.c
===
--- xfce4-session/trunk/xfce4-session/xfsm-manager.c2008-11-06 07:44:54 UTC
(rev 28623)
+++ xfce4-session/trunk/xfce4-session/xfsm-manager.c2008-11-06 09:40:32 UTC
(rev 28624)
@@ -1037,8 +1037,9 @@
/* reset all clients that are waiting for interact */
xfsm_client_set_state (client, XFSM_CLIENT_SAVING);
SmsShutdownCancelled (xfsm_client_get_sms_connection (client));
- g_signal_emit (manager, signals[SIG_SHUTDOWN_CANCELLED], 0);
}
+
+g_signal_emit (manager, signals[SIG_SHUTDOWN_CANCELLED], 0);
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28625 - in xfce4-session/trunk: . xfce4-session
Author: kelnos
Date: 2008-11-06 09:40:43 + (Thu, 06 Nov 2008)
New Revision: 28625
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/xfce4-session/xfsm-manager.c
Log:
* xfce4-session/xfsm-manager.c: Fix a problem: client
requests interaction - client is granted interaction -
but now SM kills all other apps. If the client then requests
that the shutdown is canceled, the SM doesn't listen, and
even if it did, nothing else would be running (including the
WM). Problem was in xfsm_manager_check_clients_saving(): it
didn't consider a client waiting for interaction or interaction
to be saving (bug 4284).
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2008-11-06 09:40:32 UTC (rev 28624)
+++ xfce4-session/trunk/ChangeLog 2008-11-06 09:40:43 UTC (rev 28625)
@@ -1,5 +1,16 @@
2008-11-06 Brian Tarricone [EMAIL PROTECTED]
+ * xfce4-session/xfsm-manager.c: Fix a problem: client
+ requests interaction - client is granted interaction -
+ but now SM kills all other apps. If the client then requests
+ that the shutdown is canceled, the SM doesn't listen, and
+ even if it did, nothing else would be running (including the
+ WM). Problem was in xfsm_manager_check_clients_saving(): it
+ didn't consider a client waiting for interaction or interaction
+ to be saving (bug 4284).
+
+2008-11-06 Brian Tarricone [EMAIL PROTECTED]
+
* xfce4-session/xfsm-manager.c: Only one dbus ShutdownCancelled
signal is enough, really. And I guess it wouldn't get sent
at all if = 1 client was interacting.
Modified: xfce4-session/trunk/NEWS
===
--- xfce4-session/trunk/NEWS2008-11-06 09:40:32 UTC (rev 28624)
+++ xfce4-session/trunk/NEWS2008-11-06 09:40:43 UTC (rev 28625)
@@ -15,6 +15,10 @@
- When restoring clients on startup, be sure to set their current
working directory if the cwd was set as a part of their saved state.
- Add SaveSession kiosk capability (bug 2998).
+- When a client requests interaction, don't continue to kill all other
+ clients while it's still interacting. And then don't ignore it when
+ it wants to cancel shutdown. Also fixes a similar problem when
+ interaction is requested during a phase 2 save-yourself (bug 4284).
4.5.91
==
Modified: xfce4-session/trunk/xfce4-session/xfsm-manager.c
===
--- xfce4-session/trunk/xfce4-session/xfsm-manager.c2008-11-06 09:40:32 UTC
(rev 28624)
+++ xfce4-session/trunk/xfce4-session/xfsm-manager.c2008-11-06 09:40:43 UTC
(rev 28625)
@@ -1467,8 +1467,16 @@
lp = lp-next)
{
XfsmClient *client = lp-data;
- if (xfsm_client_get_state (client) == XFSM_CLIENT_SAVING)
-return TRUE;
+ XfsmClientState state = xfsm_client_get_state (client);
+ switch (state)
+{
+ case XFSM_CLIENT_SAVING:
+ case XFSM_CLIENT_WAITFORINTERACT:
+ case XFSM_CLIENT_INTERACTING:
+return TRUE;
+ default:
+break;
+}
}
return FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28627 - in xfconf/trunk: . docs/reference docs/reference/tmpl xfconf
Author: kelnos
Date: 2008-11-06 10:22:28 + (Thu, 06 Nov 2008)
New Revision: 28627
Modified:
xfconf/trunk/NEWS
xfconf/trunk/docs/reference/tmpl/xfconf-channel.sgml
xfconf/trunk/docs/reference/tmpl/xfconf-unused.sgml
xfconf/trunk/docs/reference/xfconf-sections.txt
xfconf/trunk/xfconf/xfconf-channel.c
xfconf/trunk/xfconf/xfconf-channel.h
xfconf/trunk/xfconf/xfconf.symbols
Log:
remove xfconf_channel_remove_property() and _properties(). might as
well get rid of them since i already bumped the lib version
Modified: xfconf/trunk/NEWS
===
--- xfconf/trunk/NEWS 2008-11-06 09:57:55 UTC (rev 28626)
+++ xfconf/trunk/NEWS 2008-11-06 10:22:28 UTC (rev 28627)
@@ -9,7 +9,10 @@
* Change libxfconf GObject bindings API slightly to use gulong IDs
for each binding to be used when removing bindings. Extend the
unbind functions a bit.
+ * Bump libxfconf interface version due to incompatible change.
* Add libxfconf perl bindings.
+ * Remove xfconf_channel_remove_property() and
+xfconf_channel_remove_properties().
Xfce 4.6beta1 (Xfce 4.5.91)
Modified: xfconf/trunk/docs/reference/tmpl/xfconf-channel.sgml
===
--- xfconf/trunk/docs/reference/tmpl/xfconf-channel.sgml2008-11-06
09:57:55 UTC (rev 28626)
+++ xfconf/trunk/docs/reference/tmpl/xfconf-channel.sgml2008-11-06
10:22:28 UTC (rev 28627)
@@ -103,24 +103,6 @@
@recursive:
-!-- # FUNCTION xfconf_channel_remove_property # --
-para
-
-/para
-
[EMAIL PROTECTED]:
[EMAIL PROTECTED]:
-
-
-!-- # FUNCTION xfconf_channel_remove_properties # --
-para
-
-/para
-
[EMAIL PROTECTED]:
[EMAIL PROTECTED]:
-
-
!-- # FUNCTION xfconf_channel_get_properties # --
para
Modified: xfconf/trunk/docs/reference/tmpl/xfconf-unused.sgml
===
--- xfconf/trunk/docs/reference/tmpl/xfconf-unused.sgml 2008-11-06 09:57:55 UTC
(rev 28626)
+++ xfconf/trunk/docs/reference/tmpl/xfconf-unused.sgml 2008-11-06 10:22:28 UTC
(rev 28627)
@@ -129,6 +129,22 @@
@default_value:
@Returns:
+!-- # FUNCTION xfconf_channel_remove_properties # --
+para
+
+/para
+
[EMAIL PROTECTED]:
[EMAIL PROTECTED]:
+
+!-- # FUNCTION xfconf_channel_remove_property # --
+para
+
+/para
+
[EMAIL PROTECTED]:
[EMAIL PROTECTED]:
+
!-- # FUNCTION xfconf_channel_set_int64 # --
para
Modified: xfconf/trunk/docs/reference/xfconf-sections.txt
===
--- xfconf/trunk/docs/reference/xfconf-sections.txt 2008-11-06 09:57:55 UTC
(rev 28626)
+++ xfconf/trunk/docs/reference/xfconf-sections.txt 2008-11-06 10:22:28 UTC
(rev 28627)
@@ -7,8 +7,6 @@
xfconf_channel_has_property
xfconf_channel_is_property_locked
xfconf_channel_reset_property
-xfconf_channel_remove_property
-xfconf_channel_remove_properties
xfconf_channel_get_properties
xfconf_channel_get_string
xfconf_channel_get_string_list
Modified: xfconf/trunk/xfconf/xfconf-channel.c
===
--- xfconf/trunk/xfconf/xfconf-channel.c2008-11-06 09:57:55 UTC (rev
28626)
+++ xfconf/trunk/xfconf/xfconf-channel.c2008-11-06 10:22:28 UTC (rev
28627)
@@ -702,40 +702,6 @@
}
/**
- * xfconf_channel_remove_property:
- * @channel: An #XfconfChannel.
- * @property: A property name.
- *
- * Removes @property from @channel in the configuration store.
- *
- * Deprecated:4.5.91: Use xfconf_channel_reset_property() instead.
- **/
-void
-xfconf_channel_remove_property(XfconfChannel *channel,
- const gchar *property)
-{
-xfconf_channel_reset_property(channel, property, FALSE);
-}
-
-/**
- * xfconf_channel_remove_properties:
- * @channel: An #XfconfChannel.
- * @property_base: The base property name of properties to remove.
- *
- * Removes @property_base from @channel, and removes all
- * sub-properties of @property_base as well. To remove the
- * entire channel, specify / or %NULL for @property_base.
- *
- * Deprecated:4.5.91: Use xfconf_channel_reset_property() instead.
- **/
-void
-xfconf_channel_remove_properties(XfconfChannel *channel,
- const gchar *property_base)
-{
-xfconf_channel_reset_property(channel, property_base, TRUE);
-}
-
-/**
* xfconf_channel_get_properties:
* @channel: An #XfconfChannel.
* @property_base: The base property name of properties to retrieve.
Modified: xfconf/trunk/xfconf/xfconf-channel.h
===
--- xfconf/trunk/xfconf/xfconf-channel.h2008-11-06 09:57:55 UTC (rev
28626)
+++ xfconf/trunk/xfconf/xfconf-channel.h2008-11-06 10:22:28 UTC (rev
28627)
@@ -56,13 +56,6 @@
const gchar *property_base,
[Xfce4-commits] r28632 - in libexo/trunk: . exo-helper
Author: kelnos
Date: 2008-11-06 11:25:05 + (Thu, 06 Nov 2008)
New Revision: 28632
Modified:
libexo/trunk/ChangeLog
libexo/trunk/exo-helper/main.c
Log:
* exo-helper/main.c: Fix compile against glib 2.14.
Modified: libexo/trunk/ChangeLog
===
--- libexo/trunk/ChangeLog 2008-11-06 11:24:23 UTC (rev 28631)
+++ libexo/trunk/ChangeLog 2008-11-06 11:25:05 UTC (rev 28632)
@@ -1,3 +1,7 @@
+2008-11-06 Brian Tarricone [EMAIL PROTECTED]
+
+ * exo-helper/main.c: Fix compile against glib 2.14.
+
2008-11-03 Jannis Pohlmann [EMAIL PROTECTED]
* exo/exo-url.c: Split up assignment and conditional into separate
Modified: libexo/trunk/exo-helper/main.c
===
--- libexo/trunk/exo-helper/main.c 2008-11-06 11:24:23 UTC (rev 28631)
+++ libexo/trunk/exo-helper/main.c 2008-11-06 11:25:05 UTC (rev 28632)
@@ -200,7 +200,11 @@
else
{
result = EXIT_FAILURE;
- g_printerr (g_option_context_get_help (opt_ctx, FALSE, NULL));
+#if GLIB_CHECK_VERSION(2, 14, 0)
+ g_printerr (%s, g_option_context_get_help (opt_ctx, FALSE, NULL));
+#else
+ g_printerr (_(Unknown helper arguments.\n));
+#endif
}
g_option_context_free (opt_ctx);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28630 - in thunar/trunk: . thunar
Author: kelnos
Date: 2008-11-06 11:20:12 + (Thu, 06 Nov 2008)
New Revision: 28630
Modified:
thunar/trunk/ChangeLog
thunar/trunk/thunar/thunar-private.h
thunar/trunk/thunar/thunar-shortcuts-model.c
thunar/trunk/thunar/thunar-templates-action.c
thunar/trunk/thunar/thunar-window.c
Log:
* thunar/thunar-private.h,
thunar/thunar-{shortcuts-model,templates-action,window}.c: Fix
compilation with glib 2.14.
Modified: thunar/trunk/ChangeLog
===
--- thunar/trunk/ChangeLog 2008-11-06 10:58:25 UTC (rev 28629)
+++ thunar/trunk/ChangeLog 2008-11-06 11:20:12 UTC (rev 28630)
@@ -1,3 +1,9 @@
+2008-11-06 Brian Tarricone [EMAIL PROTECTED]
+
+ * thunar/thunar-private.h,
+ thunar/thunar-{shortcuts-model,templates-action,window}.c: Fix
+ compilation with glib 2.14.
+
2008-11-05 Olivier Fourdan [EMAIL PROTECTED]
* thunar/thunar-window.c: Remove portion including a C_() macro.
Modified: thunar/trunk/thunar/thunar-private.h
===
--- thunar/trunk/thunar/thunar-private.h2008-11-06 10:58:25 UTC (rev
28629)
+++ thunar/trunk/thunar/thunar-private.h2008-11-06 11:20:12 UTC (rev
28630)
@@ -107,7 +107,9 @@
#define THUNAR_USER_DIRECTORY_VIDEOS G_USER_DIRECTORY_VIDEOS
#define THUNAR_USER_N_DIRECTORIES (8)
+#if GLIB_CHECK_VERSION(2, 14, 0)
gchar *_thunar_get_xdg_user_dirs_locale (void);
+#endif
extern const gchar *_thunar_user_directory_names[THUNAR_USER_N_DIRECTORIES+1];
#else /* GLIB_CHECK_VERSION(2,14,0) */
Modified: thunar/trunk/thunar/thunar-shortcuts-model.c
===
--- thunar/trunk/thunar/thunar-shortcuts-model.c2008-11-06 10:58:25 UTC
(rev 28629)
+++ thunar/trunk/thunar/thunar-shortcuts-model.c2008-11-06 11:20:12 UTC
(rev 28630)
@@ -309,6 +309,7 @@
/* append the system defined items ('Home', 'Trash', 'File System') */
for (n = 0; n G_N_ELEMENTS (system_path_list); ++n)
{
+#if GLIB_CHECK_VERSION(2, 14, 0)
/* we exclude the desktop if it points to home */
if (n == desktop_index
exo_str_is_equal (g_get_user_special_dir
(G_USER_DIRECTORY_DESKTOP),
@@ -317,6 +318,7 @@
thunar_vfs_path_unref (system_path_list[n]);
continue;
}
+#endif
/* determine the file for the path */
file = thunar_file_get_for_path (system_path_list[n], NULL);
@@ -800,6 +802,7 @@
}
}
+#if GLIB_CHECK_VERSION(2, 14, 0)
/* Reads the current xdg user dirs locale from ~/.config/xdg-user-dirs.locale
* Notice that the result shall be freed by using g_free (). */
gchar *
@@ -828,6 +831,7 @@
return locale;
}
+#endif
static void
thunar_shortcuts_model_load (ThunarShortcutsModel *model)
Modified: thunar/trunk/thunar/thunar-templates-action.c
===
--- thunar/trunk/thunar/thunar-templates-action.c 2008-11-06 10:58:25 UTC
(rev 28629)
+++ thunar/trunk/thunar/thunar-templates-action.c 2008-11-06 11:20:12 UTC
(rev 28630)
@@ -382,11 +382,13 @@
thunar_vfs_path_unref (home_path);
+#if GLIB_CHECK_VERSION(2, 14, 0)
if (!exo_str_is_equal (g_get_user_special_dir (G_USER_DIRECTORY_TEMPLATES),
xfce_get_homedir ()))
{
/* fill the menu with files/folders from the ~/Templates folder */
thunar_templates_action_fill_menu (templates_action, templates_path,
menu);
}
+#endif
/* check if any items were added to the menu */
if (G_UNLIKELY (GTK_MENU_SHELL (menu)-children == NULL))
Modified: thunar/trunk/thunar/thunar-window.c
===
--- thunar/trunk/thunar/thunar-window.c 2008-11-06 10:58:25 UTC (rev 28629)
+++ thunar/trunk/thunar/thunar-window.c 2008-11-06 11:20:12 UTC (rev 28630)
@@ -608,11 +608,19 @@
thunar_window_setup_user_dir_menu_entries (ThunarWindow *window)
{
gint i;
+ static const gchar *callback_names[] = {
+open-desktop, open-documents, open-downloads, open-music,
+open-pictures, open-public, open-templates, open-videos
+ };
#if !GLIB_CHECK_VERSION(2, 14, 0)
- for (i = 0; i THUNAR_USER_N_DIRECTORIES; i++)
-gtk_action_set_visible (GTK_ACTION (action), FALSE);
+ for (i = 0; i G_N_ELEMENTS(callback_names); i++)
+{
+ GtkAction *action = gtk_action_group_get_action (window-action_group,
+ callback_names[i]);
+ gtk_action_set_visible (GTK_ACTION (action), FALSE);
+}
#else /* GLIB_CHECK_VERSION(2, 14, 0) */
@@ -621,10 +629,6 @@
gchar *translation= NULL;
/* gchar *dir_name = NULL; */ // see below
const gchar *home_dir = NULL;
- static const gchar *callback_names[] = {
-open-desktop, open-documents, open-downloads, open-music,
-open
[Xfce4-commits] r28636 - xfce4-settings/trunk/xfce4-settings-helper
Author: kelnos
Date: 2008-11-06 23:49:52 + (Thu, 06 Nov 2008)
New Revision: 28636
Modified:
xfce4-settings/trunk/xfce4-settings-helper/main.c
Log:
use XfcePosixSignalHandler instead of calling gtk_main_quit() from a
signal handler; that may not be safe...
Modified: xfce4-settings/trunk/xfce4-settings-helper/main.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-11-06 17:53:23 UTC
(rev 28635)
+++ xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-11-06 23:49:52 UTC
(rev 28636)
@@ -64,7 +64,8 @@
static void
-signal_handler (gint signum)
+signal_handler (gint signum,
+gpointer user_data)
{
/* quit the main loop */
gtk_main_quit ();
@@ -165,8 +166,11 @@
workspaces_helper = g_object_new (XFCE_TYPE_WORKSPACES_HELPER, NULL);
/* setup signal handlers to properly quit the main loop */
-for (i = 0; i G_N_ELEMENTS (signums); i++)
-signal (signums[i], signal_handler);
+if (xfce_posix_signal_handler_init (NULL))
+{
+for (i = 0; i G_N_ELEMENTS (signums); i++)
+xfce_posix_signal_handler_set_handler (signums[i], signal_handler,
NULL, NULL);
+}
/* enter the main loop */
gtk_main();
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r28637 - in xfce4-settings/trunk: . xfce4-settings-helper
Author: kelnos
Date: 2008-11-07 01:53:25 + (Fri, 07 Nov 2008)
New Revision: 28637
Modified:
xfce4-settings/trunk/NEWS
xfce4-settings/trunk/xfce4-settings-helper/main.c
Log:
implement session management for xfce4-settings helper and use
SmRestartImmediately to ensure it doesn't disappear. also acquire a
manager selection to ensure uniqueness.
Modified: xfce4-settings/trunk/NEWS
===
--- xfce4-settings/trunk/NEWS 2008-11-06 23:49:52 UTC (rev 28636)
+++ xfce4-settings/trunk/NEWS 2008-11-07 01:53:25 UTC (rev 28637)
@@ -2,6 +2,14 @@
* Add an option to disable keyboard settings.
* Default to Rodent icon theme instead of hicolor (Bug #4545)
+ * Use XfcePosixSignalHandler in xfce4-settings-helper to handle
+signals, since calling gtk_main_quit() from a signal handler may
+not be safe.
+ * Make xfce4-settings-helper connect to the session manager and use
+the SmRestartImmediately facility to make sure it keeps running.
+Disable the autostart .desktop file if we were restored from a
+saved session. Attempt to acquire an X selection on startup to
+ensure multiple copies of the helper aren't running (bug 4577).
4.5.91 (Xfce 4.6 beta1)
Modified: xfce4-settings/trunk/xfce4-settings-helper/main.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-11-06 23:49:52 UTC
(rev 28636)
+++ xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-11-07 01:53:25 UTC
(rev 28637)
@@ -39,8 +39,15 @@
#include glib.h
#include gtk/gtk.h
+#ifdef GDK_WINDOWING_X11
+#include gdk/gdkx.h
+#include X11/X.h
+#include X11/Xlib.h
+#endif
+
#include xfconf/xfconf.h
#include libxfce4util/libxfce4util.h
+#include libxfcegui4/libxfcegui4.h
#include accessibility.h
#include displays.h
@@ -54,10 +61,12 @@
static gboolean opt_version = FALSE;
static gboolean opt_debug = FALSE;
+static gchar *opt_sm_client_id = NULL;
static GOptionEntry option_entries[] =
{
-{ version, 'v', 0, G_OPTION_ARG_NONE, opt_version, N_(Version
information), NULL },
+{ version, 'V', 0, G_OPTION_ARG_NONE, opt_version, N_(Version
information), NULL },
{ debug, 'd', 0, G_OPTION_ARG_NONE, opt_debug, N_(Start in debug mode
(don't fork to the background)), NULL },
+{ sm-client-id, 0, 0, G_OPTION_ARG_STRING, opt_sm_client_id, N_(Client
id used when resuming session), NULL },
{ NULL }
};
@@ -72,7 +81,137 @@
}
+static void
+sm_client_die (gpointer client_data)
+{
+signal_handler (SIGTERM, client_data);
+}
+
+static gboolean
+xfce_settings_helper_set_autostart_enabled (gboolean enabled)
+{
+gboolean ret = TRUE;
+XfceRc *rcfile = xfce_rc_config_open (XFCE_RESOURCE_CONFIG,
+ autostart/ AUTOSTART_FILENAME,
+ FALSE);
+
+if (G_UNLIKELY (rcfile == NULL))
+{
+g_warning (Failed to create per-user autostart directory);
+return FALSE;
+}
+
+xfce_rc_set_group (rcfile, Desktop Entry);
+if (xfce_rc_read_bool_entry (rcfile, Hidden, enabled) == enabled)
+{
+xfce_rc_write_bool_entry (rcfile, Hidden, !enabled);
+xfce_rc_flush (rcfile);
+}
+
+if (xfce_rc_is_dirty (rcfile))
+{
+g_warning (Failed to write autostart file);
+ret = FALSE;
+}
+
+xfce_rc_close (rcfile);
+
+return ret;
+}
+
+
+/* returns TRUE if we're now connected to the SM, FALSE otherwise */
+static gboolean
+xfce_settings_helper_connect_session (int argc,
+ char **argv,
+ const gchar *sm_client_id)
+{
+SessionClient *sm_client;
+
+/* we can't be sure that the SM will save the session later, so we only
+ * disable the autostart item if we're launching because we got *resumed*
+ * from a previous session. */
+
+sm_client = client_session_new (argc, argv, NULL,
+SESSION_RESTART_IMMEDIATELY, 40);
+sm_client-die = sm_client_die;
+if (sm_client_id)
+client_session_set_client_id (sm_client, sm_client_id);
+if (!session_init (sm_client))
+{
+g_warning (Failed to connect to session manager);
+client_session_free (sm_client);
+xfce_settings_helper_set_autostart_enabled (TRUE);
+return FALSE;
+}
+
+if (sm_client_id !g_ascii_strcasecmp (sm_client_id,
sm_client-given_client_id))
+{
+/* we passed a client id, and got the same one back, which means
+ * we were definitely restarted as a part of the session. so
+ * it's safe to disable the autostart item. */
+xfce_settings_helper_set_autostart_enabled (FALSE);
+return TRUE;
+}
+
+/* otherwise, let's just ensure the autostart item is enabled. */
+xfce_settings_helper_set_autostart_enabled (TRUE);
+
+return TRUE;
+}
+
+
[Xfce4-commits] r28615 - in xfce4-session/trunk: . xfce4-session
Author: kelnos
Date: 2008-11-06 06:50:29 + (Thu, 06 Nov 2008)
New Revision: 28615
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/xfce4-session/main.c
Log:
* xfce4-session/main.c: Fix minor one-time memleak.
Modified: xfce4-session/trunk/ChangeLog
===
--- xfce4-session/trunk/ChangeLog 2008-11-05 21:36:28 UTC (rev 28614)
+++ xfce4-session/trunk/ChangeLog 2008-11-06 06:50:29 UTC (rev 28615)
@@ -1,5 +1,9 @@
2008-11-01 Brian Tarricone [EMAIL PROTECTED]
+ * xfce4-session/main.c: Fix minor one-time memleak.
+
+2008-11-01 Brian Tarricone [EMAIL PROTECTED]
+
* xfce4-session/xfsm-manager.c: Watch for dbus disconnects and
be sure we aren't terminated.
* xfce4-session/xfsm-{client,manager}.c: Manage the lifecycle of
Modified: xfce4-session/trunk/xfce4-session/main.c
===
--- xfce4-session/trunk/xfce4-session/main.c2008-11-05 21:36:28 UTC (rev
28614)
+++ xfce4-session/trunk/xfce4-session/main.c2008-11-06 06:50:29 UTC (rev
28615)
@@ -137,11 +137,12 @@
XfconfChannel *channel,
gboolean disable_tcp)
{
- const gchar *engine;
+ gchar *engine;
engine = xfconf_channel_get_string (channel, /splash/Engine, mice);
splash_screen = xfsm_splash_screen_new (dpy, engine);
+ g_free (engine);
xfsm_splash_screen_next (splash_screen, _(Loading desktop settings));
gdk_flush ();
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
