[Xfce4-commits] remove support for SmRestartAnyway and SmRestartNever
Updating branch refs/heads/kelnos/new-sm-client to 8a8c77471fd86988d3f1948cb056ecf11b475c65 (commit) from e44458a1e205dbec1f42a0433e139929392c2805 (commit) commit 8a8c77471fd86988d3f1948cb056ecf11b475c65 Author: Brian J. Tarricone Date: Thu Sep 17 00:04:52 2009 -0700 remove support for SmRestartAnyway and SmRestartNever RestartAnyway is better supported through XDG autostart. RestartNever is better not supported at all, but can be done with XDG autostart as well. docs/libxfce4ui-sections.txt |4 - docs/tmpl/libxfce4ui-unused.sgml | 29 -- docs/tmpl/xfce-sm-client.sgml| 52 +-- libxfce4ui/libxfce4ui.symbols|4 - libxfce4ui/xfce-sm-client.c | 200 + libxfce4ui/xfce-sm-client.h | 43 +++-- 6 files changed, 43 insertions(+), 289 deletions(-) diff --git a/docs/libxfce4ui-sections.txt b/docs/libxfce4ui-sections.txt index 27a108c..e5de489 100644 --- a/docs/libxfce4ui-sections.txt +++ b/docs/libxfce4ui-sections.txt @@ -97,14 +97,10 @@ xfce_sm_client_get_priority xfce_sm_client_set_priority xfce_sm_client_get_program xfce_sm_client_set_program -xfce_sm_client_get_resign_command -xfce_sm_client_set_resign_command xfce_sm_client_get_restart_command xfce_sm_client_set_restart_command xfce_sm_client_get_restart_style xfce_sm_client_set_restart_style -xfce_sm_client_get_shutdown_command -xfce_sm_client_set_shutdown_command XFCE_IS_SM_CLIENT XFCE_IS_SM_CLIENT_CLASS diff --git a/docs/tmpl/libxfce4ui-unused.sgml b/docs/tmpl/libxfce4ui-unused.sgml index 878629b..ab23b1c 100644 --- a/docs/tmpl/libxfce4ui-unused.sgml +++ b/docs/tmpl/libxfce4ui-unused.sgml @@ -22,27 +22,6 @@ Common used functions to easily access Pango functions. Xfce Pango Extensions - - - - - -...@xfcesmclient: the object which received the signal. -...@arg1: -...@arg2: - - - - - - - - - - - - - @@ -71,11 +50,3 @@ Xfce Pango Extensions @underline: @Returns: - - - - - -...@sm_client: -...@returns: - diff --git a/docs/tmpl/xfce-sm-client.sgml b/docs/tmpl/xfce-sm-client.sgml index 5c40cd6..313bff2 100644 --- a/docs/tmpl/xfce-sm-client.sgml +++ b/docs/tmpl/xfce-sm-client.sgml @@ -100,11 +100,6 @@ - - - - - @@ -120,11 +115,6 @@ - - - - - @@ -141,10 +131,8 @@ -...@xfce_sm_client_restart_if_running: -...@xfce_sm_client_restart_anyway: +...@xfce_sm_client_restart_normal: @XFCE_SM_CLIENT_RESTART_IMMEDIATELY: -...@xfce_sm_client_restart_never: @@ -199,8 +187,6 @@ @restart_command: @clone_command: @discard_command: -...@resign_command: -...@shutdown_command: @Returns: @@ -348,24 +334,6 @@ @program: - - - - - -...@sm_client: -...@returns: - - - - - - - -...@sm_client: -...@resign_command: - - @@ -402,21 +370,3 @@ @restart_style: - - - - - -...@sm_client: -...@returns: - - - - - - - -...@sm_client: -...@shutdown_command: - - diff --git a/libxfce4ui/libxfce4ui.symbols b/libxfce4ui/libxfce4ui.symbols index a4236b5..4ad0203 100644 --- a/libxfce4ui/libxfce4ui.symbols +++ b/libxfce4ui/libxfce4ui.symbols @@ -113,14 +113,10 @@ xfce_sm_client_set_program xfce_sm_client_get_program xfce_sm_client_set_clone_command xfce_sm_client_get_clone_command -xfce_sm_client_set_resign_command -xfce_sm_client_get_resign_command xfce_sm_client_set_restart_command xfce_sm_client_get_restart_command xfce_sm_client_set_discard_command xfce_sm_client_get_discard_command -xfce_sm_client_set_shutdown_command -xfce_sm_client_get_shutdown_command #endif #endif diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c index fa0aeb3..bccbee4 100644 --- a/libxfce4ui/xfce-sm-client.c +++ b/libxfce4ui/xfce-sm-client.c @@ -1,21 +1,20 @@ -/* xfce4 +/* + * Copyright (c) 2009 Brian Tarricone * Copyright (C) 1999 Olivier Fourdan (four...@xfce.org) - * Copyright (C) 2009 Brian Tarricone - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed i
[Xfce4-commits] add support for setting the app's .desktop file
Updating branch refs/heads/kelnos/new-sm-client to fec139a69b6c2988e7de4cbbdc0ddb2a61d35104 (commit) from 8a8c77471fd86988d3f1948cb056ecf11b475c65 (commit) commit fec139a69b6c2988e7de4cbbdc0ddb2a61d35104 Author: Brian J. Tarricone Date: Thu Sep 17 01:23:07 2009 -0700 add support for setting the app's .desktop file docs/libxfce4ui-sections.txt |1 + docs/tmpl/xfce-sm-client.sgml | 14 libxfce4ui/libxfce4ui.symbols |2 + libxfce4ui/xfce-sm-client.c | 155 +++-- libxfce4ui/xfce-sm-client.h |3 + 5 files changed, 169 insertions(+), 6 deletions(-) diff --git a/docs/libxfce4ui-sections.txt b/docs/libxfce4ui-sections.txt index e5de489..d3a9b10 100644 --- a/docs/libxfce4ui-sections.txt +++ b/docs/libxfce4ui-sections.txt @@ -84,6 +84,7 @@ xfce_sm_client_get_full xfce_sm_client_connect xfce_sm_client_disconnect xfce_sm_client_is_resumed +xfce_sm_client_set_desktop_file xfce_sm_client_request_shutdown xfce_sm_client_get_client_id xfce_sm_client_get_state_file diff --git a/docs/tmpl/xfce-sm-client.sgml b/docs/tmpl/xfce-sm-client.sgml index 313bff2..b9547b6 100644 --- a/docs/tmpl/xfce-sm-client.sgml +++ b/docs/tmpl/xfce-sm-client.sgml @@ -85,6 +85,11 @@ + + + + + @@ -217,6 +222,15 @@ @Returns: + + + + + +...@sm_client: +...@desktop_file: + + diff --git a/libxfce4ui/libxfce4ui.symbols b/libxfce4ui/libxfce4ui.symbols index 4ad0203..d75091d 100644 --- a/libxfce4ui/libxfce4ui.symbols +++ b/libxfce4ui/libxfce4ui.symbols @@ -102,6 +102,8 @@ xfce_sm_client_get_with_argv xfce_sm_client_get_full xfce_sm_client_connect xfce_sm_client_disconnect +xfce_sm_client_is_resumed +xfce_sm_client_set_desktop_file xfce_sm_client_request_shutdown xfce_sm_client_get_client_id xfce_sm_client_get_state_file diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c index bccbee4..21d0e59 100644 --- a/libxfce4ui/xfce-sm-client.c +++ b/libxfce4ui/xfce-sm-client.c @@ -160,6 +160,7 @@ struct _XfceSMClient gchar **argv; gchar *state_file; +gchar *desktop_file; }; typedef struct _XfceSMClientClass @@ -208,6 +209,7 @@ enum PROP_CLONE_COMMAND, PROP_RESTART_COMMAND, PROP_DISCARD_COMMAND, +PROP_DESKTOP_FILE, PROP_ARGC, PROP_ARGV, }; @@ -412,6 +414,12 @@ xfce_sm_client_class_init(XfceSMClientClass *klass) "A command used to discard any information about the current saved state", G_TYPE_STRV, G_PARAM_READWRITE|G_PARAM_CONSTRUCT)); +g_object_class_install_property(gobject_class, PROP_DESKTOP_FILE, +g_param_spec_string("desktop-file", +"Desktop file", +"The application's .desktop file", +NULL, + G_PARAM_READWRITE|G_PARAM_CONSTRUCT)); /* these are "private" properties */ g_object_class_install_property(gobject_class, PROP_ARGC, @@ -480,6 +488,10 @@ xfce_sm_client_get_property(GObject *obj, g_value_set_boxed(value, sm_client->discard_command); break; +case PROP_DESKTOP_FILE: +g_value_set_string(value, sm_client->desktop_file); +break; + case PROP_ARGC: case PROP_ARGV: default: @@ -533,6 +545,11 @@ xfce_sm_client_set_property(GObject *obj, g_value_get_boxed(value)); break; +case PROP_DESKTOP_FILE: +xfce_sm_client_set_desktop_file(sm_client, +g_value_get_string(value)); +break; + case PROP_ARGC: if(sm_client->argc) g_critical("XfceSMClient: Received argc twice"); @@ -590,6 +607,7 @@ xfce_sm_client_finalize(GObject *obj) #endif g_free(sm_client->state_file); +g_free(sm_client->desktop_file); g_free(sm_client->client_id); g_free(sm_client->current_directory); @@ -1503,8 +1521,9 @@ xfce_sm_client_connect(XfceSMClient *sm_client, char buf[256] = ""; unsigned long mask; SmcCallbacks callbacks; -SmProp prop1, prop2, prop3, prop4, prop5, prop6, *props[6]; -SmPropValue prop1val, prop2val, prop3val, prop4val, prop5val, prop6val; +SmProp prop1, prop2, prop3, prop4, prop5, prop6, prop7, *props[7]; +SmPropValue prop1val, prop2val, prop3val, prop4val, prop5val, prop6val, prop7val; +int n_props = 0; char pid[32]; char hint = SmRestartIfRunning; char priority = sm_client->priority; @@ -1584,6 +1603,7 @@ xfce_sm_client_connect(XfceSMClient *sm_client, prop1.vals = &prop1val; prop1val.value = sm_client->program
[Xfce4-commits] use macro defines for the non-standard prop names
Updating branch refs/heads/kelnos/new-sm-client to d883beffbb1108d5406960f060e7eec04bdd753f (commit) from fec139a69b6c2988e7de4cbbdc0ddb2a61d35104 (commit) commit d883beffbb1108d5406960f060e7eec04bdd753f Author: Brian J. Tarricone Date: Thu Sep 17 01:24:39 2009 -0700 use macro defines for the non-standard prop names libxfce4ui/xfce-sm-client.c | 11 +++ 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c index 21d0e59..d0b2fd4 100644 --- a/libxfce4ui/xfce-sm-client.c +++ b/libxfce4ui/xfce-sm-client.c @@ -64,6 +64,9 @@ #include "libxfce4ui-marshal.h" #include "libxfce4ui-enum-types.h" +#define GsmPriority "_GSM_Priority" +#define GsmDesktopFile "_GSM_DesktopFile" + #define SM_ID_ARG "--sm-client-id" #define DPY_ARG "--display" @@ -1641,7 +1644,7 @@ xfce_sm_client_connect(XfceSMClient *sm_client, prop5val.length = strlen(prop5val.value); n_props++; -prop6.name = "_GSM_Priority"; +prop6.name = GsmPriority; prop6.type = SmCARD8; prop6.num_vals = 1; prop6.vals = &prop6val; @@ -1650,7 +1653,7 @@ xfce_sm_client_connect(XfceSMClient *sm_client, n_props++; if(sm_client->desktop_file) { -prop7.name = "_GSM_DesktopFile"; +prop7.name = GsmDesktopFile; prop7.type = SmARRAY8; prop7.num_vals = 1; prop7.vals = &prop7val; @@ -1818,7 +1821,7 @@ xfce_sm_client_set_desktop_file(XfceSMClient *sm_client, SmProp prop, *props[1]; SmPropValue propval; -prop.name = "_GSM_DesktopFile"; +prop.name = GsmDesktopFile; prop.type = SmARRAY8; prop.num_vals = 1; prop.vals = &propval; @@ -1936,7 +1939,7 @@ xfce_sm_client_set_priority(XfceSMClient *sm_client, SmProp prop, *props[1]; SmPropValue propval; -prop.name = "_GSM_Priority"; +prop.name = GsmPriority; prop.type = SmCARD8; prop.num_vals = 1; prop.vals = &propval; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] don't automatically set command properties to NULL on construct
Updating branch refs/heads/kelnos/new-sm-client to 77c8ec46e67c326b423c4d7a956f802d142399aa (commit) from d883beffbb1108d5406960f060e7eec04bdd753f (commit) commit 77c8ec46e67c326b423c4d7a956f802d142399aa Author: Brian J. Tarricone Date: Thu Sep 17 05:16:08 2009 -0700 don't automatically set command properties to NULL on construct since restart and clone are figured out from argv during construction, if we auto-set them as well, they'll get overwritten libxfce4ui/xfce-sm-client.c | 17 + 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c index d0b2fd4..f1870aa 100644 --- a/libxfce4ui/xfce-sm-client.c +++ b/libxfce4ui/xfce-sm-client.c @@ -392,7 +392,7 @@ xfce_sm_client_class_init(XfceSMClientClass *klass) "Current working directory", "The directory that should be used as the working directory the next time this client is restarted", NULL, - G_PARAM_READWRITE|G_PARAM_CONSTRUCT)); +G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, PROP_PROGRAM, g_param_spec_string("program", "Program name", @@ -404,19 +404,19 @@ xfce_sm_client_class_init(XfceSMClientClass *klass) "Clone command", "A command used to launch a fresh instance of the application", G_TYPE_STRV, - G_PARAM_READWRITE|G_PARAM_CONSTRUCT)); + G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, PROP_RESTART_COMMAND, g_param_spec_boxed("restart-command", "Restart command", "A command used to restart this application, preserving the current state", G_TYPE_STRV, - G_PARAM_READWRITE|G_PARAM_CONSTRUCT)); + G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, PROP_DISCARD_COMMAND, g_param_spec_boxed("discard-command", "Discard command", "A command used to discard any information about the current saved state", G_TYPE_STRV, - G_PARAM_READWRITE|G_PARAM_CONSTRUCT)); + G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, PROP_DESKTOP_FILE, g_param_spec_string("desktop-file", "Desktop file", @@ -719,6 +719,9 @@ xfce_sm_client_parse_argv(XfceSMClient *sm_client) } else restart_command = argv; +DBG("setting restart and clone commands (%s, %s)", +restart_command && restart_command[0] ? restart_command[0] : "(null)", +clone_command && clone_command[0] ? clone_command[0] : "(null)"); xfce_sm_client_set_restart_command(sm_client, restart_command); xfce_sm_client_set_clone_command(sm_client, clone_command); @@ -1240,6 +1243,9 @@ xfce_sm_client_set_property_from_command(XfceSMClient *sm_client, gint i, argc; SmPropValue *vals; +TRACE("entering (%s, %p, %s)", property_name, command, + alter_sm_id == SM_ARG_APPEND ? "APPEND" : alter_sm_id == SM_ARG_REMOVE ? "REMOVE" : "FALSE"); + if(!command || !sm_client->session_connection) return; @@ -1313,6 +1319,7 @@ xfce_sm_client_set_property_from_command(XfceSMClient *sm_client, prop.num_vals = i; props[0] = ∝ +DBG("setting %s", property_name); SmcSetProperties(sm_client->session_connection, 1, props); g_free(vals); } @@ -1320,6 +1327,8 @@ xfce_sm_client_set_property_from_command(XfceSMClient *sm_client, static void xfce_sm_client_set_clone_restart_commands(XfceSMClient *sm_client) { +TRACE("entering"); + /* Restart */ xfce_sm_client_set_property_from_command(sm_client, SmRestartCommand, sm_client->restart_command, ___ Xfce4-commits mailing list Xfce
[Xfce4-commits] fix naming of state file
Updating branch refs/heads/kelnos/new-sm-client to b159e5ef751ef1500e3b03be0ee525393bdbd4e8 (commit) from 77c8ec46e67c326b423c4d7a956f802d142399aa (commit) commit b159e5ef751ef1500e3b03be0ee525393bdbd4e8 Author: Brian J. Tarricone Date: Thu Sep 17 05:17:25 2009 -0700 fix naming of state file libxfce4ui/xfce-sm-client.c | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c index f1870aa..2d4908a 100644 --- a/libxfce4ui/xfce-sm-client.c +++ b/libxfce4ui/xfce-sm-client.c @@ -2084,7 +2084,7 @@ xfce_sm_client_set_clone_command(XfceSMClient *sm_client, { g_return_if_fail(XFCE_IS_SM_CLIENT(sm_client)); sm_client->clone_command = copy_command(sm_client->clone_command, - clone_command); +clone_command); #ifdef HAVE_LIBSM xfce_sm_client_set_property_from_command(sm_client, SmCloneCommand, sm_client->clone_command, @@ -2112,7 +2112,7 @@ xfce_sm_client_set_restart_command(XfceSMClient *sm_client, { g_return_if_fail(XFCE_IS_SM_CLIENT(sm_client)); sm_client->restart_command = copy_command(sm_client->restart_command, -restart_command); + restart_command); #ifdef HAVE_LIBSM xfce_sm_client_set_property_from_command(sm_client, SmRestartCommand, sm_client->restart_command, @@ -2140,7 +2140,7 @@ xfce_sm_client_set_discard_command(XfceSMClient *sm_client, { g_return_if_fail(XFCE_IS_SM_CLIENT(sm_client)); sm_client->discard_command = copy_command(sm_client->discard_command, -discard_command); + discard_command); #ifdef HAVE_LIBSM xfce_sm_client_set_property_from_command(sm_client, SmDiscardCommand, sm_client->discard_command, @@ -2247,13 +2247,13 @@ xfce_sm_client_get_state_file(XfceSMClient *sm_client) resource = g_strdup_printf("sessions/%s-%s.state", sm_client->program, sm_client->client_id); -for(p = resource; *p; p++) { +for(p = resource+9; *p; p++) { if(*p == '/') *p = '_'; } sm_client->state_file = xfce_resource_save_location(XFCE_RESOURCE_CACHE, - resource, TRUE); +resource, TRUE); if(!sm_client->state_file) { g_critical("XfceSMClient: Unable to create state file as " "\"$XDG_CACHE_HOME/%s\"", resource); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] don't set desktop-file prop on construct, suppresses warning
Updating branch refs/heads/kelnos/new-sm-client to bebe30bdf8f1bccd66dc0628ca05b73827559d74 (commit) from b159e5ef751ef1500e3b03be0ee525393bdbd4e8 (commit) commit bebe30bdf8f1bccd66dc0628ca05b73827559d74 Author: Brian J. Tarricone Date: Thu Sep 17 05:18:19 2009 -0700 don't set desktop-file prop on construct, suppresses warning libxfce4ui/xfce-sm-client.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c index 2d4908a..9c8bd9b 100644 --- a/libxfce4ui/xfce-sm-client.c +++ b/libxfce4ui/xfce-sm-client.c @@ -422,7 +422,7 @@ xfce_sm_client_class_init(XfceSMClientClass *klass) "Desktop file", "The application's .desktop file", NULL, - G_PARAM_READWRITE|G_PARAM_CONSTRUCT)); +G_PARAM_READWRITE)); /* these are "private" properties */ g_object_class_install_property(gobject_class, PROP_ARGC, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] don't allow NULL current-directory
Updating branch refs/heads/kelnos/new-sm-client to 901fb8de6fc98b2c6c9794e9b73e26a6e41259a5 (commit) from bebe30bdf8f1bccd66dc0628ca05b73827559d74 (commit) commit 901fb8de6fc98b2c6c9794e9b73e26a6e41259a5 Author: Brian J. Tarricone Date: Thu Sep 17 05:28:28 2009 -0700 don't allow NULL current-directory libxfce4ui/xfce-sm-client.c | 15 +-- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c index 9c8bd9b..4500253 100644 --- a/libxfce4ui/xfce-sm-client.c +++ b/libxfce4ui/xfce-sm-client.c @@ -442,8 +442,8 @@ xfce_sm_client_class_init(XfceSMClientClass *klass) static void xfce_sm_client_init(XfceSMClient *sm_client) { -sm_client->state = XFCE_SM_CLIENT_STATE_DISCONNECTED; sm_client->program = g_get_prgname() ? g_strdup(g_get_prgname()) : g_strdup(""); +sm_client->current_directory = g_strdup(xfce_get_homedir()); } static void @@ -748,8 +748,8 @@ xfce_sm_client_set_state(XfceSMClient *sm_client, sm_client->state = new_state; -g_debug("XfceSMClient: state change: %s -> %s", -str_from_state(old_state), str_from_state(new_state)); +DBG("state change: %s -> %s", str_from_state(old_state), +str_from_state(new_state)); } static inline char @@ -1646,10 +1646,7 @@ xfce_sm_client_connect(XfceSMClient *sm_client, prop5.type = SmARRAY8; prop5.num_vals = 1; prop5.vals = &prop5val; -if(sm_client->current_directory) -prop5val.value = (char *)sm_client->current_directory; -else -prop5val.value = (char *)xfce_get_homedir(); +prop5val.value = (char *)sm_client->current_directory; prop5val.length = strlen(prop5val.value); n_props++; @@ -1977,13 +1974,11 @@ xfce_sm_client_set_current_directory(XfceSMClient *sm_client, const gchar *current_directory) { g_return_if_fail(XFCE_IS_SM_CLIENT(sm_client)); +g_return_if_fail(current_directory && current_directory[0]); if(!xfce_safe_strcmp(sm_client->current_directory, current_directory)) return; -if(!current_directory) -current_directory = xfce_get_homedir(); - g_free(sm_client->current_directory); sm_client->current_directory = g_strdup(current_directory); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Slovak translation
Updating branch refs/heads/master to d65a1dadb953ff9d196c9af4602a48523047f3e4 (commit) from f8df940d4a42dfd94fe73e62b0bafea41e8895e8 (commit) commit d65a1dadb953ff9d196c9af4602a48523047f3e4 Author: Robert Hartl Date: Thu Sep 17 15:07:46 2009 + l10n: Slovak translation Transmitted-via: Transifex (translations.xfce.org) po/{eu.po => sk.po} | 131 ++- 1 files changed, 57 insertions(+), 74 deletions(-) diff --git a/po/eu.po b/po/sk.po similarity index 66% copy from po/eu.po copy to po/sk.po index b36da52..9344d58 100644 --- a/po/eu.po +++ b/po/sk.po @@ -1,30 +1,25 @@ -# translation of eu.po to Euskara -# Basque translation of the xfce4-clipman-plugin package. +# Slovak translation of the xfce4-clipman-plugin package. # Copyright (C) 2005-2007 The Xfce development team. # This file is distributed under the same license as the xfce4-clipman-plugin package. -# -# Piarres Beobide , 2006, 2009. +# Robert Hartl , 2009. +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: eu\n" +"Project-Id-Version: 1.1.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-09-12 10:19+0200\n" -"PO-Revision-Date: 2009-04-18 12:27+0200\n" -"Last-Translator: Piarres Beobide \n" -"Language-Team: Euskara \n" +"PO-Revision-Date: 2009-09-17 17:06+0200\n" +"Last-Translator: Robert Hartl \n" +"Language-Team: slovak \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: eu\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8-bit\n" #: ../xfce4-clipman-plugin.desktop.in.h:1 #: ../panel-plugin/xfce4-clipman-plugin.desktop.in.in.h:1 #: ../panel-plugin/xfce4-clipman-plugin-autostart.desktop.in.h:1 -#, fuzzy msgid "Clipboard manager" -msgstr "Arbel Kudeatzailea" +msgstr "Správca schránky" #: ../xfce4-clipman-plugin.desktop.in.h:2 #: ../panel-plugin/xfce4-clipman-plugin.desktop.in.in.h:2 @@ -37,143 +32,145 @@ msgstr "Clipman" #: ../panel-plugin/xfce4-clipman-actions.xml.in.h:1 msgid "Bugz" -msgstr "" +msgstr "Chyby" #: ../panel-plugin/xfce4-clipman-actions.xml.in.h:2 msgid "Edit with Gimp" -msgstr "" +msgstr "UpraviÅ¥ pomocou aplikácie Gimp" #: ../panel-plugin/xfce4-clipman-actions.xml.in.h:3 msgid "GNOME Bug" -msgstr "" +msgstr "Chyba Gnome" #: ../panel-plugin/xfce4-clipman-actions.xml.in.h:4 msgid "Image" -msgstr "" +msgstr "Obrázok" #: ../panel-plugin/xfce4-clipman-actions.xml.in.h:5 msgid "Long URL" -msgstr "" +msgstr "Dlhá URL" #: ../panel-plugin/xfce4-clipman-actions.xml.in.h:6 msgid "Shrink the URL" -msgstr "" +msgstr "SkrátiÅ¥ URL" #: ../panel-plugin/xfce4-clipman-actions.xml.in.h:7 msgid "View with Ristretto" -msgstr "" +msgstr "ZobraziÅ¥ pomocou aplikácie Risttretto" #: ../panel-plugin/xfce4-clipman-actions.xml.in.h:8 msgid "Xfce Bug" -msgstr "" +msgstr "Chyba Xfce" #: ../panel-plugin/settings-dialog.glade.h:1 msgid "Action" -msgstr "" +msgstr "Akcia" #: ../panel-plugin/settings-dialog.glade.h:2 -#, fuzzy msgid "Behavior" -msgstr "Orokorra" +msgstr "Správanies" #: ../panel-plugin/settings-dialog.glade.h:3 -#, fuzzy msgid "Commands" -msgstr "Zenbakiak" +msgstr "PrÃkazy" #: ../panel-plugin/settings-dialog.glade.h:4 msgid "History" -msgstr "" +msgstr "História" #: ../panel-plugin/settings-dialog.glade.h:5 msgid "Actions" -msgstr "" +msgstr "Akcie" #: ../panel-plugin/settings-dialog.glade.h:6 msgid "Activate only on manual copy" -msgstr "" +msgstr "AktivovaÅ¥ len na ruÄné kopÃrovanie" #: ../panel-plugin/settings-dialog.glade.h:7 msgid "" "By default the action is triggerred by a selection, check this option to " "trigger the action only when you make a manual copy" msgstr "" +"V prednastavenom nastavenà je akcia spustená výberom, zaÅ¡krtnite túto voľbu " +"pre spustenie akcie iba pri ruÄnom kopÃrovanÃ" #: ../panel-plugin/settings-dialog.glade.h:8 msgid "Command:" -msgstr "" +msgstr "PrÃkaz:" #: ../panel-plugin/settings-dialog.glade.h:9 msgid "Configure the plugin" -msgstr "" +msgstr "NastaviÅ¥ zásuvný modul" #: ../panel-plugin/settings-dialog.glade.h:10 msgid "Edit Action" -msgstr "" +msgstr "UpraviÅ¥ akciu" #: ../panel-plugin/settings-dialog.glade.h:11 msgid "Enable _actions" -msgstr "" +msgstr "PovoliÅ¥ _akcie" #: ../panel-plugin/settings-dialog.glade.h:12 msgid "General" -msgstr "Orokorra" +msgstr "VÅ¡eobecné" #: ../panel-plugin/settings-dialog.glade.h:13 msgid "" "If checked, the clipboard texts will be matched against regular expressions " "and a menu will display possible actions" msgstr "" +"Ak je zapnuté, text schránky bude otestovaný na zhodu s regulárnym výrazom a " +"ponuka zobrazà možné akcie" #: ../panel-plugin/settings-dialog.glade.h:14 msgid "" "If checked, the selections will be synced with the default clipboard in a " "way
[Xfce4-commits] l10n: Updates to Danish (da) translation
Updating branch refs/heads/master to a79add0b3c27775e76207cced9cbe02745f6974b (commit) from d8ee9b4e6e0677bafd81f459ca49cb3b718eafbb (commit) commit a79add0b3c27775e76207cced9cbe02745f6974b Author: Per Kongstad Date: Thu Sep 17 17:20:14 2009 + l10n: Updates to Danish (da) translation Transmitted-via: Transifex (translations.xfce.org) po/da.po | 556 ++ 1 files changed, 195 insertions(+), 361 deletions(-) diff --git a/po/da.po b/po/da.po index b758465..2977c3c 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: thunar 1.0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-09-13 15:48+0200\n" -"PO-Revision-Date: 2009-08-27 22:11+0100\n" +"PO-Revision-Date: 2009-09-17 19:19+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -143,10 +143,13 @@ msgid "Failed to execute \"%s\"" msgstr "Kunne ikke køre \"%s\"" #. tell the user that we were unable to launch the file specified -#: ../thunar/thunar-application.c:1083 ../thunar/thunar-application.c:1205 -#: ../thunar/thunar-launcher.c:1055 ../thunar/thunar-location-entry.c:389 +#: ../thunar/thunar-application.c:1083 +#: ../thunar/thunar-application.c:1205 +#: ../thunar/thunar-launcher.c:1055 +#: ../thunar/thunar-location-entry.c:389 #: ../thunar/thunar-location-entry.c:417 -#: ../thunar/thunar-shortcuts-view.c:1236 ../thunar/thunar-window.c:1501 +#: ../thunar/thunar-shortcuts-view.c:1236 +#: ../thunar/thunar-window.c:1501 #, c-format msgid "Failed to open \"%s\"" msgstr "Kunne ikke åbne \"%s\"" @@ -161,19 +164,19 @@ msgid "Copying files..." msgstr "Kopierer filer..." #: ../thunar/thunar-application.c:1320 -#, fuzzy, c-format +#, c-format msgid "Copying files to \"%s\"..." -msgstr "Kopierer filer..." +msgstr "Kopierer filer til \"%s\"..." #: ../thunar/thunar-application.c:1366 -#, fuzzy, c-format +#, c-format msgid "Creating symbolic links in \"%s\"..." -msgstr "Oprettelse af symbolske henvisninger..." +msgstr "Oprettelse af symbolske henvisninger i \"%s\"..." #: ../thunar/thunar-application.c:1419 -#, fuzzy, c-format +#, c-format msgid "Moving files into \"%s\"..." -msgstr "Flytter filer til papirkurven..." +msgstr "Flytter filer til \"%s\"..." #: ../thunar/thunar-application.c:1504 #, c-format @@ -225,19 +228,18 @@ msgstr "Fjern alle filer og mapper fra papirkurven?" #. append the "Empty Trash" menu action #. add the "Empty Trash" menu item -#: ../thunar/thunar-application.c:1695 ../thunar/thunar-location-buttons.c:171 -#: ../thunar/thunar-shortcuts-view.c:834 ../thunar/thunar-tree-view.c:1104 -#: ../thunar/thunar-window.c:295 ../plugins/thunar-tpa/main.c:49 +#: ../thunar/thunar-application.c:1695 +#: ../thunar/thunar-location-buttons.c:171 +#: ../thunar/thunar-shortcuts-view.c:834 +#: ../thunar/thunar-tree-view.c:1104 +#: ../thunar/thunar-window.c:295 +#: ../plugins/thunar-tpa/main.c:49 msgid "_Empty Trash" msgstr "_Tøm papirkurv" #: ../thunar/thunar-application.c:1699 -msgid "" -"If you choose to empty the Trash, all items in it will be permanently lost. " -"Please note that you can also delete them separately." -msgstr "" -"Hvis du vælger at tømme papirkurven, vil alle elementer i denne være tabt " -"for bestandig. Vær opmærksom på at du også kan slette dem enkeltvis." +msgid "If you choose to empty the Trash, all items in it will be permanently lost. Please note that you can also delete them separately." +msgstr "Hvis du vælger at tømme papirkurven, vil alle elementer i denne være tabt for bestandig. Vær opmærksom på at du også kan slette dem enkeltvis." #: ../thunar/thunar-application.c:1716 msgid "Emptying the Trash..." @@ -259,7 +261,8 @@ msgid "Restoring files..." msgstr "Genopretter filer..." #. tell the user that it didn't work -#: ../thunar/thunar-chooser-button.c:234 ../thunar/thunar-chooser-dialog.c:465 +#: ../thunar/thunar-chooser-button.c:234 +#: ../thunar/thunar-chooser-dialog.c:465 #, c-format msgid "Failed to set default application for \"%s\"" msgstr "Kunne ikke indstille standardprogram for \"%s\"" @@ -270,18 +273,16 @@ msgstr "Intet valgt program" #: ../thunar/thunar-chooser-button.c:313 #, c-format -msgid "" -"The selected application is used to open this and other files of type \"%s\"." -msgstr "" -"Det valgte program bruges til åbning af denne fil samt andre filer af typen " -"\"%s\"." +msgid "The selected application is used to open this and other files of type \"%s\"." +msgstr "Det valgte program bruges til åbning af denne fil samt andre filer af typen \"%s\"." #. add the "Other Application..." choice #: ../thunar/thunar-chooser-button.c:425 msgid "_Other Application..." msgstr "_Andet program..." -#: ../thunar/thunar-chooser-dialog.c:185 ../thunar/thunar-launcher.c:171 +#: ../thunar/thunar-chooser-dialog.c:185 +#: ../thunar/thunar-launcher.c:171 msgid "Open With" msgstr "
[Xfce4-commits] l10n: Updates to Slovak (sk) translation
Updating branch refs/heads/master to 93b16ad4580afbcba2467290457383ca55a89f9c (commit) from 5e5d41f658e74e9e0b90bbb30665361f64168ef9 (commit) commit 93b16ad4580afbcba2467290457383ca55a89f9c Author: Robert Hartl Date: Thu Sep 17 17:30:52 2009 + l10n: Updates to Slovak (sk) translation Transmitted-via: Transifex (translations.xfce.org) po/sk.po | 114 - 1 files changed, 75 insertions(+), 39 deletions(-) diff --git a/po/sk.po b/po/sk.po index c7c281c..3074f56 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-05-05 22:04+0200\n" -"PO-Revision-Date: 2009-09-13 16:56+0200\n" +"PO-Revision-Date: 2009-09-17 19:30+0200\n" "Last-Translator: Robert Hartl \n" "Language-Team: slovak \n" "MIME-Version: 1.0\n" @@ -213,7 +213,7 @@ msgstr "Å Ãrka stĺpca" #: ../exo/exo-icon-view.c:654 msgid "Space which is inserted between grid column" -msgstr "" +msgstr "Priestor, ktorý sa vkladá medzi mriežku stĺpcov" #: ../exo/exo-icon-view.c:670 msgid "Number of columns" @@ -233,11 +233,11 @@ msgstr "" #: ../exo/exo-icon-view.c:703 msgid "Width for each item" -msgstr "" +msgstr "Å Ãrka pre každú položku" #: ../exo/exo-icon-view.c:704 msgid "The width used for each item" -msgstr "" +msgstr "Å Ãrka použitá pre každú položku" #: ../exo/exo-icon-view.c:722 msgid "Layout mode" @@ -290,7 +290,7 @@ msgstr "Výška riadku" #: ../exo/exo-icon-view.c:835 msgid "Space which is inserted between grid rows" -msgstr "" +msgstr "Priestor, ktorý sa vkladá medzi mriežku riadkov" #: ../exo/exo-icon-view.c:849 msgid "Search Column" @@ -348,7 +348,7 @@ msgstr "" #: ../exo/exo-icon-view.c:945 msgid "Opacity of the selection box" -msgstr "" +msgstr "NepriehľadnosÅ¥ polÃÄka výberu" #: ../exo/exo-thumbnail-preview.c:123 msgid "Preview" @@ -360,11 +360,11 @@ msgstr "Nie je vybraný žiadny súbor" #: ../exo/exo-thumbnail-preview.c:299 msgid "Block Device" -msgstr "" +msgstr "Blokové zariadenie" #: ../exo/exo-thumbnail-preview.c:304 msgid "Character Device" -msgstr "" +msgstr "Znakové zariadenie" #: ../exo/exo-thumbnail-preview.c:309 msgid "Folder" @@ -463,7 +463,7 @@ msgstr "Homogénne" #: ../exo/exo-wrap-table.c:191 msgid "Whether the children should be all the same size" -msgstr "" +msgstr "Äi majú potomkovia rovnakú veľkosÅ¥" #: ../exo/exo-xsession-client.c:143 msgid "Window group" @@ -475,16 +475,16 @@ msgstr "Vedúca skupina okien" #: ../exo/exo-xsession-client.c:154 msgid "Restart command" -msgstr "" +msgstr "ReÅ¡tartovaÅ¥ prÃkaz" #: ../exo/exo-xsession-client.c:155 msgid "Session restart command" -msgstr "" +msgstr "PrÃkaz na znovu spustenia sedenia" #: ../exo-csource/main.c:285 #, c-format msgid "Usage: %s [options] [file]\n" -msgstr "" +msgstr "Použitie: %s [voľba] [súbor]\n" #: ../exo-csource/main.c:286 #, c-format @@ -514,7 +514,7 @@ msgstr " --extern Generuje statické symboly\n" #: ../exo-csource/main.c:292 #, c-format msgid " --name=identifier C macro/variable name\n" -msgstr "" +msgstr " --name=identifier Názov premennej alebo makra jazyka C\n" #: ../exo-csource/main.c:293 #, c-format @@ -524,12 +524,12 @@ msgstr " --build-list Parsovacie páry (názov, súbor)\n" #: ../exo-csource/main.c:294 #, c-format msgid " --strip-comments Remove comments from XML files\n" -msgstr "" +msgstr " --strip-comments Odstráni komentáre zo súborov XML\n" #: ../exo-csource/main.c:295 #, c-format msgid " --strip-content Remove node contents from XML files\n" -msgstr "" +msgstr " --strip-content Odstráni obsah uzlov zo súborov XML\n" #: ../exo-csource/main.c:305 ../exo-desktop-item-edit/main.c:153 #: ../exo-mount/main.c:122 ../exo-mount-notify/main.c:169 @@ -674,7 +674,7 @@ msgstr "SpustiÅ¥ v _termináli" #: ../exo-desktop-item-edit/exo-die-editor.c:444 msgid "Select this option to run the command in a terminal window." -msgstr "" +msgstr "Zvoľte túto možnosÅ¥ pre spustenie prÃkazu v okne terminálu." #. allocate the icon chooser dialog #: ../exo-desktop-item-edit/exo-die-editor.c:591 @@ -704,7 +704,7 @@ msgstr "VytvoriÅ¥ nový súbor plochy v danom prieÄinku" #: ../exo-desktop-item-edit/main.c:73 msgid "Type of desktop file to create (Application or Link)" -msgstr "" +msgstr "Typ vytváraného súboru pracovnej plochy (aplikácia alebo odkaz)" #: ../exo-desktop-item-edit/main.c:74 msgid "Preset name when creating a desktop file" @@ -743,7 +743,7 @@ msgstr "Nepodarilo sa otvoriÅ¥ displej" #: ../exo-desktop-item-edit/main.c:168 msgid "No file/folder specified" -msgstr "" +msgstr "Nebol zadaný žiadny súbor alebo prieÄinok" #. tell the user that we don't support the type #: ../exo-desktop-item-edit/main.c:226 @@ -866,7 +866,7 @@ msgstr "UprednostÅované aplikácie" #: ../exo-helpe
[Xfce4-commits] l10n: Slovak translation
Updating branch refs/heads/master to 508a4fe20284ff9ba4e4bfb51777ebcc5b033d48 (commit) from 34ef15719ce6cf16d0e94ca36feb35cd81cda195 (commit) commit 508a4fe20284ff9ba4e4bfb51777ebcc5b033d48 Author: Robert Hartl Date: Thu Sep 17 18:10:35 2009 + l10n: Slovak translation Transmitted-via: Transifex (translations.xfce.org) po/{xfconf.pot => sk.po} | 63 ++--- 1 files changed, 31 insertions(+), 32 deletions(-) diff --git a/po/xfconf.pot b/po/sk.po similarity index 82% copy from po/xfconf.pot copy to po/sk.po index d49939f..33710a9 100644 --- a/po/xfconf.pot +++ b/po/sk.po @@ -1,25 +1,24 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# +# Slovak translations for Xfconf package. +# Copyright (C) 2008 xfconf's Stephan Arts, Brian Tarricone +# This file is distributed under the same license as the Xfconf package. +# Robert Hartl , 2009. #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: 4.6.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-04-07 23:25+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2009-09-17 20:09+0200\n" +"Last-Translator: Robert Hartl \n" +"Language-Team: slovak \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8-bit\n" #: xfconfd/xfconf-backend-perchannel-xml.c:280 #, c-format msgid "Unable to create configuration directory \"%s\"" -msgstr "" +msgstr "Nedá sa vytvoriÅ¥ adresár konfigurácie \"%s\"" #: xfconfd/xfconf-backend-perchannel-xml.c:328 xfconfd/xfconf-daemon.c:244 #, c-format @@ -64,27 +63,27 @@ msgstr "" #: xfconfd/xfconf-backend-perchannel-xml.c:1907 #, c-format msgid "Channel \"%s\" does not exist" -msgstr "" +msgstr "Kánal \"%s\" neexistuje" #: xfconfd/xfconf-backend-perchannel-xml.c:1965 #, c-format msgid "Unable to write channel \"%s\": %s" -msgstr "" +msgstr "Nemožno zapÃsaÅ¥ kanál \"%s\": %s" #: xfconfd/xfconf-backend-factory.c:75 #, c-format msgid "Unable to find Xfconf backend of type \"%s\"" -msgstr "" +msgstr "Nedá sa nájsÅ¥ backend Xfconf typu \"%s\"" #: xfconfd/xfconf-backend.c:103 #, c-format msgid "Property names must start with a '/' character" -msgstr "" +msgstr "Názvy vlastnostà musia zaÄÃnaÅ¥ znakom '/'" #: xfconfd/xfconf-backend.c:112 #, c-format msgid "The root element ('/') is not a valid property name" -msgstr "" +msgstr "KoreÅový element ('/') nie je platný názov vlastnosti" #: xfconfd/xfconf-backend.c:126 #, c-format @@ -101,12 +100,12 @@ msgstr "" #: xfconfd/xfconf-backend.c:146 #, c-format msgid "Property names cannot end with a '/' character" -msgstr "" +msgstr "Názvy vlastnostà nemôžu konÄiÅ¥ znakom '/'" #: xfconfd/xfconf-backend.c:163 #, c-format msgid "Channel name cannot be an empty string" -msgstr "" +msgstr "Názov kanála nemôže byÅ¥ prázdny reÅ¥azec" #: xfconfd/xfconf-backend.c:176 #, c-format @@ -124,7 +123,7 @@ msgstr "" #: xfconfd/main.c:132 msgid "Prints the xfconfd version." -msgstr "" +msgstr "Zobrazà verziu xfconfd" #: xfconfd/main.c:134 msgid "" @@ -134,25 +133,25 @@ msgstr "" #: xfconfd/main.c:154 msgid "Xfce Configuration Daemon" -msgstr "" +msgstr "KonfiguraÄný démon Xfce" #: xfconfd/main.c:160 msgid "Xfce configuration daemon" -msgstr "" +msgstr "KonfiguraÄný démon Xfce" #: xfconfd/main.c:162 msgid "Report bugs to http://bugs.xfce.org/\n"; -msgstr "" +msgstr "Chyby hláste na http://bugs.xfce.org/\n"; #: xfconfd/main.c:165 #, c-format msgid "Error parsing options: %s\n" -msgstr "" +msgstr "Chyba pri analýze volieb: %s\n" #: xfconfd/xfconf-daemon.c:460 #, c-format msgid "Another Xfconf daemon is already running" -msgstr "" +msgstr "Už je spustený iný démon služby Xfconf" #: xfconfd/xfconf-daemon.c:496 #, c-format @@ -162,17 +161,17 @@ msgstr "" #: xfconf-query/main.c:92 #, c-format msgid "Property '%s' changed: %s\n" -msgstr "" +msgstr "VlastnosÅ¥ '%s' bola zmenená: %s\n" #: xfconf-query/main.c:97 #, c-format msgid "Property '%s' changed\n" -msgstr "" +msgstr "VlastnosÅ¥ '%s' bola zmenená\n" #: xfconf-query/main.c:102 #, c-format msgid "Property '%s' removed\n" -msgstr "" +msgstr "VlastnosÅ¥ '%s' bola odstránená\n" #: xfconf-query/main.c:111 #, c-format @@ -186,7 +185,7 @@ msgstr "" #: xfconf-query/main.c:191 msgid "Version information" -msgstr "" +msgstr "Informácie o verzii" #: xfconf-query/main.c:195 msgid "The channel to query/modify" @@ -206,7 +205,7 @@ msgstr "" #: xfconf-query/main.c:211 msgid "Verbose output" -msgstr "" +msgstr "Podrobný výstup" #: xfconf-query/main.c:215 msgid "Create a new
[Xfce4-commits] l10n: Slovak translation
Updating branch refs/heads/master to ec04ebb82859f9f46955b034bab1e59aa9b2959a (commit) from 03aec0ed8e9bf68cd3159ac96dd569f1ca420e1f (commit) commit ec04ebb82859f9f46955b034bab1e59aa9b2959a Author: Robert Hartl Date: Thu Sep 17 18:30:30 2009 + l10n: Slovak translation Transmitted-via: Transifex (translations.xfce.org) po/{nl.po => sk.po} | 36 +--- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/po/nl.po b/po/sk.po similarity index 72% copy from po/nl.po copy to po/sk.po index 58ef69d..1fa8cb2 100644 --- a/po/nl.po +++ b/po/sk.po @@ -1,25 +1,24 @@ -# Dutch translations for libxfce4util package. +# Slovak translations for libxfce4util package. # Copyright (C) 2006 THE libxfce4util'S COPYRIGHT HOLDER # This file is distributed under the same license as the libxfce4util package. -# Stephan Arts , 2006. -# +# Robert Hartl , 2009. +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: libxfce4util 4.4.0\n" +"Project-Id-Version: 4.6.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-01-24 10:40+0100\n" -"PO-Revision-Date: 2006-10-03 23:54+0200\n" -"Last-Translator: Stephan Arts \n" -"Language-Team: Dutch \n" +"PO-Revision-Date: 2009-09-17 20:30+0200\n" +"Last-Translator: Robert Hartl \n" +"Language-Team: slovak \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" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8-bit\n" #: libxfce4util/xfce-fileutils.c:153 #, c-format msgid "Error creating directory '%s': %s" -msgstr "Fout tijdens het maken van map '%s': %s" +msgstr "Chyba pri vytváranà adresára '%s': %s" #: libxfce4util/xfce-license.c:33 msgid "" @@ -81,3 +80,18 @@ msgid "" "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, \n" "Boston, MA 02110-1301 USA.\n" msgstr "" +"Táto knižnica je slobodný softvér. Môže sa Äalej distribuovaÅ¥\n" +"a/lebo upravovaÅ¥ pod podmienkami licencie GNU Library General\n" +"Public License vydanej organizáciou Free Software Foundation,\n" +"verziou licencie 2 alebo vyÅ¡Å¡ej (podľa VaÅ¡ej voľby).\n" +"\n" +"Táto knižnica je distribuovaná v nádeji, že bude užitoÄná, ale\n" +"NEPOSKYTUJE ŽIADNE ZÃRUKY. Bez akejkoľvek záruky na\n" +"OBCHODOVATEĽNOSŤ alebo VHODNOSŤ PRE KONKRÃTNE\n" +"POUŽITIE. Pre viac podrobnostà si preÄÃtajte licenciu GNU\n" +"Library General Public License.\n" +"S touto knižnicou by ste mali obdržaÅ¥ kópiu licencie GNU \n" +"Library General Public License. Ak tomu tak nie je, napÃÅ¡te na \n" +"adresu\n" +"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, \n" +"Boston, MA 02110-1301 USA.\n" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add info regarding the pattern entry
Updating branch refs/heads/master to 34b232fe74f8d7a273fbb311f8becda31a44ebd8 (commit) from d65a1dadb953ff9d196c9af4602a48523047f3e4 (commit) commit 34b232fe74f8d7a273fbb311f8becda31a44ebd8 Author: Mike Massonnet Date: Thu Sep 17 21:27:31 2009 +0200 Add info regarding the pattern entry ChangeLog |7 ++ panel-plugin/settings-dialog.glade | 39 +++- 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24e75f5..88a1529 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-09-17 Mike Massonnet +Add info regarding the pattern entry + + - panel-plugin/settings-dialog.glade: + Add a label under the pattern entry to inform about the + G_REGEX_ANCHORED flag. + 2009-09-12 Mike Massonnet Change default option 'ignore selections' to true diff --git a/panel-plugin/settings-dialog.glade b/panel-plugin/settings-dialog.glade index 7a87107..5cffdc7 100644 --- a/panel-plugin/settings-dialog.glade +++ b/panel-plugin/settings-dialog.glade @@ -466,7 +466,7 @@ True -3 +4 2 2 6 @@ -553,10 +553,47 @@ 2 +3 +4 + + + + +True +2 + + +True +gtk-dialog-info +1 + + +False +False +0 + + + + +True +0 +The pattern is always anchored within the special characters ^$ + + +1 + + + + +1 +2 2 3 + + + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] check for branch creation in is_fast_forward() check
Updating branch refs/heads/master to e1da322ef770acf3155f092861ca4dff5e2759f1 (commit) from 358e138eda1e82a4c9741c9e2d1c98f84e189619 (commit) commit e1da322ef770acf3155f092861ca4dff5e2759f1 Author: Brian J. Tarricone Date: Thu Sep 17 13:03:46 2009 -0700 check for branch creation in is_fast_forward() check hooks/update-01-history-integrity |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hooks/update-01-history-integrity b/hooks/update-01-history-integrity index fa891eb..d41e567 100755 --- a/hooks/update-01-history-integrity +++ b/hooks/update-01-history-integrity @@ -22,6 +22,11 @@ is_fast_forward() return 1 fi + if [ "$old" = "" ]; then +# new branch +return 0 + fi + for sha in `git rev-list "$new"`; do if [ "$sha" = "$old" ]; then return 0 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating branch xfce-4.6
Updating branch refs/heads/xfce-4.6 as new branch to c360d1807f6db61b2de738cbcb9a969bbc42eca7 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/xfce-4.6 for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use nore...@xfce.org as the email address used to send commit mails.
Updating branch refs/heads/master to 12f2f09b216b4e7d2ef28779e2d7a9fe4e7ea7c9 (commit) from e1da322ef770acf3155f092861ca4dff5e2759f1 (commit) commit 12f2f09b216b4e7d2ef28779e2d7a9fe4e7ea7c9 Author: Jannis Pohlmann Date: Fri Sep 18 04:02:16 2009 +0200 Use nore...@xfce.org as the email address used to send commit mails. Apparently, mailman doesn't care about envelope sender which we tried to set in order to make it accept mails from people not subscribed to the commits mailing list. So, we'll be using nore...@xfce.org now until there's a better solution. hooks/update-03-send-commit-mails | 14 ++ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/hooks/update-03-send-commit-mails b/hooks/update-03-send-commit-mails index 34605f7..ba8a5a5 100755 --- a/hooks/update-03-send-commit-mails +++ b/hooks/update-03-send-commit-mails @@ -37,22 +37,12 @@ replyto=`git repo-config xfce-hooks.replyto` xfce_git_hook_committer() { - git show --pretty=format:'%cn <%ce>' -s "$1" + git show --pretty=format:'%cn ' -s "$1" } xfce_git_hook_tagger() { - git show --summary "$1" | grep '^Tagger:' | sed 's/^Tagger: //' -} - -xfce_git_hook_author() -{ - git show --pretty=format:'%an <%ae>' "$1" -} - -xfce_git_hook_tag_date() -{ - git show --summary "$1" | head -n3 | grep '^Date:' | sed -e 's/^Date: //' + git show --summary "$1" | grep '^Tagger:' | sed 's/^Tagger: //' | sed 's/<.*>/nore...@xfce.org/' } xfce_git_hook_short_refname() ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Too many typos lately... fix the noreply address for newly created tags.
Updating branch refs/heads/master to 1a3455349145bd8a8564a517c83a8402caf938b1 (commit) from 12f2f09b216b4e7d2ef28779e2d7a9fe4e7ea7c9 (commit) commit 1a3455349145bd8a8564a517c83a8402caf938b1 Author: Jannis Pohlmann Date: Fri Sep 18 04:11:43 2009 +0200 Too many typos lately... fix the noreply address for newly created tags. hooks/update-03-send-commit-mails |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hooks/update-03-send-commit-mails b/hooks/update-03-send-commit-mails index ba8a5a5..dffd447 100755 --- a/hooks/update-03-send-commit-mails +++ b/hooks/update-03-send-commit-mails @@ -42,7 +42,7 @@ xfce_git_hook_committer() xfce_git_hook_tagger() { - git show --summary "$1" | grep '^Tagger:' | sed 's/^Tagger: //' | sed 's/<.*>/nore...@xfce.org/' + git show --summary "$1" | grep '^Tagger:' | sed 's/^Tagger: //' | sed 's/<.*>//' } xfce_git_hook_short_refname() ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Try to fix make distcheck with gtk-doc (need dist-hook: all).
Updating branch refs/heads/master to 6ac6d6776be47143002a4dbbe92d89e90a1ca810 (commit) from fd5e491d10fa94f5803f12279f23729c663b43ab (commit) commit 6ac6d6776be47143002a4dbbe92d89e90a1ca810 Author: Jannis Pohlmann Date: Fri Sep 18 04:30:37 2009 +0200 Try to fix make distcheck with gtk-doc (need dist-hook: all). docs/reference/Makefile.am |2 -- libxfce4menu/Makefile.am |3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 62bfe9b..fa59a3f 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -47,9 +47,7 @@ INCLUDES = \ $(LIBXFCE4UTIL_CFLAGS) GTKDOC_LIBS = \ - $(GLIB_CFLAGS) \ $(GTHREAD_LIBS) \ - $(GTK_CFLAGS) \ $(LIBXFCE4UTIL_LIBS)\ $(top_builddir)/libxfce4menu/libxfce4menu-$(LIBXFCE4MENU_VERSION_API).la diff --git a/libxfce4menu/Makefile.am b/libxfce4menu/Makefile.am index c6df320..2bf778c 100644 --- a/libxfce4menu/Makefile.am +++ b/libxfce4menu/Makefile.am @@ -87,3 +87,6 @@ EXTRA_DIST = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libxfce4menu-0.1.pc + +# required for gtk-doc +dist-hook: all ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Don't run the programs in test/ during make distcheck.
Updating branch refs/heads/master to 929070f36220aa66a4802ce3a94e4ee0c5d6da7f (commit) from 6ac6d6776be47143002a4dbbe92d89e90a1ca810 (commit) commit 929070f36220aa66a4802ce3a94e4ee0c5d6da7f Author: Jannis Pohlmann Date: Fri Sep 18 04:34:13 2009 +0200 Don't run the programs in test/ during make distcheck. They are thought to be programs executed by developers to verify that their don't break things completely. tests/Makefile.am |6 +- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ebc3613..03e264c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,11 +6,7 @@ INCLUDES = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"libxfce4menu-tests\" -TESTS = \ - test-menu-spec \ - test-display-menu - -check_PROGRAMS = \ +noinst_PROGRAMS = \ test-menu-spec \ test-display-menu ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Switch back to previous debug configure code from XDT_FEATURE_DEBUG().
Updating branch refs/heads/master to 00ea28c6384c46cf7fda51591a2fa2b49970b6e7 (commit) from a79add0b3c27775e76207cced9cbe02745f6974b (commit) commit 00ea28c6384c46cf7fda51591a2fa2b49970b6e7 Author: Jannis Pohlmann Date: Fri Sep 18 04:40:26 2009 +0200 Switch back to previous debug configure code from XDT_FEATURE_DEBUG(). I'd like to see if this has an impact on make distcheck. It could be that only modules using XDT_FEATURE_DEBUG(), like xfconf and Thunar, break due to this error in the scanner code generated by gtk-doc: thunarx-scan.c: In function âdescribe_signed_constantâ: thunarx-scan.c:884: error: comparison between signed and unsigned configure.in.in | 106 +++--- 1 files changed, 53 insertions(+), 53 deletions(-) diff --git a/configure.in.in b/configure.in.in index cea90b5..c8b2813 100644 --- a/configure.in.in +++ b/configure.in.in @@ -203,59 +203,59 @@ AM_CONDITIONAL([ENABLE_XML2PO], [test x"$enable_xml2po" = x"yes"]) dnl *** dnl *** Check for debugging support *** dnl *** -XDT_FEATURE_DEBUG() -#AC_ARG_ENABLE([debug], -#AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging @<:@default=thunar_debug_default@:>@]), -# [], [enable_debug=thunar_debug_default]) -#AC_MSG_CHECKING([whether to enable debugging support]) -#if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then -# dnl Print the result -# AC_MSG_RESULT([$enable_debug]) -# -# dnl Make sure we detect possible errors (if supported) -# save_CFLAGS="$CFLAGS" -# CFLAGS="$CFLAGS -Wall -Werror" -# AC_MSG_CHECKING([whether $CC accepts -Wall -Werror]) -# AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ -#AC_MSG_RESULT([yes]) -#PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Wall -Werror" -# ], [ -#AC_MSG_RESULT([no]) -# ]) -# CFLAGS="$save_CFLAGS" -# -# dnl Paranoia for --enable-debug=full -# if test x"$enable_debug" = x"full"; then -#dnl Enable extensive debugging -#PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG" -# -#dnl Use -O0 -g3 if the compiler supports it -#save_CFLAGS="$CFLAGS" -#CFLAGS="$CFLAGS -O0 -g3" -#AC_MSG_CHECKING([whether $CC accepts -O0 -g3]) -#AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ -# AC_MSG_RESULT([yes]) -# PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3" -#], [ -# AC_MSG_RESULT([no]) -#]) -#CFLAGS="$save_CFLAGS" -# fi -#else -# dnl Print the result -# AC_MSG_RESULT([$enable_debug]) -# -# dnl Disable debugging (release build) -# PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DNDEBUG" -# -# dnl Disable object cast checks -# PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS" -# -# dnl Disable all checks for --enable-debug=no -# if test x"$enable_debug" = x"no"; then -#PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" -# fi -#fi +#XDT_FEATURE_DEBUG() +AC_ARG_ENABLE([debug], +AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging @<:@default=thunar_debug_default@:>@]), + [], [enable_debug=thunar_debug_default]) +AC_MSG_CHECKING([whether to enable debugging support]) +if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then + dnl Print the result + AC_MSG_RESULT([$enable_debug]) + + dnl Make sure we detect possible errors (if supported) + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wall -Werror" + AC_MSG_CHECKING([whether $CC accepts -Wall -Werror]) + AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ +AC_MSG_RESULT([yes]) +PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Wall -Werror" + ], [ +AC_MSG_RESULT([no]) + ]) + CFLAGS="$save_CFLAGS" + + dnl Paranoia for --enable-debug=full + if test x"$enable_debug" = x"full"; then +dnl Enable extensive debugging +PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG" + +dnl Use -O0 -g3 if the compiler supports it +save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -O0 -g3" +AC_MSG_CHECKING([whether $CC accepts -O0 -g3]) +AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ + AC_MSG_RESULT([yes]) + PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3" +], [ + AC_MSG_RESULT([no]) +]) +CFLAGS="$save_CFLAGS" + fi +else + dnl Print the result + AC_MSG_RESULT([$enable_debug]) + + dnl Disable debugging (release build) + PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DNDEBUG" + + dnl Disable object cast checks + PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS" + + dnl Disable all checks for --enable-debug=no + if test x"$enable_debug" = x"no"; then +PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" + fi +fi dnl ** dnl *** Check for linker optimizations *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add dist-hook: all to the Makefile.am in thunar-vfs/.
Updating branch refs/heads/master to b98181e483c753e385a8566926db04de34f8c9d8 (commit) from 6a08cd4bc8152bf997757939a56857e056370847 (commit) commit b98181e483c753e385a8566926db04de34f8c9d8 Author: Jannis Pohlmann Date: Fri Sep 18 04:53:17 2009 +0200 Add dist-hook: all to the Makefile.am in thunar-vfs/. This should fix make distcheck where the gtk-doc scanner doesn't find the .la library file. thunar-vfs/Makefile.am |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/thunar-vfs/Makefile.am b/thunar-vfs/Makefile.am index d1ed0a2..caa4349 100644 --- a/thunar-vfs/Makefile.am +++ b/thunar-vfs/Makefile.am @@ -362,4 +362,7 @@ thunar-vfs-marshal.c: thunar-vfs-marshal.list Makefile && rm -f xgen-tvmc endif +# required for gtk-doc +dist-hook: all + # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update to xfce4-dev-tools 4.7.0.
Updating branch refs/heads/master to 2b8f587c289c5c25fa570c9d57651b55bd719346 (commit) from b98181e483c753e385a8566926db04de34f8c9d8 (commit) commit 2b8f587c289c5c25fa570c9d57651b55bd719346 Author: Jannis Pohlmann Date: Fri Sep 18 04:55:35 2009 +0200 Update to xfce4-dev-tools 4.7.0. autogen.sh | 22 ++ configure.in.in |8 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/autogen.sh b/autogen.sh index 9bbd678..daed9b6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id$ +# vi:set et ai sw=2 sts=2 ts=2: */ # # Copyright (c) 2002-2006 # The Thunar development team. All rights reserved. @@ -18,22 +18,4 @@ EOF exit 1 } -# verify that po/LINGUAS is present -(test -f po/LINGUAS) >/dev/null 2>&1 || { - cat >&2 < "configure.in" - -exec xdt-autogen $@ - -# vi:set ts=2 sw=2 et ai: +XDT_AUTOGEN_REQUIRED_VERSION="4.7.0" exec xdt-autogen $@ diff --git a/configure.in.in b/configure.in.in index 0da70af..007727f 100644 --- a/configure.in.in +++ b/configure.in.in @@ -15,14 +15,14 @@ m4_define([thunar_vfs_version_major], [1]) m4_define([thunar_vfs_version_minor], [0]) m4_define([thunar_vfs_version_micro], [1]) m4_define([thunar_vfs_version_nano], []) -m4_define([thunar_vfs_version_build], [...@revision@]) -m4_define([thunar_vfs_version_tag], []) -m4_define([thunar_vfs_version], [thunar_vfs_version_major().thunar_vfs_version_minor().thunar_vfs_version_micro()ifelse(thunar_vfs_version_nano(), [], [], [.thunar_vfs_version_nano()])ifelse(thunar_vfs_version_tag(), [svn], [thunar_vfs_version_tag()-thunar_vfs_version_build()], [thunar_vfs_version_tag()])]) +m4_define([thunar_vfs_version_build], [...@revision@]) +m4_define([thunar_vfs_version_tag], [git]) +m4_define([thunar_vfs_version], [thunar_vfs_version_major().thunar_vfs_version_minor().thunar_vfs_version_micro()ifelse(thunar_vfs_version_nano(), [], [], [.thunar_vfs_version_nano()])ifelse(thunar_vfs_version_tag(), [git], [thunar_vfs_version_tag()-thunar_vfs_version_build()], [thunar_vfs_version_tag()])]) dnl *** dnl *** Debugging support for SVN snapshots *** dnl *** -m4_define([thunar_vfs_debug_default], [ifelse(thunar_vfs_version_tag(), [svn], [yes], [minimum])]) +m4_define([thunar_vfs_debug_default], [ifelse(thunar_vfs_version_tag(), [git], [yes], [minimum])]) dnl *** dnl *** Initialize autoconf *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] We don't want the "r" before @REVISION@, do we?
Updating branch refs/heads/master to 6ed94b3aa59d58110241e6e4459bf3c8e34b98fb (commit) from ec04ebb82859f9f46955b034bab1e59aa9b2959a (commit) commit 6ed94b3aa59d58110241e6e4459bf3c8e34b98fb Author: Jannis Pohlmann Date: Fri Sep 18 04:57:00 2009 +0200 We don't want the "r" before @REVISION@, do we? configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index f00b493..07120a9 100644 --- a/configure.in.in +++ b/configure.in.in @@ -15,7 +15,7 @@ m4_define([libxfce4util_version_major], [4]) m4_define([libxfce4util_version_minor], [7]) m4_define([libxfce4util_version_micro], [0]) m4_define([libxfce4util_version_nano], []) dnl leave this empty to have no nano version -m4_define([libxfce4util_version_build], [...@revision@]) +m4_define([libxfce4util_version_build], [...@revision@]) m4_define([libxfce4util_version_tag], [git]) m4_define([libxfce4util_version], [libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(), [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), [git], [libxfce4util_version_tag()-libxfce4util_version_build()], [])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add libxfce4util linker flags to test-thunar-vfs-path.
Updating branch refs/heads/master to 94ae3ee22fd1ecfc9803b3751cd584447de3b39e (commit) from 2b8f587c289c5c25fa570c9d57651b55bd719346 (commit) commit 94ae3ee22fd1ecfc9803b3751cd584447de3b39e Author: Jannis Pohlmann Date: Fri Sep 18 04:59:56 2009 +0200 Add libxfce4util linker flags to test-thunar-vfs-path. tests/Makefile.am |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a7cf6db..57595c5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,6 +24,7 @@ test_thunar_vfs_path_DEPENDENCIES = \ test_thunar_vfs_path_LDADD = \ $(GTHREAD_LIBS) \ + $(LIBXFCE4UTIL_LIBS)\ $(top_builddir)/thunar-vfs/libthunar-vfs-$(THUNAR_VFS_VERSION_API).la clean-local: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use g_type_init() instead of gtk_init() in the test programs.
Updating branch refs/heads/master to e62bded7e82aa0d7206f95a54acaf2cce0d1ce66 (commit) from 94ae3ee22fd1ecfc9803b3751cd584447de3b39e (commit) commit e62bded7e82aa0d7206f95a54acaf2cce0d1ce66 Author: Jannis Pohlmann Date: Fri Sep 18 05:12:37 2009 +0200 Use g_type_init() instead of gtk_init() in the test programs. ThunarVFS doesn't need full GTK+ to be ready for its own initialization. The buildbot clients may have no DISPLAY set and requiring GTK+ in tests would thus break make distcheck. tests/test-thunar-vfs-path.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-thunar-vfs-path.c b/tests/test-thunar-vfs-path.c index 1ee89e4..d2d43c3 100644 --- a/tests/test-thunar-vfs-path.c +++ b/tests/test-thunar-vfs-path.c @@ -48,8 +48,8 @@ main (int argc, char **argv) if (!g_thread_supported ()) g_thread_init (NULL); - /* initialize Gtk+ (required for Thunar-VFS initialization) */ - gtk_init (&argc, &argv); + /* initialize the GType type system (required for Thunar-VFS initialization) */ + g_type_init (); /* initialize the thunar-vfs library */ thunar_vfs_init (); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add dist-hook: all to the libxfce4panel/ Makefile.am.
Updating branch refs/heads/master to 3253b0d434832be3bd5164ad3378b09c8e1196bd (commit) from 9970193c1c75c98831f3e76852a9a4ba02891fdf (commit) commit 3253b0d434832be3bd5164ad3378b09c8e1196bd Author: Jannis Pohlmann Date: Fri Sep 18 05:24:36 2009 +0200 Add dist-hook: all to the libxfce4panel/ Makefile.am. This seems to be required for the gtk-doc scanner to find the .la library file in make distcheck. libxfce4panel/Makefile.am |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am index a87dee0..e1782a0 100644 --- a/libxfce4panel/Makefile.am +++ b/libxfce4panel/Makefile.am @@ -172,4 +172,7 @@ libxfce4panel-marshal.c: libxfce4panel-marshal.h Makefile && rm -f xgen-mc endif +# required for gtk-doc +dist-hook: all + # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add dist-hook: all to the API docs Makefile.am as well.
Updating branch refs/heads/master to 26b22cdf028b0d61b2ba8a6088326111f6815d4d (commit) from 3253b0d434832be3bd5164ad3378b09c8e1196bd (commit) commit 26b22cdf028b0d61b2ba8a6088326111f6815d4d Author: Jannis Pohlmann Date: Fri Sep 18 05:30:37 2009 +0200 Add dist-hook: all to the API docs Makefile.am as well. docs/API/Makefile.am |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/docs/API/Makefile.am b/docs/API/Makefile.am index f9de0d3..a061340 100644 --- a/docs/API/Makefile.am +++ b/docs/API/Makefile.am @@ -59,3 +59,6 @@ include $(top_srcdir)/gtk-doc.make # Other files to distribute EXTRA_DIST += \ version.xml.in + +# required for gtk-doc +dist-hook: all ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix image directory path in the Galican manual Makefile.am.
Updating branch refs/heads/master to 15f0a8a996f457b0ccd2896cd111590e3eca2cba (commit) from 00ea28c6384c46cf7fda51591a2fa2b49970b6e7 (commit) commit 15f0a8a996f457b0ccd2896cd111590e3eca2cba Author: Jannis Pohlmann Date: Fri Sep 18 05:32:58 2009 +0200 Fix image directory path in the Galican manual Makefile.am. docs/manual/gl/images/Makefile.am |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/manual/gl/images/Makefile.am b/docs/manual/gl/images/Makefile.am index 9831f5d..d403716 100644 --- a/docs/manual/gl/images/Makefile.am +++ b/docs/manual/gl/images/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -imagesdir = $(datadir)/doc/Thunar/html/C/images +imagesdir = $(datadir)/doc/Thunar/html/gl/images images_DATA = \ bulk-rename.png \ file-manager-window.png \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] send errors to stderr, not stdout
Updating branch refs/heads/master to 35a36e5dc4563d3c29e9bcb742a3460e3670d2b0 (commit) from 508a4fe20284ff9ba4e4bfb51777ebcc5b033d48 (commit) commit 35a36e5dc4563d3c29e9bcb742a3460e3670d2b0 Author: Brian J. Tarricone Date: Thu Sep 17 21:27:37 2009 -0700 send errors to stderr, not stdout xfconf-query/main.c | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xfconf-query/main.c b/xfconf-query/main.c index a2b306f..fd6bdc4 100644 --- a/xfconf-query/main.c +++ b/xfconf-query/main.c @@ -277,13 +277,13 @@ main(int argc, char **argv) if(!g_option_context_parse(context, &argc, &argv, &cli_error)) { -g_print("option parsing failed: %s\n", cli_error->message); +g_printerr("option parsing failed: %s\n", cli_error->message); return 1; } if(version) { -g_print("xfconf-query %s\n", PACKAGE_VERSION); +g_print("xfconf-query %s\n", PACKAGE_VERSION); return 0; } @@ -309,31 +309,31 @@ main(int argc, char **argv) /** Check if the property is specified */ if(!property_name && !list && !export_file && !import_file && !monitor) { -g_print("No property specified, aborting...\n"); +g_printerr("No property specified, aborting...\n"); return 1; } if (create && reset) { -g_print("--create and --reset options can not be used together,\naborting...\n"); +g_printerr("--create and --reset options can not be used together,\naborting...\n"); return 1; } if ((create || reset) && (list)) { -g_print("--create and --reset options can not be used together with\n --list\naborting...\n"); +g_printerr("--create and --reset options can not be used together with\n --list\naborting...\n"); return 1; } if (import_file && export_file) { -g_print("--import and --export options can not be used together,\naborting...\n"); +g_printerr("--import and --export options can not be used together,\naborting...\n"); return 1; } if ((import_file || export_file) && (list || property_name || create || reset)) { -g_print("--import and --export options can not be used together with\n --create, --reset, --property and --list,\naborting...\n"); +g_printerr("--import and --export options can not be used together with\n --create, --reset, --property and --list,\naborting...\n"); return 1; } @@ -368,8 +368,8 @@ main(int argc, char **argv) if(!xfconf_channel_get_property(channel, property_name, &value)) { -g_print(_("Property \"%s\" does not exist on channel \"%s\".\n"), -property_name, channel_name); +g_printerr(_("Property \"%s\" does not exist on channel \"%s\".\n"), + property_name, channel_name); return 1; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] support enable/disable of screensaver and ssh-agent on startup
Updating branch refs/heads/master to 47b3b58052dbdb6424c6303989727eaac02aab41 (commit) from 630e1d4bc38c99add68936148fa49864ad52a1a9 (commit) commit 47b3b58052dbdb6424c6303989727eaac02aab41 Author: Brian J. Tarricone Date: Thu Sep 17 21:53:29 2009 -0700 support enable/disable of screensaver and ssh-agent on startup we also support different types: xscreensaver/gnome-screensaver, and gpg-agent/ssh-agent. make the default gpg-agent now. scripts/xinitrc.in.in | 104 +--- 1 files changed, 71 insertions(+), 33 deletions(-) diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in index b81339c..e1a2167 100755 --- a/scripts/xinitrc.in.in +++ b/scripts/xinitrc.in.in @@ -99,46 +99,84 @@ cat /dev/null $XRESOURCES | xrdb -nocpp -merge - # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap -# Launch xscreensaver (if available), but only as non-root user -if test $UID -gt 0 -a -z "$VNCSESSION"; then -if test x"`which xscreensaver 2>/dev/null`" != x""; then -xscreensaver -no-splash & -elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then -gnome-screensaver & -fi -fi - -# Use ssh-agent if installed and not already running. Run it separately -# so it populates the environment here, so we can clean it up later. -sshagent=`which ssh-agent` -kill_sshagent=0 -if test -z "$SSH_AGENT_PID" -a "$sshagent" -a "x$sshagent" != "xno"; then - eval `$sshagent -s` - kill_sshagent=1 -fi # Use dbus-launch if installed. if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then - dbuslaunch=`which dbus-launch` - if test x"$dbuslaunch" != x"" -a x"$dbuslaunch" != x"no"; then +if type dbus-launch >/dev/null 2>&1; then eval `$dbuslaunch --sh-syntax --exit-with-session` +# some older versions of dbus don't export the var properly +export DBUS_SESSION_BUS_ADDRESS +else +echo "Could not find dbus-launch; Xfce will not work properly" >&2 fi fi + +# launch a screensaver if enabled. do not launch if we're root or if +# we're in a VNC session. +screensaver_enabled=`xfconf-query -c xfce4-session -p /startup/screensaver/enabled` +if test $UID -gt 0 -a -z "$VNCSESSION" -a "$screensaver_enabled" != "false"; then +screensaver_type=`xfconf-query -c xfce4-session -p /startup/screensaver/type` + +case "$screensaver_type" in +xscreensaver) +xscreensaver -no-splash & +;; + +gnome-screensaver) +gnome-screensaver & +;; + +*) +if test x"`which xscreensaver 2>/dev/null`" != x""; then +xscreensaver -no-splash & +elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then +gnome-screensaver & +fi +;; +esac +fi + + +# launch gpg-agent or ssh-agent if enabled. +ssh_agent_enabled=`xfconf-query -c xfce4-session -p /startup/ssh-agent/enabled` +if test -z "$SSH_AGENT_PID" -a "$ssh_agent_enabled" != "false"; then +ssh_agent_type=`xfconf-query -c xfce4-session -p /startup/ssh-agent/type` + +case "$ssh_agent_type" in +gpg-agent) +eval `gpg-agent --daemon --enable-ssh-support` +ssh_agent_kill_cmd="kill -INT $SSH_AGENT_PID" +;; + +ssh-agent) +eval `ssh-agent -s` +ssh_agent_kill_cmd="ssh-agent -k" +;; + +*) +if type gpg-agent >/dev/null 2>&1; then +eval `gpg-agent --daemon --enable-ssh-support` +ssh_agent_kill_cmd="kill -INT $SSH_AGENT_PID" +elif type ssh-agent >/dev/null 2>&1; then +eval `ssh-agent -s` +ssh_agent_kill_cmd="ssh-agent -k" +fi +;; +esac +fi + + # Run xfce4-session if installed -xfcesm=`which xfce4-session` -case "x$xfcesm" in - x|xno*) - ;; - *) - $xfcesm +if type xfce4-session >/dev/null 2>&1; then +xfce4-session - if test $kill_sshagent -eq 1; then - eval `$sshagent -k` - fi - exit 0 - ;; -esac +if test "$ssh_agent_kill_cmd"; then +$ssh_agent_kill_cmd +fi + +exit 0 +fi ## @@ -222,8 +260,8 @@ EOF ;; esac -if test $kill_sshagent -eq 1; then - eval `$sshagent -k` +if test "$ssh_agent_kill_cmd"; then + $ssh_agent_kill_cmd fi xsetroot -bg white -fg red -solid black -cursor_name watch ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] bump version and undef RELEASE_LABEL
Updating branch refs/heads/master to 8fb01b908f61b2c806682ec61c4324e00bfa0a3a (commit) from 47b3b58052dbdb6424c6303989727eaac02aab41 (commit) commit 8fb01b908f61b2c806682ec61c4324e00bfa0a3a Author: Brian J. Tarricone Date: Thu Sep 17 22:16:23 2009 -0700 bump version and undef RELEASE_LABEL configure.in.in |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in.in b/configure.in.in index 8201e87..b1509b5 100644 --- a/configure.in.in +++ b/configure.in.in @@ -8,13 +8,13 @@ dnl Huijsmans , Benedikt Meurer dnl and Xavier MAILLARD . dnl -m4_define([xfce_utils_version], [4.6.1]) +m4_define([xfce_utils_version], [4.7.0git]) AC_INIT([xfce-utils], [xfce_utils_version], [x...@xfce.org]) AM_INIT_AUTOMAKE([dist-bzip2]) -AC_DEFINE_UNQUOTED([RELEASE_LABEL], ["Xfce 4.6"], [Optional release plain name]) -AC_SUBST(RELEASE_LABEL) +dnl AC_DEFINE_UNQUOTED([RELEASE_LABEL], ["Xfce 4.6"], [Optional release plain name]) +dnl AC_SUBST(RELEASE_LABEL) AM_CONFIG_HEADER([config.h]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] update NEWS
Updating branch refs/heads/master to a9ba02ca4174d039de5c1fddf9f685f00a3286ca (commit) from 8fb01b908f61b2c806682ec61c4324e00bfa0a3a (commit) commit a9ba02ca4174d039de5c1fddf9f685f00a3286ca Author: Brian J. Tarricone Date: Thu Sep 17 22:17:14 2009 -0700 update NEWS NEWS |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 1b8154f..2606a2d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +4.7.0 += + +- Add ability to enable/disable or change the type of screensaver and + ssh-agent using xfconf. + + 4.6.1 = ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add module.xml file with repo metadata
Updating branch refs/heads/master to ae1ac87d367688f1d7923a22497de5e0eb01f098 (commit) from 41c3cbde84193fcd6253750fe82d609a0cf48603 (commit) commit ae1ac87d367688f1d7923a22497de5e0eb01f098 Author: Diego Ongaro Date: Thu Sep 17 22:25:40 2009 -0700 Add module.xml file with repo metadata module.xml | 19 +++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/module.xml b/module.xml new file mode 100644 index 000..5e8bf1b --- /dev/null +++ b/module.xml @@ -0,0 +1,19 @@ + +http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"; + xmlns:foaf="http://xmlns.com/foaf/0.1/"; + xmlns:gnome="http://api.gnome.org/doap-extensions#"; + xmlns="http://usefulinc.com/ns/doap#";> + + xfce4-places-plugin + Quick access to folders, documents, and removable media + http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"/> + + + + Diego Ongaro + mailto:ongar...@gmail.com + ongardie + + + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add module.xml file with repo metadata
Updating branch refs/heads/master to 13de8adb22818632b4df00ec659e061ce68765ad (commit) from 03735c9d3ef36bdfbbf11e38772b4dcb62a2ccfa (commit) commit 13de8adb22818632b4df00ec659e061ce68765ad Author: Diego Ongaro Date: Thu Sep 17 22:30:33 2009 -0700 Add module.xml file with repo metadata module.xml | 19 +++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/module.xml b/module.xml new file mode 100644 index 000..6036c8a --- /dev/null +++ b/module.xml @@ -0,0 +1,19 @@ + +http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"; + xmlns:foaf="http://xmlns.com/foaf/0.1/"; + xmlns:gnome="http://api.gnome.org/doap-extensions#"; + xmlns="http://usefulinc.com/ns/doap#";> + + xfce4-datetime-plugin + Displays the date and time and shows a calendar when clicked + http://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"/> + + + + Diego Ongaro + mailto:ongar...@gmail.com + ongardie + + + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits