[nautilus-actions] Make all sources ansi-compliant
- From: Pierre Wieser <pwieser src gnome org>
- To: svn-commits-list gnome org
- Subject: [nautilus-actions] Make all sources ansi-compliant
- Date: Sat, 16 May 2009 20:21:41 -0400 (EDT)
commit de08e212890d23e30ad9460146d34a60c8fcfc42
Author: Pierre Wieser <pwieser trychlos org>
Date: Sun May 17 02:24:46 2009 +0200
Make all sources ansi-compliant
---
ChangeLog | 10 ++
README | 7 +-
configure.ac | 2 +-
.../nautilus-actions-config-gconf-private.h | 47 ++++---
.../nautilus-actions-config-gconf-reader.c | 19 ++-
.../nautilus-actions-config-gconf-reader.h | 37 +++--
.../nautilus-actions-config-gconf-writer.c | 43 ++++---
.../nautilus-actions-config-gconf-writer.h | 37 +++--
.../nautilus-actions-config-gconf.c | 49 ++++---
.../nautilus-actions-config-gconf.h | 37 +++--
.../nautilus-actions-config-schema-reader.c | 65 +++++----
.../nautilus-actions-config-schema-reader.h | 40 +++---
.../nautilus-actions-config-schema-writer.c | 102 +++++++------
.../nautilus-actions-config-schema-writer.h | 38 +++--
libnautilus-actions/nautilus-actions-config.c | 16 +-
libnautilus-actions/nautilus-actions-config.h | 87 +++++++-----
m4/{cmdline-tools.m4 => nact-cmdline-tools.m4} | 0
m4/nact-compiler-flags.m4 | 153 ++++++++++++++++++++
m4/{nautilus-extdir.m4 => nact-nautilus-extdir.m4} | 0
nact/nact-editor.c | 7 +-
nact/nact-editor.h | 36 +++--
nact/nact-import-export.c | 7 +-
nact/nact-import-export.h | 40 +++---
nact/nact-prefs.c | 59 +++++----
nact/nact-prefs.h | 37 +++--
nact/nact-profile-editor.c | 26 ++--
nact/nact-profile-editor.h | 35 +++--
nact/nact-utils.c | 27 ++--
nact/nact-utils.h | 39 +++--
nact/nact.c | 1 +
nact/nact.h | 39 +++---
plugin/nautilus-actions-module.c | 33 +++--
plugin/nautilus-actions-test.c | 88 +++++++-----
plugin/nautilus-actions-test.h | 38 +++--
plugin/nautilus-actions-utils.c | 76 ++++++-----
plugin/nautilus-actions-utils.h | 38 +++--
plugin/nautilus-actions.c | 31 +++--
plugin/nautilus-actions.h | 40 +++---
utils/nautilus-actions-check-actions-change.c | 13 +-
utils/nautilus-actions-new-config.c | 41 +++---
utils/nautilus-actions-tools-utils.c | 1 +
utils/nautilus-actions-tools-utils.h | 39 +++--
42 files changed, 973 insertions(+), 607 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ff35929..b6eb401 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-05-17 Pierre Wieser <pwieser trychlos org>
+
+ Make all sources ansi-compliant
+
+ * configure.ac: use NACT_GNOME_COMPILE_WARNINGS (see #582860)
+
+ * m4/nact-compiler-flags: creation
+
+ * *.c, *.h: update almost all sources to be ansi-compliant
+
2009-05-16 Pierre Wieser <pwieser trychlos org>
* configure.ac: created from configure.in
diff --git a/README b/README
index 8be4c5f..2979760 100644
--- a/README
+++ b/README
@@ -1,6 +1 @@
-Project: Nautilus-actions
-Homepage: http://www.grumz.net/node/8
-Bug Tracker : http://bugzilla.gnome.org/simple-bug-guide.cgi?product=nautilus-actions
-Officials Releases: http://www.grumz.net/taxonomy/term/6/9
-
-Please read INSTALL, for installation instructions.
+cf. nautilus-actions.doap
diff --git a/configure.ac b/configure.ac
index a06af49..bc48c95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,7 @@ AC_PROG_MAKE_SET
# Gnome stuff
GNOME_COMMON_INIT
GNOME_MAINTAINER_MODE_DEFINES
-GNOME_COMPILE_WARNINGS([error])
+NACT_GNOME_COMPILE_WARNINGS([error],[-ansi])
AC_SUBST([AM_CPPFLAGS],["${AM_CPPFLAGS} ${DISABLE_DEPRECATED}"])
AC_SUBST([AM_CFLAGS],["${AM_CFLAGS} ${WARN_CFLAGS}"])
diff --git a/libnautilus-actions/nautilus-actions-config-gconf-private.h b/libnautilus-actions/nautilus-actions-config-gconf-private.h
index 1aa651f..4916c89 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf-private.h
+++ b/libnautilus-actions/nautilus-actions-config-gconf-private.h
@@ -1,42 +1,53 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
#include <glib/gi18n.h>
+#ifndef __NAUTILUS_ACTIONS_CONFIG_GCONF_PRIVATE_H__
+#define __NAUTILUS_ACTIONS_CONFIG_GCONF_PRIVATE_H__
+
#ifdef N_
#undef N_
#endif
#define N_(String) String
-// GConf general information
+/* GConf general information */
#define ACTIONS_SCHEMA_PREFIX "/schemas"
#define ACTIONS_CONFIG_DIR NAUTILUS_ACTIONS_CONFIG_GCONF_BASEDIR "/configurations"
#define ACTIONS_CONFIG_NOTIFY_KEY ACTIONS_CONFIG_DIR "/action_change_state"
#define ACTIONS_SCHEMA_OWNER "nautilus-actions"
#define ACTIONS_PROFILE_PREFIX "profile-"
-// GConf XML element names
+/* GConf XML element names */
#define NA_GCONF_XML_ROOT "gconfschemafile"
#define NA_GCONF_XML_SCHEMA_LIST "schemalist"
#define NA_GCONF_XML_SCHEMA_ENTRY "schema"
@@ -50,7 +61,7 @@
#define NA_GCONF_XML_SCHEMA_DFT "default"
#define NA_GCONF_XML_SCHEMA_LIST_TYPE "list_type"
-// GConf key names :
+/* GConf key names : */
#define ACTION_LABEL_ENTRY "label"
#define ACTION_TOOLTIP_ENTRY "tooltip"
#define ACTION_ICON_ENTRY "icon"
@@ -66,9 +77,7 @@
#define ACTION_SCHEMES_ENTRY "schemes"
#define ACTION_VERSION_ENTRY "version"
-// GConf description strings :
-
-
+/* GConf description strings : */
#define ACTION_LABEL_DESC_SHORT _("The label of the menu item")
#define ACTION_LABEL_DESC_LONG _("The label of the menu item that will appear in the Nautilus popup menu when the selection matches the appearance condition settings")
#define ACTION_TOOLTIP_DESC_SHORT _("The tooltip of the menu item")
@@ -90,7 +99,7 @@
#define ACTION_ISFILE_ISDIR_COMBINAITION_DESC_LONG N_("The valid combinations are:\n\nisfile=TRUE and isdir=FALSE: the selection may hold only files\nisfile=FALSE and isdir=TRUE: the selection may hold only folders\nisfile=TRUE and isdir=TRUE: the selection may hold both files and folders\nisfile=FALSE and isdir=FALSE: this is an invalid combination (your configuration will never appear)")
#define ACTION_ISFILE_DESC_SHORT _("'true' if the selection can have files, 'false' otherwise")
/* i18n notes: The last space is important if your language add a space after a period sign "." because a string is concatenated after this string */
-#define ACTION_ISFILE_DESC_LONG N_("This setting is tied in with the 'isdir' setting. ") ACTION_ISFILE_ISDIR_COMBINAITION_DESC_LONG
+#define ACTION_ISFILE_DESC_LONG N_("This setting is tied in with the 'isdir' setting. ") ACTION_ISFILE_ISDIR_COMBINAITION_DESC_LONG
#define ACTION_ISDIR_DESC_SHORT _("'true' if the selection can have folders, 'false' otherwise")
/* i18n notes: The last space is important if your language add a space after a period sign "." because a string is concatenated after this string */
#define ACTION_ISDIR_DESC_LONG N_("This setting is tied in with the 'isfile' setting. ") ACTION_ISFILE_ISDIR_COMBINAITION_DESC_LONG
@@ -100,3 +109,5 @@
#define ACTION_SCHEMES_DESC_LONG _("Defines the list of valid GnomeVFS schemes to be matched against the selected items. The GnomeVFS scheme is the protocol used to access the files. The keyword to use is the one used in the GnomeVFS URI.\n\nExamples of GnomeVFS URI include: \nfile:///tmp/foo.txt\nsftp:///root test example net/tmp/foo.txt\n\nThe most common schemes are:\n\n'file': local files\n'sftp': files accessed via SSH\n'ftp': files accessed via FTP\n'smb': files accessed via Samba (Windows share)\n'dav': files accessed via WebDav\n\nAll GnomeVFS schemes used by Nautilus can be used here.")
#define ACTION_VERSION_DESC_SHORT _("The version of the configuration format")
#define ACTION_VERSION_DESC_LONG _("The version of the configuration format that will be used to manage backward compatibility")
+
+#endif /* __NAUTILUS_ACTIONS_CONFIG_GCONF_PRIVATE_H__ */
diff --git a/libnautilus-actions/nautilus-actions-config-gconf-reader.c b/libnautilus-actions/nautilus-actions-config-gconf-reader.c
index a75a4b3..b6e74d0 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf-reader.c
+++ b/libnautilus-actions/nautilus-actions-config-gconf-reader.c
@@ -27,6 +27,7 @@
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
@@ -141,23 +142,23 @@ actions_changed_cb (GConfClient *client,
const gchar* notify_value = gconf_value_get_string (value);
const gchar* uuid = notify_value + 4;
- // Get the modified action from the internal list if any //
+ /* Get the modified action from the internal list if any */
NautilusActionsConfigAction *old_action = nautilus_actions_config_get_action (config, uuid);
- // Get the new version from GConf if any
+ /* Get the new version from GConf if any */
NautilusActionsConfigAction *new_action = nautilus_actions_config_gconf_get_action (NAUTILUS_ACTIONS_CONFIG_GCONF (config), uuid);
- // If modified action is unknown internally
+ /* If modified action is unknown internally */
if (old_action == NULL)
{
if (new_action != NULL)
{
- // new action //
+ /* new action */
nautilus_actions_config_add_action (config, new_action, NULL);
}
else
{
- // This case should not happen
+ /* This case should not happen */
g_assert_not_reached ();
}
}
@@ -165,17 +166,19 @@ actions_changed_cb (GConfClient *client,
{
if (new_action != NULL)
{
- // action modified //
+ /* action modified */
nautilus_actions_config_update_action (config, new_action);
}
else
{
- // action removed //
+ /* action removed */
nautilus_actions_config_remove_action (config, uuid);
}
}
- // Add & change handler duplicate actions before adding them, so we can free the new action
+ /* Add & change handler duplicate actions before adding them,
+ * so we can free the new action
+ */
nautilus_actions_config_action_free (new_action);
}
diff --git a/libnautilus-actions/nautilus-actions-config-gconf-reader.h b/libnautilus-actions/nautilus-actions-config-gconf-reader.h
index 2361bec..e4bf060 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf-reader.h
+++ b/libnautilus-actions/nautilus-actions-config-gconf-reader.h
@@ -1,28 +1,36 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef _NAUTILUS_ACTIONS_CONFIG_GCONF_READER_H_
-#define _NAUTILUS_ACTIONS_CONFIG_GCONF_READER_H_
+#ifndef __NAUTILUS_ACTIONS_CONFIG_GCONF_READER_H__
+#define __NAUTILUS_ACTIONS_CONFIG_GCONF_READER_H__
#include <glib/glist.h>
#include <glib-object.h>
@@ -58,5 +66,4 @@ NautilusActionsConfigGconfReader *nautilus_actions_config_gconf_reader_get
G_END_DECLS
-#endif
-// vim:ts=3:sw=3:tw=1024:cin
+#endif /* __NAUTILUS_ACTIONS_CONFIG_GCONF_READER_H__ */
diff --git a/libnautilus-actions/nautilus-actions-config-gconf-writer.c b/libnautilus-actions/nautilus-actions-config-gconf-writer.c
index c9a6eb4..a869894 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf-writer.c
+++ b/libnautilus-actions/nautilus-actions-config-gconf-writer.c
@@ -1,24 +1,32 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
@@ -31,7 +39,7 @@ static GObjectClass *parent_class = NULL;
static void
nautilus_actions_config_gconf_notify_readers (GConfClient *client, const gchar* uuid)
{
- /* The Key value format is XXX:YYYY-YYYY-... where XXX is an number incremented to make key
+ /* The Key value format is XXX:YYYY-YYYY-... where XXX is an number incremented to make key
* effectively changed each time and YYYY-YYYY-... is the modified uuid */
int new_incr = 0;
@@ -85,7 +93,7 @@ save_action (NautilusActionsConfig *self, NautilusActionsConfigAction *action)
gconf_client_set_string (config->conf_client, key, action->icon, NULL);
g_free (key);
- // Unset old 1.x keys (if needed)
+ /* Unset old 1.x keys (if needed) */
key = g_strdup_printf ("%s/%s", action->conf_section, ACTION_PATH_ENTRY);
gconf_client_unset (config->conf_client, key, NULL);
g_free (key);
@@ -122,7 +130,7 @@ save_action (NautilusActionsConfig *self, NautilusActionsConfigAction *action)
gconf_client_unset (config->conf_client, key, NULL);
g_free (key);
- // Set new keys in 2.x format
+ /* Set new keys in 2.x format */
profile_list = nautilus_actions_config_action_get_all_profile_names (action);
for (iter = profile_list; iter; iter = iter->next)
@@ -175,7 +183,7 @@ save_action (NautilusActionsConfig *self, NautilusActionsConfigAction *action)
gconf_client_set_string (config->conf_client, key, action->version, NULL);
g_free (key);
- // Send notification to GConf Readers
+ /* Send notification to GConf Readers */
nautilus_actions_config_gconf_notify_readers (config->conf_client, action->uuid);
return TRUE;
}
@@ -190,8 +198,8 @@ remove_action (NautilusActionsConfig *self, NautilusActionsConfigAction* action)
NautilusActionsConfigGconf* config = NAUTILUS_ACTIONS_CONFIG_GCONF (self);
retv = gconf_client_recursive_unset (config->conf_client, action->conf_section, 0, NULL);
-
- // Send notification to GConf Readers
+
+ /* Send notification to GConf Readers */
nautilus_actions_config_gconf_notify_readers (config->conf_client, action->uuid);
return retv;
}
@@ -265,4 +273,3 @@ nautilus_actions_config_gconf_writer_get (void)
return NAUTILUS_ACTIONS_CONFIG_GCONF_WRITER (g_object_ref (G_OBJECT (config)));
}
-// vim:ts=3:sw=3:tw=1024:cin
diff --git a/libnautilus-actions/nautilus-actions-config-gconf-writer.h b/libnautilus-actions/nautilus-actions-config-gconf-writer.h
index 41c3022..2785c99 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf-writer.h
+++ b/libnautilus-actions/nautilus-actions-config-gconf-writer.h
@@ -1,28 +1,36 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef _NAUTILUS_ACTIONS_CONFIG_GCONF_WRITER_H_
-#define _NAUTILUS_ACTIONS_CONFIG_GCONF_WRITER_H_
+#ifndef __NAUTILUS_ACTIONS_CONFIG_GCONF_WRITER_H__
+#define __NAUTILUS_ACTIONS_CONFIG_GCONF_WRITER_H__
#include <glib/glist.h>
#include <glib-object.h>
@@ -56,5 +64,4 @@ NautilusActionsConfigGconfWriter *nautilus_actions_config_gconf_writer_get
G_END_DECLS
-#endif
-// vim:ts=3:sw=3:tw=1024:cin
+#endif /* __NAUTILUS_ACTIONS_CONFIG_GCONF_WRITER_H__ */
diff --git a/libnautilus-actions/nautilus-actions-config-gconf.c b/libnautilus-actions/nautilus-actions-config-gconf.c
index 914b765..66f1abe 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf.c
+++ b/libnautilus-actions/nautilus-actions-config-gconf.c
@@ -1,24 +1,32 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
@@ -62,7 +70,6 @@ nautilus_actions_config_gconf_class_init (NautilusActionsConfigGconfClass *klass
config_class->save_action = NULL;
config_class->remove_action = NULL;
-
}
static gchar *
@@ -139,9 +146,9 @@ actions_changed_cb (GConfClient *client,
}*/
-NautilusActionsConfigAction*
+NautilusActionsConfigAction*
nautilus_actions_config_gconf_get_action (NautilusActionsConfigGconf* config, const gchar* uuid)
-{
+{
g_assert (NAUTILUS_ACTIONS_IS_CONFIG_GCONF (config));
g_return_val_if_fail (NAUTILUS_ACTIONS_IS_CONFIG_GCONF (config), NULL);
@@ -158,7 +165,7 @@ nautilus_actions_config_gconf_get_action (NautilusActionsConfigGconf* config, co
NautilusActionsConfigAction *action = nautilus_actions_config_action_new ();
stmp = get_action_string_value (config->conf_client, gconf_action_dir, ACTION_LABEL_ENTRY);
- if (!stmp)
+ if (!stmp)
{
nautilus_actions_config_action_free (action);
return NULL;
@@ -182,7 +189,7 @@ nautilus_actions_config_gconf_get_action (NautilusActionsConfigGconf* config, co
{
action_profile = nautilus_actions_config_action_profile_new ();
- //--> manage backward compatibility
+ /* --> manage backward compatibility */
stmp = get_action_string_value (config->conf_client, gconf_action_dir, ACTION_PATH_ENTRY);
nautilus_actions_config_action_profile_set_path (action_profile, stmp);
g_free (stmp);
@@ -299,7 +306,7 @@ nautilus_actions_config_gconf_get_action (NautilusActionsConfigGconf* config, co
static gchar* get_action_uuid_from_key (const gchar* key)
{
g_return_val_if_fail (g_str_has_prefix (key, ACTIONS_CONFIG_DIR), NULL);
-
+
gchar* uuid = g_strdup (key + strlen (ACTIONS_CONFIG_DIR "/"));
gchar* pos = g_strstr_len (uuid, strlen (uuid), "/");
if (pos != NULL)
@@ -314,14 +321,14 @@ static void
nautilus_actions_config_gconf_init (NautilusActionsConfigGconf *config, NautilusActionsConfigGconfClass *klass)
{
GSList* node;
-
+
g_type_init ();
config->conf_client = gconf_client_get_default ();
/* load all defined actions */
GSList* list = gconf_client_all_dirs (config->conf_client, ACTIONS_CONFIG_DIR, NULL);
- for (node = list; node != NULL; node = node->next)
+ for (node = list; node != NULL; node = node->next)
{
gchar* uuid = get_action_uuid_from_key ((gchar*)node->data);
NautilusActionsConfigAction *action = nautilus_actions_config_gconf_get_action (config, uuid);
@@ -332,7 +339,7 @@ nautilus_actions_config_gconf_init (NautilusActionsConfigGconf *config, Nautilus
g_hash_table_insert (NAUTILUS_ACTIONS_CONFIG (config)->actions, g_strdup (action->uuid), action);
}
- // Free the gconf dir string once used
+ /* Free the gconf dir string once used */
g_free (node->data);
}
@@ -374,5 +381,3 @@ nautilus_actions_config_gconf_get (void)
return NAUTILUS_ACTIONS_CONFIG_GCONF (g_object_ref (G_OBJECT (config)));
}
-
-// vim:ts=3:sw=3:tw=1024:cin
diff --git a/libnautilus-actions/nautilus-actions-config-gconf.h b/libnautilus-actions/nautilus-actions-config-gconf.h
index 57ca46e..1e3cd80 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf.h
+++ b/libnautilus-actions/nautilus-actions-config-gconf.h
@@ -1,28 +1,36 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef _NAUTILUS_ACTIONS_CONFIG_GCONF_H_
-#define _NAUTILUS_ACTIONS_CONFIG_GCONF_H_
+#ifndef __NAUTILUS_ACTIONS_CONFIG_GCONF_H__
+#define __NAUTILUS_ACTIONS_CONFIG_GCONF_H__
#include <glib/glist.h>
#include <glib-object.h>
@@ -61,5 +69,4 @@ NautilusActionsConfigAction* nautilus_actions_config_gconf_get_action (NautilusA
G_END_DECLS
-#endif
-// vim:ts=3:sw=3:tw=1024:cin
+#endif /* __NAUTILUS_ACTIONS_CONFIG_GCONF_H__ */
diff --git a/libnautilus-actions/nautilus-actions-config-schema-reader.c b/libnautilus-actions/nautilus-actions-config-schema-reader.c
index 578cfcc..e9d9636 100644
--- a/libnautilus-actions/nautilus-actions-config-schema-reader.c
+++ b/libnautilus-actions/nautilus-actions-config-schema-reader.c
@@ -27,6 +27,7 @@
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
@@ -188,13 +189,17 @@ static gboolean nautilus_actions_config_schema_reader_profile_checking_check (GH
ProfileChecking* check = NULL;
printf ("test check 1\n");
- // i18n notes: will be displayed in an error dialog concatenated to another error message
+ /* i18n notes: will be displayed in an error dialog concatenated
+ * to another error message
+ */
error_message_str = g_string_new (_(" and some profiles are incomplete: "));
g_hash_table_foreach (profile_check_list, (GHFunc)get_hash_keys, &profile_list);
printf ("test check 2\n");
- // Check if the default profile has been found in the xml file, if not remove
- // it (added automatically by nautilus_actions_config_action_new_default() function)
+ /* Check if the default profile has been found in the xml file,
+ * if not remove it (added automatically by nautilus_actions_config
+ * action_new_default() function)
+ */
check = g_hash_table_lookup (profile_check_list, NAUTILUS_ACTIONS_DEFAULT_PROFILE_NAME);
printf ("test check 3 : <%p>\n", check);
@@ -208,14 +213,18 @@ static gboolean nautilus_actions_config_schema_reader_profile_checking_check (GH
}
printf ("test check 4\n");
- // i18n notes: this is a list separator, it can have more than one character (ie, in French it will be ", ")
+ /* i18n notes: this is a list separator, it can have more than one
+ * character (ie, in French it will be ", ")
+ */
list_separator = g_strdup (_(","));
printf ("test check 5\n");
if (g_slist_length (profile_list) >= 1)
{
- // There is at least one profile to check so we'll enter the next loop and
- // so we set the return val to TRUE to make the local check works
+ /* There is at least one profile to check so we'll enter the
+ * next loop and so we set the return val to TRUE to make the
+ * local check works
+ */
retv = TRUE;
}
@@ -240,7 +249,7 @@ static gboolean nautilus_actions_config_schema_reader_profile_checking_check (GH
local_retv = TRUE;
}
- //else if (g_ascii_strcasecmp (version, NAUTILUS_ACTIONS_CONFIG_VERSION) == 0 &&
+ /*else if (g_ascii_strcasecmp (version, NAUTILUS_ACTIONS_CONFIG_VERSION) == 0 &&*/
else if (g_ascii_strcasecmp (version, "1.1") >= 0 &&
check->is_schemes_ok && check->is_multiple_ok &&
check->is_matchcase_ok && check->is_mimetypes_ok &&
@@ -288,7 +297,7 @@ static gboolean nautilus_actions_config_schema_reader_profile_checking_check (GH
g_string_append_printf (missing_keys , "%s%s", ACTION_PATH_ENTRY, list_separator);
count++;
}
- //if (g_ascii_strcasecmp (action->version, NAUTILUS_ACTIONS_CONFIG_VERSION) == 0)
+ /*if (g_ascii_strcasecmp (action->version, NAUTILUS_ACTIONS_CONFIG_VERSION) == 0)*/
if (g_ascii_strcasecmp (version, "1.1") >= 0)
{
if (!check->is_matchcase_ok)
@@ -302,12 +311,14 @@ static gboolean nautilus_actions_config_schema_reader_profile_checking_check (GH
count++;
}
}
- // Remove the last separator
+ /* Remove the last separator */
g_string_truncate (missing_keys, (missing_keys->len - strlen (list_separator)));
tmp = g_string_free (missing_keys, FALSE);
- // i18n notes: will be displayed in an error dialog concatenated to another error message
+ /* i18n notes: will be displayed in an error dialog
+ * concatenated to another error message
+ */
g_string_append_printf (error_message_str, ngettext ("%s (one missing key: %s)%s", "%s (missing keys: %s)%s", count), profile_name, tmp, list_separator);
g_free (tmp);
}
@@ -318,7 +329,7 @@ static gboolean nautilus_actions_config_schema_reader_profile_checking_check (GH
}
g_slist_free (profile_list);
- // Remove the last separator
+ /* Remove the last separator */
g_string_truncate (error_message_str, (error_message_str->len - strlen (list_separator)));
tmp = g_string_free (error_message_str, FALSE);
@@ -460,7 +471,7 @@ static gboolean nautilus_actions_config_schema_reader_action_parse_schema_key (x
NA_GCONF_XML_SCHEMA_LOCALE,
strlen (NA_GCONF_XML_SCHEMA_LOCALE)) == 0)
{
- //--> FIXME: Manage $lang attribute (at the moment it only take the first found)
+ /* --> FIXME: Manage $lang attribute (at the moment it only take the first found) */
is_default_value_ok = nautilus_actions_config_schema_reader_action_parse_schema_key_locale (iter, value);
}
}
@@ -484,7 +495,7 @@ static GSList* schema_string_to_gslist (const gchar* str_list_value)
gchar** str_list_splited = NULL;
int i;
- //--> First remove the brackets []
+ /* --> First remove the brackets [] */
while (*ptr != '[')
{
ptr++;
@@ -506,7 +517,7 @@ static GSList* schema_string_to_gslist (const gchar* str_list_value)
}
}
- //--> split the result and fill the list
+ /* --> split the result and fill the list */
if (str_list != NULL)
{
str_list_splited = g_strsplit (str_list, ",", -1);
@@ -677,7 +688,7 @@ static gboolean nautilus_actions_config_schema_reader_action_fill (NautilusActio
action_profile = nautilus_actions_config_action_get_or_create_profile (action, profile_name);
if (action_profile->desc_name == NULL)
{
- // if the profile descriptiv name is not set, set it to the profile name
+ /* if the profile descriptiv name is not set, set it to the profile name */
nautilus_actions_config_action_profile_set_desc_name (action_profile, profile_name);
}
printf ("test parse 6\n");
@@ -686,7 +697,7 @@ static gboolean nautilus_actions_config_schema_reader_action_fill (NautilusActio
}
else
{
- // i18n notes: will be displayed in an error dialog
+ /* i18n notes: will be displayed in an error dialog */
g_set_error (error, NAUTILUS_ACTIONS_SCHEMA_READER_ERROR, NAUTILUS_ACTIONS_SCHEMA_READER_ERROR_FAILED, _("This XML file is not a valid Nautilus-actions config file (found <%s> element instead of <%s>)"), (gchar*)iter->name, NA_GCONF_XML_SCHEMA_ENTRY);
}
}
@@ -700,7 +711,7 @@ static gboolean nautilus_actions_config_schema_reader_action_fill (NautilusActio
printf ("test parse 10\n");
if (g_ascii_strcasecmp (action->version, NAUTILUS_ACTIONS_CONFIG_VERSION) > 0)
{
- // if the version of the file is greater than the current one, we reject the file
+ /* if the version of the file is greater than the current one, we reject the file */
g_set_error (error, NAUTILUS_ACTIONS_SCHEMA_READER_ERROR, NAUTILUS_ACTIONS_SCHEMA_READER_ERROR_FAILED, _("This config file is more recent than this version of Nautilus-actions can support. Please upgrade Nautilus-actions to the latest version if you want to be able to import it (File version: %s (max supported version : %s))"), action->version, NAUTILUS_ACTIONS_CONFIG_VERSION);
}
else if (g_ascii_strcasecmp (action->version, "1.0") == 0 &&
@@ -721,7 +732,9 @@ static gboolean nautilus_actions_config_schema_reader_action_fill (NautilusActio
missing_keys = g_string_new ("");
count = 0;
printf ("error 1\n");
- // i18n notes: this is a list separator, it can have more than one character (ie, in French it will be ", ")
+ /* i18n notes: this is a list separator, it can have more
+ * than one character (ie, in French it will be ", ")
+ */
list_separator = g_strdup (_(","));
if (!is_icon_ok)
{
@@ -738,7 +751,7 @@ static gboolean nautilus_actions_config_schema_reader_action_fill (NautilusActio
g_string_append_printf (missing_keys , "%s%s", ACTION_LABEL_ENTRY, list_separator);
count++;
}
- // Remove the last separator
+ /* Remove the last separator */
g_string_truncate (missing_keys, (missing_keys->len - strlen (list_separator)));
printf ("error 2 (count: %d)\n", count);
@@ -748,7 +761,7 @@ static gboolean nautilus_actions_config_schema_reader_action_fill (NautilusActio
error_msg = g_strdup ("");
}
- // i18n notes: will be displayed in an error dialog
+ /* i18n notes: will be displayed in an error dialog */
g_set_error (error, NAUTILUS_ACTIONS_SCHEMA_READER_ERROR, NAUTILUS_ACTIONS_SCHEMA_READER_ERROR_FAILED, ngettext ("This XML file is not a valid Nautilus-actions config file (missing key: %s)%s", "This XML file is not a valid Nautilus-actions config file (missing keys: %s)%s", count), tmp, error_msg);
g_free (tmp);
}
@@ -756,8 +769,8 @@ static gboolean nautilus_actions_config_schema_reader_action_fill (NautilusActio
}
else if (error != NULL && *error != NULL)
{
- // No error occured but we have not found the "version" gconf key
- // i18n notes: will be displayed in an error dialog
+ /* No error occured but we have not found the "version" gconf key */
+ /* i18n notes: will be displayed in an error dialog */
g_set_error (error, NAUTILUS_ACTIONS_SCHEMA_READER_ERROR, NAUTILUS_ACTIONS_SCHEMA_READER_ERROR_FAILED, _("This XML file is not a valid Nautilus-actions config file (missing key: %s)"), ACTION_VERSION_ENTRY);
}
@@ -821,7 +834,7 @@ gboolean nautilus_actions_config_schema_reader_parse_file (NautilusActionsConfig
}
else
{
- // i18n notes: will be displayed in an error dialog
+ /* i18n notes: will be displayed in an error dialog */
g_set_error (error, NAUTILUS_ACTIONS_SCHEMA_READER_ERROR, NAUTILUS_ACTIONS_SCHEMA_READER_ERROR_FAILED, _("This XML file is not a valid Nautilus-actions config file (found <%s> element instead of <%s>)"), (gchar*)iter->name, NA_GCONF_XML_SCHEMA_LIST);
no_error = FALSE;
}
@@ -831,7 +844,7 @@ gboolean nautilus_actions_config_schema_reader_parse_file (NautilusActionsConfig
}
else
{
- // i18n notes: will be displayed in an error dialog
+ /* i18n notes: will be displayed in an error dialog */
g_set_error (error, NAUTILUS_ACTIONS_SCHEMA_READER_ERROR, NAUTILUS_ACTIONS_SCHEMA_READER_ERROR_FAILED, _("This XML file is not a valid Nautilus-actions config file (root node is <%s> instead of <%s>)"), (gchar*)iter->name, NA_GCONF_XML_ROOT);
}
xmlFreeDoc (doc);
@@ -854,7 +867,7 @@ save_action (NautilusActionsConfig *self, NautilusActionsConfigAction *action)
gboolean retv = TRUE;
g_return_val_if_fail (NAUTILUS_ACTIONS_IS_CONFIG_SCHEMA_READER (self), FALSE);
-// NautilusActionsConfigSchemaReader* config = NAUTILUS_ACTIONS_CONFIG_SCHEMA_READER (self);
+ /*NautilusActionsConfigSchemaReader* config = NAUTILUS_ACTIONS_CONFIG_SCHEMA_READER (self);*/
return retv;
}
@@ -864,7 +877,7 @@ remove_action (NautilusActionsConfig *self, NautilusActionsConfigAction* action)
{
g_return_val_if_fail (NAUTILUS_ACTIONS_IS_CONFIG_SCHEMA_READER (self), FALSE);
-// NautilusActionsConfigSchemaReader* config = NAUTILUS_ACTIONS_CONFIG_SCHEMA_READER (self);
+ /*NautilusActionsConfigSchemaReader* config = NAUTILUS_ACTIONS_CONFIG_SCHEMA_READER (self);*/
return TRUE;
}
diff --git a/libnautilus-actions/nautilus-actions-config-schema-reader.h b/libnautilus-actions/nautilus-actions-config-schema-reader.h
index 11ec69e..b204c4b 100644
--- a/libnautilus-actions/nautilus-actions-config-schema-reader.h
+++ b/libnautilus-actions/nautilus-actions-config-schema-reader.h
@@ -1,28 +1,36 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef _NAUTILUS_ACTIONS_CONFIG_SCHEMA_READER_H_
-#define _NAUTILUS_ACTIONS_CONFIG_SCHEMA_READER_H_
+#ifndef __NAUTILUS_ACTIONS_CONFIG_SCHEMA_READER_H__
+#define __NAUTILUS_ACTIONS_CONFIG_SCHEMA_READER_H__
#include <glib/glist.h>
#include <glib-object.h>
@@ -31,7 +39,7 @@
G_BEGIN_DECLS
-// Error Data
+/* Error Data */
#define NAUTILUS_ACTIONS_SCHEMA_READER_ERROR g_quark_from_string ("nautilus_actions_config_schema_reader")
typedef enum
@@ -64,6 +72,4 @@ gboolean nautilus_actions_config_schema_reader_parse_file (NautilusActionsConfig
G_END_DECLS
-#endif
-
-// vim:ts=3:sw=3:tw=1024:cin
+#endif /* __NAUTILUS_ACTIONS_CONFIG_SCHEMA_READER_H__ */
diff --git a/libnautilus-actions/nautilus-actions-config-schema-writer.c b/libnautilus-actions/nautilus-actions-config-schema-writer.c
index 425371e..2a82abc 100644
--- a/libnautilus-actions/nautilus-actions-config-schema-writer.c
+++ b/libnautilus-actions/nautilus-actions-config-schema-writer.c
@@ -1,24 +1,32 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
@@ -52,28 +60,28 @@ static void nautilus_actions_config_schema_writer_set_property (GObject *object,
{
NautilusActionsConfigSchemaWriter* self = NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER (object);
- switch (property_id)
+ switch (property_id)
{
case NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER_SAVE_PATH:
if (self->save_path)
{
g_free (self->save_path);
- }
+ }
self->save_path = g_value_dup_string (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
- }
+ }
}
static void nautilus_actions_config_schema_writer_get_property (GObject *object, guint property_id,
GValue* value, GParamSpec *pspec)
{
-
+
NautilusActionsConfigSchemaWriter* self = NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER (object);
- switch (property_id)
+ switch (property_id)
{
case NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER_SAVE_PATH:
g_value_set_string (value, self->save_path);
@@ -81,12 +89,12 @@ static void nautilus_actions_config_schema_writer_get_property (GObject *object,
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
- }
+ }
}
-static void create_schema_entry (xmlDocPtr doc, xmlNodePtr list_node, xmlChar* key_path,
- char* type, const char* value,
- char* short_desc, char* long_desc,
+static void create_schema_entry (xmlDocPtr doc, xmlNodePtr list_node, xmlChar* key_path,
+ char* type, const char* value,
+ char* short_desc, char* long_desc,
gboolean is_l10n_value)
{
xmlNodePtr schema_node = NULL;
@@ -111,20 +119,20 @@ static void create_schema_entry (xmlDocPtr doc, xmlNodePtr list_node, xmlChar* k
value_root_node = schema_node;
if (is_l10n_value)
{
- // if the default value must be localized, put it in the <locale> element
+ /* if the default value must be localized, put it in the <locale> element */
value_root_node = locale_node;
}
- // Encode special chars <, >, &, ...
+ /* Encode special chars <, >, &, ... */
encoded_content = xmlEncodeSpecialChars (doc, BAD_CAST value);
xmlNewChild (value_root_node, NULL, BAD_CAST NA_GCONF_XML_SCHEMA_DFT, encoded_content);
xmlFree (encoded_content);
- // Encode special chars <, >, &, ...
+ /* Encode special chars <, >, &, ... */
encoded_content = xmlEncodeSpecialChars (doc, BAD_CAST short_desc);
xmlNewChild (locale_node, NULL, BAD_CAST NA_GCONF_XML_SCHEMA_SHORT, encoded_content);
xmlFree (encoded_content);
-
- // Encode special chars <, >, &, ...
+
+ /* Encode special chars <, >, &, ... */
encoded_content = xmlEncodeSpecialChars (doc, BAD_CAST long_desc);
xmlNewChild (locale_node, NULL, BAD_CAST NA_GCONF_XML_SCHEMA_LONG, encoded_content);
xmlFree (encoded_content);
@@ -183,30 +191,30 @@ save_action (NautilusActionsConfig *self, NautilusActionsConfigAction *action)
GSList* profile_list = NULL;
GSList* iter;
- // update the version on the action
+ /* update the version on the action */
if (action->version)
{
g_free (action->version);
}
action->version = g_strdup (NAUTILUS_ACTIONS_CONFIG_VERSION);
- // Create the GConf schema XML file and write it in the save_path folder
+ /* Create the GConf schema XML file and write it in the save_path folder */
doc = xmlNewDoc (BAD_CAST "1.0");
root_node = xmlNewNode (NULL, BAD_CAST NA_GCONF_XML_ROOT);
xmlDocSetRootElement (doc, root_node);
list_node = xmlNewChild (root_node, NULL, BAD_CAST NA_GCONF_XML_SCHEMA_LIST, NULL);
- //--> Menu item entries : label
+ /* --> Menu item entries : label */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, ACTION_LABEL_ENTRY, NULL);
create_schema_entry (doc, list_node, content, "string", action->label, ACTION_LABEL_DESC_SHORT, ACTION_LABEL_DESC_LONG, TRUE);
xmlFree (content);
- //--> Menu item entries : tooltip
+ /* --> Menu item entries : tooltip */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, ACTION_TOOLTIP_ENTRY, NULL);
create_schema_entry (doc, list_node, content, "string", action->tooltip, ACTION_TOOLTIP_DESC_SHORT, ACTION_TOOLTIP_DESC_LONG, TRUE);
xmlFree (content);
- //--> Menu item entries : icon
+ /* --> Menu item entries : icon */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, ACTION_ICON_ENTRY, NULL);
create_schema_entry (doc, list_node, content, "string", action->icon, ACTION_ICON_DESC_SHORT, ACTION_ICON_DESC_LONG, FALSE);
xmlFree (content);
@@ -219,56 +227,56 @@ save_action (NautilusActionsConfig *self, NautilusActionsConfigAction *action)
gchar* profile_dir = g_strdup_printf ("%s%s", ACTIONS_PROFILE_PREFIX, profile_name);
NautilusActionsConfigActionProfile* action_profile = nautilus_actions_config_action_get_profile (action, profile_name);
- //--> Profile entries : desc-name
+ /* --> Profile entries : desc-name */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, profile_dir, ACTION_PROFILE_DESC_NAME_ENTRY, NULL);
create_schema_entry (doc, list_node, content, "string", action_profile->desc_name, ACTION_PROFILE_NAME_DESC_SHORT, ACTION_PROFILE_NAME_DESC_LONG, FALSE);
xmlFree (content);
-
- //--> Command entries : path
+
+ /* --> Command entries : path */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, profile_dir, ACTION_PATH_ENTRY, NULL);
create_schema_entry (doc, list_node, content, "string", action_profile->path, ACTION_PATH_DESC_SHORT, ACTION_PATH_DESC_LONG, FALSE);
xmlFree (content);
- //--> Command entries : parameters
+ /* --> Command entries : parameters */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, profile_dir, ACTION_PARAMS_ENTRY, NULL);
create_schema_entry (doc, list_node, content, "string", action_profile->parameters, ACTION_PARAMS_DESC_SHORT, ACTION_PARAMS_DESC_LONG, FALSE);
xmlFree (content);
- //--> Test entries : basenames
+ /* --> Test entries : basenames */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, profile_dir, ACTION_BASENAMES_ENTRY, NULL);
str_list = BAD_CAST gslist_to_schema_string (action_profile->basenames);
create_schema_entry (doc, list_node, content, "list", (char*)str_list, ACTION_BASENAMES_DESC_SHORT, ACTION_BASENAMES_DESC_LONG, FALSE);
xmlFree (str_list);
xmlFree (content);
- //--> test entries : match_case
+ /* --> test entries : match_case */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, profile_dir, ACTION_MATCHCASE_ENTRY, NULL);
create_schema_entry (doc, list_node, content, "bool", bool_to_schema_string (action_profile->match_case), ACTION_MATCHCASE_DESC_SHORT, ACTION_MATCHCASE_DESC_LONG, FALSE);
xmlFree (content);
- //--> Test entries : mimetypes
+ /* --> Test entries : mimetypes */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, profile_dir, ACTION_MIMETYPES_ENTRY, NULL);
str_list = BAD_CAST gslist_to_schema_string (action_profile->mimetypes);
create_schema_entry (doc, list_node, content, "list", (char*)str_list, ACTION_MIMETYPES_DESC_SHORT, ACTION_MIMETYPES_DESC_LONG, FALSE);
xmlFree (str_list);
xmlFree (content);
-
- //--> test entries : is_file
+
+ /* --> test entries : is_file */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, profile_dir, ACTION_ISFILE_ENTRY, NULL);
create_schema_entry (doc, list_node, content, "bool", bool_to_schema_string (action_profile->is_file), ACTION_ISFILE_DESC_SHORT, _(ACTION_ISFILE_DESC_LONG), FALSE);
xmlFree (content);
- //--> test entries : is_dir
+ /* --> test entries : is_dir */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, profile_dir, ACTION_ISDIR_ENTRY, NULL);
create_schema_entry (doc, list_node, content, "bool", bool_to_schema_string (action_profile->is_dir), ACTION_ISDIR_DESC_SHORT, _(ACTION_ISDIR_DESC_LONG), FALSE);
xmlFree (content);
- //--> test entries : accept-multiple-files
+ /* --> test entries : accept-multiple-files */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, profile_dir, ACTION_MULTIPLE_ENTRY, NULL);
create_schema_entry (doc, list_node, content, "bool", bool_to_schema_string (action_profile->accept_multiple_files), ACTION_MULTIPLE_DESC_SHORT, ACTION_MULTIPLE_DESC_LONG, FALSE);
xmlFree (content);
- //--> test entries : schemes
+ /* --> test entries : schemes */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, profile_dir, ACTION_SCHEMES_ENTRY, NULL);
str_list = BAD_CAST gslist_to_schema_string (action_profile->schemes);
create_schema_entry (doc, list_node, content, "list", (char*)str_list, ACTION_SCHEMES_DESC_SHORT, ACTION_SCHEMES_DESC_LONG, FALSE);
@@ -280,12 +288,12 @@ save_action (NautilusActionsConfig *self, NautilusActionsConfigAction *action)
g_slist_free (profile_list);
- //--> general entry : version
+ /* --> general entry : version */
content = BAD_CAST g_build_path ("/", ACTIONS_CONFIG_DIR, action->uuid, ACTION_VERSION_ENTRY, NULL);
create_schema_entry (doc, list_node, content, "string", action->version, ACTION_VERSION_DESC_SHORT, ACTION_VERSION_DESC_LONG, FALSE);
xmlFree (content);
- // generate the filename name and save the schema into it
+ /* generate the filename name and save the schema into it */
path = nautilus_actions_config_schema_writer_get_saved_filename (config, action->uuid);
if (xmlSaveFormatFileEnc (path, doc, "UTF-8", 1) != -1)
{
@@ -295,7 +303,7 @@ save_action (NautilusActionsConfig *self, NautilusActionsConfigAction *action)
xmlFreeDoc (doc);
xmlCleanupParser();
-
+
return retv;
}
@@ -304,7 +312,7 @@ remove_action (NautilusActionsConfig *self, NautilusActionsConfigAction* action)
{
g_return_val_if_fail (NAUTILUS_ACTIONS_IS_CONFIG_SCHEMA_WRITER (self), FALSE);
- //NautilusActionsConfigSchemaWriter* config = NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER (self);
+ /*NautilusActionsConfigSchemaWriter* config = NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER (self);*/
return TRUE;
}
@@ -387,5 +395,3 @@ nautilus_actions_config_schema_writer_get (void)
return NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER (g_object_ref (G_OBJECT (config)));
}
-
-// vim:ts=3:sw=3:tw=1024:cin
diff --git a/libnautilus-actions/nautilus-actions-config-schema-writer.h b/libnautilus-actions/nautilus-actions-config-schema-writer.h
index 2ae46ed..50e6bca 100644
--- a/libnautilus-actions/nautilus-actions-config-schema-writer.h
+++ b/libnautilus-actions/nautilus-actions-config-schema-writer.h
@@ -1,28 +1,36 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef _NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER_H_
-#define _NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER_H_
+#ifndef __NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER_H__
+#define __NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER_H__
#include <glib/glist.h>
#include <glib-object.h>
@@ -57,6 +65,4 @@ gchar* nautilus_actions_config_schema_writer_get_saved_filename (Nautilu
G_END_DECLS
-#endif
-
-// vim:ts=3:sw=3:tw=1024:cin
+#endif /* __NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER_H__ */
diff --git a/libnautilus-actions/nautilus-actions-config.c b/libnautilus-actions/nautilus-actions-config.c
index 2233956..0672b14 100644
--- a/libnautilus-actions/nautilus-actions-config.c
+++ b/libnautilus-actions/nautilus-actions-config.c
@@ -209,7 +209,7 @@ nautilus_actions_config_add_action (NautilusActionsConfig *config, NautilusActio
found_action = (NautilusActionsConfigAction*)g_hash_table_lookup (config->actions, action->uuid);
if (found_action != NULL)
{
- // i18n notes: will be displayed in an error dialog
+ /* i18n notes: will be displayed in an error dialog */
g_set_error (error, NAUTILUS_ACTIONS_CONFIG_ERROR, NAUTILUS_ACTIONS_CONFIG_ERROR_FAILED, _("The action '%s' already exists with the name '%s', please first remove the existing one before trying to add this one"), action->label, found_action->label);
return FALSE;
}
@@ -226,7 +226,7 @@ nautilus_actions_config_add_action (NautilusActionsConfig *config, NautilusActio
}
else
{
- // i18n notes: will be displayed in an error dialog
+ /* i18n notes: will be displayed in an error dialog */
g_set_error (error, NAUTILUS_ACTIONS_CONFIG_ERROR, NAUTILUS_ACTIONS_CONFIG_ERROR_FAILED, _("Can't save action '%s'"), action->label);
}
@@ -355,7 +355,7 @@ NautilusActionsConfigActionProfile *nautilus_actions_config_action_profile_new (
NautilusActionsConfigActionProfile *nautilus_actions_config_action_profile_new_default (void)
{
NautilusActionsConfigActionProfile* new_action_profile = nautilus_actions_config_action_profile_new();
- //--> Set some good default values
+ /* --> Set some good default values */
new_action_profile->desc_name = g_strdup (NAUTILUS_ACTIONS_DEFAULT_PROFILE_DESC_NAME);
new_action_profile->path = g_strdup ("");
new_action_profile->parameters = g_strdup ("");
@@ -398,7 +398,7 @@ nautilus_actions_config_action_get_all_profile_names (NautilusActionsConfigActio
GSList* profile_names = NULL;
g_hash_table_foreach (action->profiles, (GHFunc)get_profiles_names, &profile_names);
- return profile_names; // The returned list must be freed with all its elements after usage !!
+ return profile_names; /* The returned list must be freed with all its elements after usage !! */
}
void
@@ -474,7 +474,7 @@ nautilus_actions_config_action_add_profile (NautilusActionsConfigAction *action,
if (nautilus_actions_config_action_profile_exists (action, profile_name))
{
- // i18n notes: will be displayed in an error dialog
+ /* i18n notes: will be displayed in an error dialog */
g_set_error (error, NAUTILUS_ACTIONS_CONFIG_ERROR, NAUTILUS_ACTIONS_CONFIG_ERROR_FAILED, _("A profile already exists with the name '%s', please first remove or rename the existing one before trying to add this one"), profile_name);
return FALSE;
}
@@ -489,7 +489,7 @@ nautilus_actions_config_action_replace_profile (NautilusActionsConfigAction *act
const gchar* profile_name,
NautilusActionsConfigActionProfile* profile)
{
- //--> the old value is freed by the function
+ /* --> the old value is freed by the function */
g_hash_table_replace (action->profiles, g_strdup (profile_name), profile);
}
@@ -552,7 +552,7 @@ NautilusActionsConfigAction *nautilus_actions_config_action_new (void)
NautilusActionsConfigAction *nautilus_actions_config_action_new_default (void)
{
NautilusActionsConfigAction* new_action = nautilus_actions_config_action_new();
- //--> Set some good default values
+ /* --> Set some good default values */
new_action->conf_section = g_strdup ("");
new_action->uuid = get_new_uuid ();
new_action->label = g_strdup ("");
@@ -657,7 +657,7 @@ copy_list (gchar* data, GSList** list)
static void
copy_list_strdown (gchar* data, GSList** list)
{
- // make sure that the elements are copied with their case lowered
+ /* make sure that the elements are copied with their case lowered */
(*list) = g_slist_append ((*list), g_ascii_strdown (data, strlen (data)));
}
diff --git a/libnautilus-actions/nautilus-actions-config.h b/libnautilus-actions/nautilus-actions-config.h
index 1c80b3a..17890c3 100644
--- a/libnautilus-actions/nautilus-actions-config.h
+++ b/libnautilus-actions/nautilus-actions-config.h
@@ -1,28 +1,36 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Rodrigo Moya (rodrigo gnome-db org)
- * Frederic Ruaudel (grumz grumz net)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef _NAUTILUS_ACTIONS_CONFIG_H_
-#define _NAUTILUS_ACTIONS_CONFIG_H_
+#ifndef __NAUTILUS_ACTIONS_CONFIG_H__
+#define __NAUTILUS_ACTIONS_CONFIG_H__
#include <glib/glist.h>
#include <glib-object.h>
@@ -32,15 +40,14 @@
G_BEGIN_DECLS
-// Error data
+/* Error data */
#define NAUTILUS_ACTIONS_CONFIG_ERROR g_quark_from_string ("nautilus_actions_config")
typedef enum
{
- NAUTILUS_ACTIONS_CONFIG_ERROR_FAILED
+ NAUTILUS_ACTIONS_CONFIG_ERROR_FAILED
} NautilusActionsConfigError;
-
#define NAUTILUS_ACTIONS_TYPE_CONFIG (nautilus_actions_config_get_type())
#define NAUTILUS_ACTIONS_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, NAUTILUS_ACTIONS_TYPE_CONFIG, NautilusActionsConfig))
#define NAUTILUS_ACTIONS_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, NAUTILUS_ACTIONS_TYPE_CONFIG, NautilusActionsConfigClass))
@@ -48,10 +55,16 @@ typedef enum
#define NAUTILUS_ACTIONS_IS_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NAUTILUS_ACTIONS_TYPE_CONFIG))
#define NAUTILUS_ACTIONS_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), NAUTILUS_ACTIONS_TYPE_CONFIG, NautilusActionsConfigClass))
-// i18n notes : default profile name displayed in the profile list in the action edition dialog
+/* i18n notes : default profile name displayed in the profile list in
+ * the action edition dialog
+ */
#define NAUTILUS_ACTIONS_DEFAULT_PROFILE_DESC_NAME _("Main")
#define NAUTILUS_ACTIONS_DEFAULT_PROFILE_NAME "main"
-// i18n notes : default profile name displayed in the profile list in the action edition dialog when more than one profile is created (incremented each time) (please keep the string lowercase if possible)
+
+/* i18n notes : default profile name displayed in the profile list in
+ * the action edition dialog when more than one profile is created
+ * (incremented each time) (please keep the string lowercase if possible)
+ */
#define NAUTILUS_ACTIONS_DEFAULT_OTHER_PROFILE_DESC_NAME _("Profile %d")
#define NAUTILUS_ACTIONS_DEFAULT_OTHER_PROFILE_NAME "profile%d"
@@ -74,7 +87,7 @@ typedef struct {
gchar *label;
gchar *tooltip;
gchar *icon;
- GHashTable *profiles; // Hash of NautilusActionsConfigActionProfile*
+ GHashTable *profiles; /* Hash of NautilusActionsConfigActionProfile* */
gchar *version;
} NautilusActionsConfigAction;
@@ -96,15 +109,16 @@ struct _NautilusActionsConfigClass {
gboolean (* remove_action) (NautilusActionsConfig *config, NautilusActionsConfigAction *action);
/* Signals handler signature */
- void (* action_added) (NautilusActionsConfig *config, NautilusActionsConfigAction *action, gpointer user_data);
- void (* action_changed) (NautilusActionsConfig *config, NautilusActionsConfigAction *action, gpointer user_data);
- void (* action_removed) (NautilusActionsConfig *config, NautilusActionsConfigAction *action, gpointer user_data);
+ void (* action_added) (NautilusActionsConfig *config, NautilusActionsConfigAction *action, gpointer user_data);
+ void (* action_changed) (NautilusActionsConfig *config, NautilusActionsConfigAction *action, gpointer user_data);
+ void (* action_removed) (NautilusActionsConfig *config, NautilusActionsConfigAction *action, gpointer user_data);
};
GType nautilus_actions_config_get_type (void);
NautilusActionsConfigAction *nautilus_actions_config_get_action (NautilusActionsConfig *config, const gchar *uuid);
GSList *nautilus_actions_config_get_actions (NautilusActionsConfig *config);
+
/* function to free a list returned by nautilus_actions_config_get_actions () */
void nautilus_actions_config_free_actions_list (GSList *list);
gboolean nautilus_actions_config_add_action (NautilusActionsConfig *config,
@@ -113,31 +127,32 @@ gboolean nautilus_actions_config_update_action (NautilusActi
NautilusActionsConfigAction *action);
gboolean nautilus_actions_config_remove_action (NautilusActionsConfig *config,
const gchar *label);
+
/* function to clear the actions list stored in the nautilus_actions_config object */
gboolean nautilus_actions_config_clear (NautilusActionsConfig *config);
NautilusActionsConfigActionProfile *nautilus_actions_config_action_profile_new (void);
NautilusActionsConfigActionProfile *nautilus_actions_config_action_profile_new_default (void);
-gboolean nautilus_actions_config_action_profile_exists (NautilusActionsConfigAction *action,
+gboolean nautilus_actions_config_action_profile_exists (NautilusActionsConfigAction *action,
const gchar* profile_name);
-GSList *nautilus_actions_config_action_get_all_profile_names (NautilusActionsConfigAction *action);
-void nautilus_actions_config_action_get_new_default_profile_name (NautilusActionsConfigAction *action,
- gchar** new_profile_name,
+GSList *nautilus_actions_config_action_get_all_profile_names (NautilusActionsConfigAction *action);
+void nautilus_actions_config_action_get_new_default_profile_name (NautilusActionsConfigAction *action,
+ gchar** new_profile_name,
gchar** new_profile_desc_name);
-NautilusActionsConfigActionProfile *nautilus_actions_config_action_get_profile (NautilusActionsConfigAction *action,
+NautilusActionsConfigActionProfile *nautilus_actions_config_action_get_profile (NautilusActionsConfigAction *action,
const gchar* profile_name);
-NautilusActionsConfigActionProfile *nautilus_actions_config_action_get_or_create_profile (NautilusActionsConfigAction *action,
+NautilusActionsConfigActionProfile *nautilus_actions_config_action_get_or_create_profile (NautilusActionsConfigAction *action,
const gchar* profile_name);
-gboolean nautilus_actions_config_action_add_profile (NautilusActionsConfigAction *action,
+gboolean nautilus_actions_config_action_add_profile (NautilusActionsConfigAction *action,
const gchar* profile_name,
NautilusActionsConfigActionProfile* profile,
GError** error);
-void nautilus_actions_config_action_replace_profile (NautilusActionsConfigAction *action,
+void nautilus_actions_config_action_replace_profile (NautilusActionsConfigAction *action,
const gchar* profile_name,
NautilusActionsConfigActionProfile* profile);
-gboolean nautilus_actions_config_action_remove_profile (NautilusActionsConfigAction *action,
+gboolean nautilus_actions_config_action_remove_profile (NautilusActionsConfigAction *action,
const gchar* profile_name);
-gboolean nautilus_actions_config_action_rename_profile (NautilusActionsConfigAction *action,
+gboolean nautilus_actions_config_action_rename_profile (NautilusActionsConfigAction *action,
const gchar* old_profile_name,
const gchar* new_profile_name,
GError** error);
@@ -159,11 +174,11 @@ void nautilus_actions_config_action_profile_set_path (Na
const gchar *path);
void nautilus_actions_config_action_profile_set_parameters (NautilusActionsConfigActionProfile *action_profile,
const gchar *parameters);
-void nautilus_actions_config_action_profile_set_basenames (NautilusActionsConfigActionProfile *action_profile,
+void nautilus_actions_config_action_profile_set_basenames (NautilusActionsConfigActionProfile *action_profile,
GSList *basenames);
-void nautilus_actions_config_action_profile_set_mimetypes (NautilusActionsConfigActionProfile *action_profile,
+void nautilus_actions_config_action_profile_set_mimetypes (NautilusActionsConfigActionProfile *action_profile,
GSList *mimetypes);
-void nautilus_actions_config_action_profile_set_schemes (NautilusActionsConfigActionProfile *action_profile,
+void nautilus_actions_config_action_profile_set_schemes (NautilusActionsConfigActionProfile *action_profile,
GSList *schemes);
#define nautilus_actions_config_action_profile_set_match_case(action_profile, b) { if ((action_profile)) (action_profile)->match_case = b; }
@@ -180,4 +195,4 @@ void nautilus_actions_config_action_free (NautilusAction
G_END_DECLS
-#endif
+#endif /* __NAUTILUS_ACTIONS_CONFIG_H__ */
diff --git a/m4/cmdline-tools.m4 b/m4/nact-cmdline-tools.m4
similarity index 100%
rename from m4/cmdline-tools.m4
rename to m4/nact-cmdline-tools.m4
diff --git a/m4/nact-compiler-flags.m4 b/m4/nact-compiler-flags.m4
new file mode 100644
index 0000000..0389a0c
--- /dev/null
+++ b/m4/nact-compiler-flags.m4
@@ -0,0 +1,153 @@
+dnl GNOME_COMPILE_WARNINGS
+dnl Turn on many useful compiler warnings
+dnl For now, only works on GCC
+#
+# pwi 2009-05-15 shamelessly copied from gnome-compiler-flags.m4
+# two patch have been submitted (see gnome-common #582860)
+#
+AC_DEFUN([NACT_GNOME_COMPILE_WARNINGS],[
+
+ _ac_warning_def=m4_default([$1],[yes])
+ _ac_compliant_def=m4_default([$2],[no])
+
+ dnl ******************************
+ dnl More compiler warnings
+ dnl ******************************
+
+ AC_ARG_ENABLE(compile-warnings,
+ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
+ [Turn on compiler warnings]),,
+ [enable_compile_warnings=${_ac_warning_def}])
+
+ warnCFLAGS=
+ if test "x$GCC" != xyes; then
+ enable_compile_warnings=no
+ fi
+
+ warning_flags=
+ realsave_CFLAGS="$CFLAGS"
+
+ case "$enable_compile_warnings" in
+ no)
+ warning_flags=
+ ;;
+ minimum)
+ warning_flags="-Wall"
+ ;;
+ yes)
+ warning_flags="-Wall -Wmissing-prototypes"
+ ;;
+ maximum|error)
+ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
+ CFLAGS="$warning_flags $CFLAGS"
+ for option in -Wno-sign-compare; do
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $option"
+ AC_MSG_CHECKING([whether gcc understands $option])
+ AC_TRY_COMPILE([], [],
+ has_option=yes,
+ has_option=no,)
+ CFLAGS="$SAVE_CFLAGS"
+ AC_MSG_RESULT($has_option)
+ if test $has_option = yes; then
+ warning_flags="$warning_flags $option"
+ fi
+ unset has_option
+ unset SAVE_CFLAGS
+ done
+ unset option
+ if test "$enable_compile_warnings" = "error" ; then
+ warning_flags="$warning_flags -Werror"
+ fi
+ ;;
+ *)
+ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
+ ;;
+ esac
+ CFLAGS="$realsave_CFLAGS"
+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+ AC_MSG_RESULT($warning_flags)
+
+ AC_ARG_ENABLE(iso-c,
+ AC_HELP_STRING([--enable-iso-c],
+ [Try to warn if code is not ISO C ]),,
+ [enable_iso_c=${_ac_compliant_def}])
+
+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+ complCFLAGS=
+ if test "x$enable_iso_c" != "xno"; then
+ if test "x$GCC" = "xyes"; then
+ if test "${enable_iso_c}" = "yes"; then
+ case " $CFLAGS " in
+ *[\ \ ]-ansi[\ \ ]*) ;;
+ *) complCFLAGS="$complCFLAGS -ansi" ;;
+ esac
+ case " $CFLAGS " in
+ *[\ \ ]-pedantic[\ \ ]*) ;;
+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
+ esac
+ else
+ complCFLAGS="$complCFLAGS ${enable_iso_c}"
+ fi
+ fi
+ fi
+ AC_MSG_RESULT($complCFLAGS)
+
+ WARN_CFLAGS="$warning_flags $complCFLAGS"
+ AC_SUBST(WARN_CFLAGS)
+])
+
+dnl For C++, do basically the same thing.
+
+AC_DEFUN([GNOME_CXX_WARNINGS],[
+ AC_ARG_ENABLE(cxx-warnings,
+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
+ [Turn on compiler warnings.]),,
+ [enable_cxx_warnings="m4_default([$1],[minimum])"])
+
+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
+ warnCXXFLAGS=
+ if test "x$GXX" != xyes; then
+ enable_cxx_warnings=no
+ fi
+ if test "x$enable_cxx_warnings" != "xno"; then
+ if test "x$GXX" = "xyes"; then
+ case " $CXXFLAGS " in
+ *[\ \ ]-Wall[\ \ ]*) ;;
+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
+ esac
+
+ ## -W is not all that useful. And it cannot be controlled
+ ## with individual -Wno-xxx flags, unlike -Wall
+ if test "x$enable_cxx_warnings" = "xyes"; then
+ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
+ fi
+ fi
+ fi
+ AC_MSG_RESULT($warnCXXFLAGS)
+
+ AC_ARG_ENABLE(iso-cxx,
+ AC_HELP_STRING([--enable-iso-cxx],
+ [Try to warn if code is not ISO C++ ]),,
+ [enable_iso_cxx=no])
+
+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
+ complCXXFLAGS=
+ if test "x$enable_iso_cxx" != "xno"; then
+ if test "x$GXX" = "xyes"; then
+ case " $CXXFLAGS " in
+ *[\ \ ]-ansi[\ \ ]*) ;;
+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
+ esac
+
+ case " $CXXFLAGS " in
+ *[\ \ ]-pedantic[\ \ ]*) ;;
+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+ esac
+ fi
+ fi
+ AC_MSG_RESULT($complCXXFLAGS)
+
+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+ AC_SUBST(WARN_CXXFLAGS)
+])
diff --git a/m4/nautilus-extdir.m4 b/m4/nact-nautilus-extdir.m4
similarity index 100%
rename from m4/nautilus-extdir.m4
rename to m4/nact-nautilus-extdir.m4
diff --git a/nact/nact-editor.c b/nact/nact-editor.c
index 4e08248..7139eca 100644
--- a/nact/nact-editor.c
+++ b/nact/nact-editor.c
@@ -27,6 +27,7 @@
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <string.h>
@@ -151,7 +152,7 @@ static gint sort_stock_ids (gconstpointer a, gconstpointer b)
{
label_a = strip_underscore (stock_item_a.label);
label_b = strip_underscore (stock_item_b.label);
- //retv = g_ascii_strcasecmp (label_a, label_b);
+ /*retv = g_ascii_strcasecmp (label_a, label_b);*/
retv = g_utf8_collate (label_a, label_b);
g_free (label_a);
g_free (label_b);
@@ -166,7 +167,7 @@ static GtkTreeModel* create_stock_icon_model (void)
GSList* iter;
GtkListStore* model;
GtkTreeIter row;
- //GtkWidget* window = nact_get_glade_widget_from ("EditActionDialog", GLADE_EDIT_DIALOG_WIDGET);
+ /*GtkWidget* window = nact_get_glade_widget_from ("EditActionDialog", GLADE_EDIT_DIALOG_WIDGET);*/
GtkStockItem stock_item;
gchar* label;
@@ -720,7 +721,7 @@ open_editor (NautilusActionsConfigAction *action, gboolean is_new)
nautilus_actions_config_action_set_icon (action, gtk_entry_get_text (GTK_ENTRY (GTK_BIN (menu_icon)->child)));
if (is_new)
{
- // TODO: If necessary deal with the GError returned
+ /* TODO: If necessary deal with the GError returned */
ret = nautilus_actions_config_add_action (NAUTILUS_ACTIONS_CONFIG (config), action, NULL);
}
else
diff --git a/nact/nact-editor.h b/nact/nact-editor.h
index 377a5a1..ef92dab 100644
--- a/nact/nact-editor.h
+++ b/nact/nact-editor.h
@@ -1,28 +1,36 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Rodrigo Moya (rodrigo gnome-db org)
- * Frederic Ruaudel (grumz grumz net)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef _NACT_EDITOR_H_
-#define _NACT_EDITOR_H_
+#ifndef __NACT_EDITOR_H__
+#define __NACT_EDITOR_H__
#include <libnautilus-actions/nautilus-actions-config.h>
#include <libnautilus-actions/nautilus-actions-config-gconf-writer.h>
@@ -37,4 +45,4 @@ gboolean nact_editor_new_action (void);
gboolean nact_editor_edit_action (NautilusActionsConfigAction *action);
void nact_editor_fill_profiles_list (GtkWidget *list, NautilusActionsConfigAction* action);
-#endif
+#endif /* __NACT_EDITOR_H__ */
diff --git a/nact/nact-import-export.c b/nact/nact-import-export.c
index 817c08e..ff365c2 100644
--- a/nact/nact-import-export.c
+++ b/nact/nact-import-export.c
@@ -27,6 +27,7 @@
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
@@ -239,7 +240,7 @@ nact_import_actions (void)
}
else
{
- // i18n notes: %s is the label of the action (eg, 'Mount ISO')
+ /* i18n notes: %s is the label of the action (eg, 'Mount ISO') */
error_message = g_strdup_printf (_("Action '%s' importation failed!"), action->label);
nautilus_actions_display_error (error_message, error->message);
g_error_free (error);
@@ -284,10 +285,10 @@ nact_export_actions (void)
gtk_tree_model_get (model, &iter, UUID_COLUMN, &uuid, -1);
action = nautilus_actions_config_get_action (NAUTILUS_ACTIONS_CONFIG (config), uuid);
- // TODO: Better error handling: deal with the GError param
+ /* TODO: Better error handling: deal with the GError param */
if (nautilus_actions_config_add_action (NAUTILUS_ACTIONS_CONFIG (schema_writer), action, NULL))
{
- //nautilus_actions_config_schema_writer_get_saved_filename (schema_writer, action->uuid);
+ /*nautilus_actions_config_schema_writer_get_saved_filename (schema_writer, action->uuid);*/
}
g_free (uuid);
diff --git a/nact/nact-import-export.h b/nact/nact-import-export.h
index 0ced332..5e9c71f 100644
--- a/nact/nact-import-export.h
+++ b/nact/nact-import-export.h
@@ -1,33 +1,37 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef _NACT_IMPORT_EXPORT_H_
-#define _NACT_IMPORT_EXPORT_H_
-
-#include <libnautilus-actions/nautilus-actions-config.h>
+#ifndef __NACT_IMPORT_EXPORT_H__
+#define __NACT_IMPORT_EXPORT_H__
gboolean nact_import_export_actions (void);
-#endif
-
-// vim:ts=3:sw=3:tw=1024:cin
+#endif /* __NACT_IMPORT_EXPORT_H__ */
diff --git a/nact/nact-prefs.c b/nact/nact-prefs.c
index 3984d9b..eaf90b4 100644
--- a/nact/nact-prefs.c
+++ b/nact/nact-prefs.c
@@ -1,23 +1,32 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
@@ -84,7 +93,7 @@ get_prefs_int_key (GConfClient *client, const gchar *key)
{
i = gconf_value_get_int (value);
}
-
+
g_free (fullkey);
return i;
@@ -137,11 +146,11 @@ static void prefs_changed_cb (GConfClient *client,
GConfEntry *entry,
gpointer user_data)
{
- //NactPreferences* prefs = (NactPreferences*)user_data;
+ /*NactPreferences* prefs = (NactPreferences*)user_data;*/
if (user_data != NULL)
{
- //g_print ("Key changed : %s\n", entry->key);
+ /*g_print ("Key changed : %s\n", entry->key);*/
}
}
@@ -149,13 +158,13 @@ static NactPreferences* nact_prefs_get_preferences (void)
{
static NactPreferences* prefs = NULL;
gchar* tmp;
-
+
if (!prefs)
- {
+ {
prefs = g_new0 (NactPreferences, 1);
-
+
prefs->client = gconf_client_get_default ();
-
+
prefs->schemes = get_prefs_list_key (prefs->client, PREFS_SCHEMES);
if (!prefs->schemes)
{
@@ -203,21 +212,21 @@ static NactPreferences* nact_prefs_get_preferences (void)
tmp = g_strdup ("/tmp");
}
prefs->import_last_browsed_dir = tmp;
-
+
tmp = get_prefs_string_key (prefs->client, PREFS_EXPORT_PATH);
if (!tmp)
{
tmp = g_strdup ("/tmp");
}
prefs->export_last_browsed_dir = tmp;
-
+
gconf_client_add_dir (prefs->client, NAUTILUS_ACTIONS_CONFIG_GCONF_BASEDIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
prefs->prefs_notify_id = gconf_client_notify_add (prefs->client, NAUTILUS_ACTIONS_CONFIG_GCONF_BASEDIR,
(GConfClientNotifyFunc) prefs_changed_cb, prefs,
NULL, NULL);
}
- return prefs;
+ return prefs;
}
static void
@@ -248,7 +257,7 @@ void nact_prefs_set_schemes_list (GSList* schemes)
g_slist_free (prefs->schemes);
prefs->schemes = NULL;
}
-
+
g_slist_foreach (schemes, (GFunc)copy_to_list, &(prefs->schemes));
}
@@ -471,8 +480,8 @@ static void nact_prefs_free_preferences (NactPreferences* prefs)
if (prefs->icon_last_browsed_dir)
{
g_free (prefs->icon_last_browsed_dir);
- }
-
+ }
+
if (prefs->path_last_browsed_dir)
{
g_free (prefs->path_last_browsed_dir);
@@ -519,8 +528,6 @@ void nact_prefs_save_preferences (void)
set_prefs_string_key (prefs->client, PREFS_PATH_PATH, prefs->path_last_browsed_dir);
set_prefs_string_key (prefs->client, PREFS_IMPORT_PATH, prefs->import_last_browsed_dir);
set_prefs_string_key (prefs->client, PREFS_EXPORT_PATH, prefs->export_last_browsed_dir);
-
+
nact_prefs_free_preferences (prefs);
}
-
-// vim:ts=3:sw=3:tw=1024:cin
diff --git a/nact/nact-prefs.h b/nact/nact-prefs.h
index 6962766..8e824df 100644
--- a/nact/nact-prefs.h
+++ b/nact/nact-prefs.h
@@ -1,27 +1,36 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef _NACT_PREFS_H
-#define _NACT_PREFS_H
+#ifndef __NACT_PREFS_H__
+#define __NACT_PREFS_H__
#include <glib.h>
#include <gtk/gtk.h>
@@ -94,6 +103,4 @@ void nact_prefs_save_preferences (void);
G_END_DECLS
-#endif /* _NACT_PREFS_H */
-
-// vim:ts=3:sw=3:tw=1024:cin
+#endif /* __NACT_PREFS_H__ */
diff --git a/nact/nact-profile-editor.c b/nact/nact-profile-editor.c
index 8247e25..e3c02b8 100644
--- a/nact/nact-profile-editor.c
+++ b/nact/nact-profile-editor.c
@@ -27,6 +27,7 @@
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <string.h>
@@ -59,7 +60,7 @@ update_example_label (void)
init = TRUE;
}
- // Convert special xml chars (&, <, >,...) to avoid warnings generated by Pango parser
+ /* Convert special xml chars (&, <, >,...) to avoid warnings generated by Pango parser */
ex_str = g_markup_printf_escaped (label_format_string, tmp);
gtk_label_set_label (GTK_LABEL (label_widget), ex_str);
g_free (ex_str);
@@ -140,10 +141,11 @@ hide_legend_dialog ()
GtkWidget *legend_dialog = nact_get_glade_widget_from ("LegendDialog", GLADE_LEGEND_DIALOG_WIDGET);
GtkWidget *legend_button = nact_get_glade_widget_from ("LegendButton", GLADE_EDIT_PROFILE_DIALOG_WIDGET);
gtk_widget_hide (legend_dialog);
- // TODO: Save the current position !!
+ /* TODO: Save the current position !! */
- // Set the legend button state consistent for when the dialog is hidden
- // by another mean (eg. close the edit profile dialog)
+ /* Set the legend button state consistent for when the dialog is
+ * hidden by another mean (eg. close the edit profile dialog)
+ */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (legend_button), FALSE);
}
@@ -175,7 +177,7 @@ static void scheme_selection_toggled_cb (GtkCellRendererToggle *cell_renderer,
gtk_list_store_set (GTK_LIST_STORE (model), &iter, SCHEMES_CHECKBOX_COLUMN, !toggle_state, -1);
- //--> Notice edition change
+ /* --> Notice edition change */
profile_field_changed_cb (G_OBJECT (cell_renderer), NULL);
update_example_label ();
@@ -216,7 +218,7 @@ scheme_edited_cb (GtkCellRendererText *cell,
GtkTreeModel* model = GTK_TREE_MODEL (data);
if (cell_edited (model, path_string, new_text, SCHEMES_KEYWORD_COLUMN))
{
- //--> if column was checked, set the action has edited
+ /* --> if column was checked, set the action has edited */
profile_field_changed_cb (G_OBJECT (cell), NULL);
update_example_label ();
}
@@ -365,7 +367,7 @@ static gboolean reset_schemes_list (GtkTreeModel* scheme_model, GtkTreePath *pat
{
gtk_list_store_set (GTK_LIST_STORE (scheme_model), iter, SCHEMES_CHECKBOX_COLUMN, FALSE, -1);
- return FALSE; // Don't stop looping
+ return FALSE; /* Don't stop looping */
}
/*static gboolean get_all_schemes_list (GtkTreeModel* scheme_model, GtkTreePath *path,
@@ -503,7 +505,7 @@ open_profile_editor (NautilusActionsConfigAction *action, gchar* profile_name, N
if (!init)
{
- // load the GUI
+ /* load the GUI */
gui = nact_get_glade_xml_object (GLADE_EDIT_PROFILE_DIALOG_WIDGET);
if (!gui) {
g_error (_("Could not load interface for Nautilus Actions Config Tool"));
@@ -534,7 +536,7 @@ open_profile_editor (NautilusActionsConfigAction *action, gchar* profile_name, N
gtk_size_group_add_widget (button_size_group,
nact_get_glade_widget_from ("LegendButton",
GLADE_EDIT_PROFILE_DIALOG_WIDGET));
- // free memory
+ /* free memory */
g_object_unref (gui);
init = TRUE;
}
@@ -552,7 +554,7 @@ open_profile_editor (NautilusActionsConfigAction *action, gchar* profile_name, N
g_free (title);
}
- // Get the default dialog size
+ /* Get the default dialog size */
gtk_window_get_default_size (GTK_WINDOW (editor), &width, &height);
/* FIXME: update preference data for profile editor dialog
@@ -608,7 +610,7 @@ open_profile_editor (NautilusActionsConfigAction *action, gchar* profile_name, N
update_example_label ();
- // run the dialog
+ /* run the dialog */
gtk_dialog_set_response_sensitive (GTK_DIALOG (editor), GTK_RESPONSE_OK, FALSE);
switch (gtk_dialog_run (GTK_DIALOG (editor))) {
case GTK_RESPONSE_OK :
@@ -662,7 +664,7 @@ open_profile_editor (NautilusActionsConfigAction *action, gchar* profile_name, N
case GTK_RESPONSE_CANCEL :
if (!is_new)
{
- // Edition mode : Free the duplicated profile
+ /* Edition mode : Free the duplicated profile */
nautilus_actions_config_action_profile_free (action_profile);
}
ret = FALSE;
diff --git a/nact/nact-profile-editor.h b/nact/nact-profile-editor.h
index 8fc6a90..bc2f031 100644
--- a/nact/nact-profile-editor.h
+++ b/nact/nact-profile-editor.h
@@ -1,27 +1,36 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef _NACT_PROFILE_EDITOR_H_
-#define _NACT_PROFILE_EDITOR_H_
+#ifndef __NACT_PROFILE_EDITOR_H__
+#define __NACT_PROFILE_EDITOR_H__
#include <libnautilus-actions/nautilus-actions-config.h>
#include <libnautilus-actions/nautilus-actions-config-gconf-writer.h>
@@ -29,4 +38,4 @@
gboolean nact_profile_editor_new_profile (NautilusActionsConfigAction* action);
gboolean nact_profile_editor_edit_profile (NautilusActionsConfigAction *action, gchar* profile_name, NautilusActionsConfigActionProfile* action_profile);
-#endif
+#endif /* __NACT_PROFILE_EDITOR_H__ */
diff --git a/nact/nact-utils.c b/nact/nact-utils.c
index 2f798f4..abc5f38 100644
--- a/nact/nact-utils.c
+++ b/nact/nact-utils.c
@@ -27,6 +27,7 @@
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
@@ -139,7 +140,7 @@ gboolean nact_utils_get_action_schemes_list (GtkTreeModel* scheme_model, GtkTree
g_free (scheme);
}
- return FALSE; // Don't stop looping
+ return FALSE; /* Don't stop looping */
}
static gchar* nact_utils_joinv (const gchar* start, const gchar* separator, gchar** list)
@@ -306,38 +307,38 @@ gchar* nact_utils_parse_parameter (void)
tmp_string = g_string_append_len (tmp_string, old_iter, strlen (old_iter) - strlen (iter));
switch (iter[1])
{
- case 'u': // gnome-vfs URI
+ case 'u': /* gnome-vfs URI */
tmp = g_strjoin (NULL, ex_scheme, "://", ex_path, "/", ex_one, NULL);
tmp_string = g_string_append (tmp_string, tmp);
g_free (tmp);
break;
- case 'd': // base dir of the selected file(s)/folder(s)
+ case 'd': /* base dir of the selected file(s)/folder(s) */
tmp_string = g_string_append (tmp_string, ex_path);
break;
- case 'f': // the basename of the selected file/folder or the 1st one if many are selected
+ case 'f': /* the basename of the selected file/folder or the 1st one if many are selected */
tmp_string = g_string_append (tmp_string, ex_one);
break;
- case 'm': // list of the basename of the selected files/directories separated by space
+ case 'm': /* list of the basename of the selected files/directories separated by space */
tmp_string = g_string_append (tmp_string, ex_list);
break;
- case 'M': // list of the selected files/directories with their complete path separated by space.
+ case 'M': /* list of the selected files/directories with their complete path separated by space. */
tmp_string = g_string_append (tmp_string, ex_path_list);
break;
- case 's': // scheme of the gnome-vfs URI
+ case 's': /* scheme of the gnome-vfs URI */
tmp_string = g_string_append (tmp_string, ex_scheme);
break;
- case 'h': // hostname of the gnome-vfs URI
+ case 'h': /* hostname of the gnome-vfs URI */
tmp_string = g_string_append (tmp_string, ex_host);
break;
- case 'U': // username of the gnome-vfs URI
+ case 'U': /* username of the gnome-vfs URI */
tmp_string = g_string_append (tmp_string, "root");
break;
- case '%': // a percent sign
+ case '%': /* a percent sign */
tmp_string = g_string_append_c (tmp_string, '%');
break;
}
- iter+=2; // skip the % sign and the character after.
- old_iter = iter; // store the new start of the string
+ iter+=2; /* skip the % sign and the character after. */
+ old_iter = iter; /* store the new start of the string */
}
tmp_string = g_string_append_len (tmp_string, old_iter, strlen (old_iter));
@@ -345,7 +346,7 @@ gchar* nact_utils_parse_parameter (void)
g_free (ex_path_list);
g_free (iter);
- retv = g_string_free (tmp_string, FALSE); // return the content of the GString
+ retv = g_string_free (tmp_string, FALSE); /* return the content of the GString */
return retv;
}
diff --git a/nact/nact-utils.h b/nact/nact-utils.h
index 220feb7..4f14164 100644
--- a/nact/nact-utils.h
+++ b/nact/nact-utils.h
@@ -1,27 +1,36 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef _NACT_UTILS_H_
-#define _NACT_UTILS_H_
+#ifndef __NACT_UTILS_H__
+#define __NACT_UTILS_H__
#include <glade/glade-xml.h>
#include <gtk/gtk.h>
@@ -50,11 +59,9 @@ GList* nact_get_glade_widget_prefix_from (const gchar* widget_name, const gchar*
GList* nact_get_glade_widget_prefix (const gchar* widget_name);
void nact_destroy_glade_objects (void);
void nautilus_actions_display_error (const gchar *primary_msg, const gchar *secondary_msg);
-gboolean nact_utils_get_action_schemes_list (GtkTreeModel* scheme_model, GtkTreePath *path,
+gboolean nact_utils_get_action_schemes_list (GtkTreeModel* scheme_model, GtkTreePath *path,
GtkTreeIter* iter, gpointer data);
gchar* nact_utils_parse_parameter (void);
-#endif
-
-// vim:ts=3:sw=3:tw=1024:cin
+#endif /* __NACT_UTILS_H__ */
diff --git a/nact/nact.c b/nact/nact.c
index ea68884..d6c564a 100644
--- a/nact/nact.c
+++ b/nact/nact.c
@@ -27,6 +27,7 @@
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
diff --git a/nact/nact.h b/nact/nact.h
index 1b570e8..b8f87c1 100644
--- a/nact/nact.h
+++ b/nact/nact.h
@@ -1,31 +1,38 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef _NACT_H_
-#define _NACT_H_
+#ifndef __NACT_H__
+#define __NACT_H__
#include <gtk/gtk.h>
-#include <libnautilus-actions/nautilus-actions-config.h>
enum {
MENU_ICON_COLUMN = 0,
@@ -36,6 +43,4 @@ enum {
void nact_fill_actions_list (GtkWidget *list);
-#endif
-
-// vim:ts=3:sw=3:tw=1024:cin
+#endif /* __NACT_H__ */
diff --git a/plugin/nautilus-actions-module.c b/plugin/nautilus-actions-module.c
index 7ea35ee..1cccf30 100644
--- a/plugin/nautilus-actions-module.c
+++ b/plugin/nautilus-actions-module.c
@@ -1,23 +1,32 @@
-/* Nautilus Actions new config tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <libnautilus-extension/nautilus-extension-types.h>
@@ -37,11 +46,9 @@ void nautilus_module_shutdown (void)
void nautilus_module_list_types (const GType **types, int *num_types)
{
static GType type_list[1];
-
+
type_list[0] = NAUTILUS_ACTIONS_TYPE;
*types = type_list;
*num_types = 1;
}
-
-// vim:ts=3:sw=3:tw=1024
diff --git a/plugin/nautilus-actions-test.c b/plugin/nautilus-actions-test.c
index 783dc7b..100687a 100644
--- a/plugin/nautilus-actions-test.c
+++ b/plugin/nautilus-actions-test.c
@@ -1,24 +1,32 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <libnautilus-extension/nautilus-file-info.h>
@@ -31,18 +39,18 @@ static int nautilus_actions_test_check_scheme (GSList* schemes2test, NautilusFil
int retv = 0;
GSList* iter;
gboolean found = FALSE;
-
- iter = schemes2test;
+
+ iter = schemes2test;
while (iter && !found)
{
gchar* scheme = nautilus_file_info_get_uri_scheme (file);
-
+
if (g_ascii_strncasecmp (scheme, (gchar*)iter->data, strlen ((gchar*)iter->data)) == 0)
{
found = TRUE;
retv = 1;
}
-
+
g_free (scheme);
iter = iter->next;
}
@@ -72,11 +80,12 @@ gboolean nautilus_actions_test_validate (NautilusActionsConfigActionProfile *act
gboolean basename_match_ok = FALSE;
gboolean mimetype_match_ok = FALSE;
- if (action_profile->basenames && action_profile->basenames->next != NULL &&
+ if (action_profile->basenames && action_profile->basenames->next != NULL &&
g_ascii_strcasecmp ((gchar*)(action_profile->basenames->data), "*") == 0)
{
- // if the only pattern is '*' then all files will match, so it is not
- // necessary to make the test for each of them
+ /* if the only pattern is '*' then all files will match, so it
+ * is not necessary to make the test for each of them
+ */
test_basename = TRUE;
}
else
@@ -86,26 +95,29 @@ gboolean nautilus_actions_test_validate (NautilusActionsConfigActionProfile *act
gchar* tmp_pattern = (gchar*)iter->data;
if (!action_profile->match_case)
{
- //--> if case-insensitive asked, lower all the string since the pattern matching function
- // don't manage it itself.
+ /* --> if case-insensitive asked, lower all the string
+ * since the pattern matching function don't manage it
+ * itself.
+ */
tmp_pattern = g_ascii_strdown ((gchar*)iter->data, strlen ((gchar*)iter->data));
}
-
+
glob_patterns = g_list_append (glob_patterns, g_pattern_spec_new (tmp_pattern));
-
+
if (!action_profile->match_case)
{
g_free (tmp_pattern);
}
}
}
-
- if (action_profile->mimetypes && action_profile->mimetypes->next != NULL &&
- (g_ascii_strcasecmp ((gchar*)(action_profile->mimetypes->data), "*") == 0 ||
+
+ if (action_profile->mimetypes && action_profile->mimetypes->next != NULL &&
+ (g_ascii_strcasecmp ((gchar*)(action_profile->mimetypes->data), "*") == 0 ||
g_ascii_strcasecmp ((gchar*)(action_profile->mimetypes->data), "*/*") == 0))
{
- // if the only pattern is '*' or */* then all mimetypes will match, so it is not
- // necessary to make the test for each of them
+ /* if the only pattern is '*' or * / * then all mimetypes will
+ * match, so it is not necessary to make the test for each of them
+ */
test_mimetype = TRUE;
}
else
@@ -126,18 +138,20 @@ gboolean nautilus_actions_test_validate (NautilusActionsConfigActionProfile *act
if (!action_profile->match_case)
{
- //--> if case-insensitive asked, lower all the string since the pattern matching function
- // don't manage it itself.
+ /* --> if case-insensitive asked, lower all the string
+ * since the pattern matching function don't manage it
+ * itself.
+ */
gchar* tmp_filename2 = g_ascii_strdown (tmp_filename, strlen (tmp_filename));
g_free (tmp_filename);
tmp_filename = tmp_filename2;
}
- //--> for the moment we deal with all mimetypes case-insensitively
+ /* --> for the moment we deal with all mimetypes case-insensitively */
gchar* tmp_mimetype2 = g_ascii_strdown (tmp_mimetype, strlen (tmp_mimetype));
g_free (tmp_mimetype);
tmp_mimetype = tmp_mimetype2;
-
+
if (nautilus_file_info_is_directory ((NautilusFileInfo *)iter1->data))
{
dir_count++;
@@ -149,7 +163,7 @@ gboolean nautilus_actions_test_validate (NautilusActionsConfigActionProfile *act
scheme_ok_count += nautilus_actions_test_check_scheme (action_profile->schemes, (NautilusFileInfo*)iter1->data);
- if (!test_basename) // if it is already ok, skip the test to improve performance
+ if (!test_basename) /* if it is already ok, skip the test to improve performance */
{
basename_match_ok = FALSE;
iter2 = glob_patterns;
@@ -168,7 +182,7 @@ gboolean nautilus_actions_test_validate (NautilusActionsConfigActionProfile *act
}
}
- if (!test_mimetype) // if it is already ok, skip the test to improve performance
+ if (!test_mimetype) /* if it is already ok, skip the test to improve performance */
{
mimetype_match_ok = FALSE;
iter2 = glob_mime_patterns;
@@ -232,7 +246,7 @@ gboolean nautilus_actions_test_validate (NautilusActionsConfigActionProfile *act
}
- if (!test_basename) // if not already tested
+ if (!test_basename) /* if not already tested */
{
if (glob_ok_count == total_count)
{
@@ -240,7 +254,7 @@ gboolean nautilus_actions_test_validate (NautilusActionsConfigActionProfile *act
}
}
- if (!test_mimetype) // if not already tested
+ if (!test_mimetype) /* if not already tested */
{
if (mime_glob_ok_count == total_count)
{
@@ -252,7 +266,7 @@ gboolean nautilus_actions_test_validate (NautilusActionsConfigActionProfile *act
{
retv = TRUE;
}
-
+
g_list_foreach (glob_patterns, (GFunc) g_pattern_spec_free, NULL);
g_list_free (glob_patterns);
g_list_foreach (glob_mime_patterns, (GFunc) g_pattern_spec_free, NULL);
@@ -260,5 +274,3 @@ gboolean nautilus_actions_test_validate (NautilusActionsConfigActionProfile *act
return retv;
}
-
-// vim:ts=3:sw=3:tw=1024:ai
diff --git a/plugin/nautilus-actions-test.h b/plugin/nautilus-actions-test.h
index ae7299e..077ffae 100644
--- a/plugin/nautilus-actions-test.h
+++ b/plugin/nautilus-actions-test.h
@@ -1,28 +1,36 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef NAUTILUS_ACTIONS_TEST_H
-#define NAUTILUS_ACTIONS_TEST_H
+#ifndef __NAUTILUS_ACTIONS_TEST_H__
+#define __NAUTILUS_ACTIONS_TEST_H__
#include <libnautilus-actions/nautilus-actions-config.h>
@@ -32,6 +40,4 @@ gboolean nautilus_actions_test_validate (NautilusActionsConfigActionProfile *act
G_END_DECLS
-#endif /* NAUTILUS_ACTIONS_TEST_H */
-
-// vim:ts=3:sw=3:tw=1024
+#endif /* __NAUTILUS_ACTIONS_TEST_H__ */
diff --git a/plugin/nautilus-actions-utils.c b/plugin/nautilus-actions-utils.c
index 7e278a3..83acfcc 100644
--- a/plugin/nautilus-actions-utils.c
+++ b/plugin/nautilus-actions-utils.c
@@ -1,29 +1,37 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <glib.h>
#include <string.h>
-//#include <libgnomevfs/gnome-vfs-file-info.h>
+/*#include <libgnomevfs/gnome-vfs-file-info.h>*/
#include <libnautilus-extension/nautilus-file-info.h>
#include <libgnomevfs/gnome-vfs.h>
@@ -33,7 +41,7 @@ gchar* nautilus_actions_utils_parse_parameter (const gchar* param_template, GLis
{
/*
* Valid parameters :
- *
+ *
* %u : gnome-vfs URI
* %d : base dir of the selected file(s)/folder(s)
* %f : the name of the selected file/folder or the 1st one if many are selected
@@ -46,13 +54,13 @@ gchar* nautilus_actions_utils_parse_parameter (const gchar* param_template, GLis
*
*/
gchar* retv = NULL;
-
+
if (files != NULL)
{
GString* tmp_string = g_string_new ("");
gchar* iter = g_strdup (param_template);
gchar* old_iter = iter;
- //int current_len = strlen (iter);
+ /*int current_len = strlen (iter);*/
gchar* uri = nautilus_file_info_get_uri ((NautilusFileInfo*)files->data);
GnomeVFSURI* gvfs_uri = gnome_vfs_uri_new (uri);
gchar* filename;
@@ -67,7 +75,7 @@ gchar* nautilus_actions_utils_parse_parameter (const gchar* param_template, GLis
GString* tmp_path_file_list;
gchar* tmp;
gchar* tmp2;
-
+
tmp = gnome_vfs_uri_extract_dirname (gvfs_uri);
dirname = (gchar*)gnome_vfs_unescape_string ((const gchar*)tmp, "");
g_free (tmp);
@@ -86,8 +94,8 @@ gchar* nautilus_actions_utils_parse_parameter (const gchar* param_template, GLis
tmp_path_file_list = g_string_new (tmp);
g_free (tmp2);
g_free (tmp);
-
- // We already have the first item, so we start with the next one if any
+
+ /* We already have the first item, so we start with the next one if any */
for (file_iter = files->next; file_iter; file_iter = file_iter->next)
{
gchar* tmp_filename = nautilus_file_info_get_name ((NautilusFileInfo*)file_iter->data);
@@ -96,7 +104,7 @@ gchar* nautilus_actions_utils_parse_parameter (const gchar* param_template, GLis
tmp = gnome_vfs_uri_extract_dirname (tmp_gvfs_uri);
gchar* tmp_dirname = (gchar*)gnome_vfs_unescape_string ((const gchar*)tmp, "");
g_free (tmp);
-
+
if (!tmp_filename)
{
tmp_filename = g_strdup ("");
@@ -108,7 +116,7 @@ gchar* nautilus_actions_utils_parse_parameter (const gchar* param_template, GLis
tmp = g_build_path ("/", tmp_dirname, tmp_filename, NULL);
tmp2 = g_shell_quote (tmp);
g_string_append_printf (tmp_path_file_list, " %s", tmp2);
-
+
g_free (tmp2);
g_free (tmp);
g_free (tmp_filename);
@@ -120,44 +128,44 @@ gchar* nautilus_actions_utils_parse_parameter (const gchar* param_template, GLis
file_list = g_string_free (tmp_file_list, FALSE);
path_file_list = g_string_free (tmp_path_file_list, FALSE);
-
+
while ((iter = g_strstr_len (iter, strlen (iter), "%")))
{
tmp_string = g_string_append_len (tmp_string, old_iter, strlen (old_iter) - strlen (iter));
switch (iter[1])
{
- case 'u': // gnome-vfs URI
+ case 'u': /* gnome-vfs URI */
tmp_string = g_string_append (tmp_string, uri);
break;
- case 'd': // base dir of the selected file(s)/folder(s)
+ case 'd': /* base dir of the selected file(s)/folder(s) */
tmp = g_shell_quote (dirname);
tmp_string = g_string_append (tmp_string, tmp);
g_free (tmp);
break;
- case 'f': // the basename of the selected file/folder or the 1st one if many are selected
+ case 'f': /* the basename of the selected file/folder or the 1st one if many are selected */
tmp_string = g_string_append (tmp_string, filename);
break;
- case 'm': // list of the basename of the selected files/directories separated by space
+ case 'm': /* list of the basename of the selected files/directories separated by space */
tmp_string = g_string_append (tmp_string, file_list);
break;
- case 'M': // list of the selected files/directories with their complete path separated by space.
+ case 'M': /* list of the selected files/directories with their complete path separated by space. */
tmp_string = g_string_append (tmp_string, path_file_list);
break;
- case 's': // scheme of the gnome-vfs URI
+ case 's': /* scheme of the gnome-vfs URI */
tmp_string = g_string_append (tmp_string, scheme);
break;
- case 'h': // hostname of the gnome-vfs URI
+ case 'h': /* hostname of the gnome-vfs URI */
tmp_string = g_string_append (tmp_string, hostname);
break;
- case 'U': // username of the gnome-vfs URI
+ case 'U': /* username of the gnome-vfs URI */
tmp_string = g_string_append (tmp_string, username);
break;
- case '%': // a percent sign
+ case '%': /* a percent sign */
tmp_string = g_string_append_c (tmp_string, '%');
break;
}
- iter+=2; // skip the % sign and the character after.
- old_iter = iter; // store the new start of the string
+ iter+=2; /* skip the % sign and the character after. */
+ old_iter = iter; /* store the new start of the string */
}
tmp_string = g_string_append_len (tmp_string, old_iter, strlen (old_iter));
@@ -172,10 +180,8 @@ gchar* nautilus_actions_utils_parse_parameter (const gchar* param_template, GLis
g_free (iter);
gnome_vfs_uri_unref (gvfs_uri);
- retv = g_string_free (tmp_string, FALSE); // return the content of the GString
+ retv = g_string_free (tmp_string, FALSE); /* return the content of the GString */
}
return retv;
}
-
-// vim:ts=3:sw=3:tw=1024
diff --git a/plugin/nautilus-actions-utils.h b/plugin/nautilus-actions-utils.h
index 93dc460..6bbce67 100644
--- a/plugin/nautilus-actions-utils.h
+++ b/plugin/nautilus-actions-utils.h
@@ -1,28 +1,36 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef NAUTILUS_ACTIONS_UTILS_H
-#define NAUTILUS_ACTIONS_UTILS_H
+#ifndef __NAUTILUS_ACTIONS_UTILS_H__
+#define __NAUTILUS_ACTIONS_UTILS_H__
#include <glib.h>
@@ -32,6 +40,4 @@ gchar* nautilus_actions_utils_parse_parameter (const gchar* param_template, GLis
G_END_DECLS
-#endif /* NAUTILUS_ACTIONS_UTILS_H */
-
-// vim:ts=3:sw=3:tw=1024
+#endif /* __NAUTILUS_ACTIONS_UTILS_H__ */
diff --git a/plugin/nautilus-actions.c b/plugin/nautilus-actions.c
index b3e9643..4eeca4b 100644
--- a/plugin/nautilus-actions.c
+++ b/plugin/nautilus-actions.c
@@ -27,6 +27,7 @@
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
@@ -55,8 +56,9 @@ GType nautilus_actions_get_type (void)
#ifndef HAVE_NAUTILUS_MENU_PROVIDER_EMIT_ITEMS_UPDATED_SIGNAL
static void nautilus_menu_provider_emit_items_updated_signal (NautilusMenuProvider *provider)
{
- //--> fake function for backward compatibility
- //-> do nothing
+ /* -> fake function for backward compatibility
+ * -> do nothing
+ */
}
#endif
@@ -229,7 +231,7 @@ static void nautilus_actions_action_changed_handler (NautilusActionsConfig* conf
static void nautilus_actions_instance_finalize (GObject* obj)
{
- //NautilusActions* self = NAUTILUS_ACTIONS (obj);
+ /*NautilusActions* self = NAUTILUS_ACTIONS (obj);*/
/* Chain up to the parent class */
G_OBJECT_CLASS (parent_class)->finalize (obj);
@@ -245,17 +247,18 @@ static void nautilus_actions_class_init (NautilusActionsClass *actions_class)
static void nautilus_actions_instance_init (GTypeInstance *instance, gpointer klass)
{
- // Patch from Bruce van der Kooij <brucevdkooij gmail com>
- //
- // TODO: GnomeVFS needs to be initialized before gnome_vfs methods
- // can be used. Since GnomeVFS has been deprecated it would be
- // a good idea to rewrite this extension to use equivelant methods
- // from GIO/GVFS.
- //
- // plugins/nautilus-actions-utils.c:nautilus_actions_utils_parse_parameter
- // is the only function that makes use of gnome_vfs methods.
- //
- // See: Bug #574919
+ /* Patch from Bruce van der Kooij <brucevdkooij gmail com>
+ *
+ * TODO: GnomeVFS needs to be initialized before gnome_vfs methods
+ * can be used. Since GnomeVFS has been deprecated it would be
+ * a good idea to rewrite this extension to use equivelant methods
+ * from GIO/GVFS.
+ *
+ * plugins/nautilus-actions-utils.c:nautilus_actions_utils_parse_parameter
+ * is the only function that makes use of gnome_vfs methods.
+ *
+ * See: Bug #574919
+ */
gnome_vfs_init ();
NautilusActions* self = NAUTILUS_ACTIONS (instance);
diff --git a/plugin/nautilus-actions.h b/plugin/nautilus-actions.h
index dcaee0a..80ed12d 100644
--- a/plugin/nautilus-actions.h
+++ b/plugin/nautilus-actions.h
@@ -1,28 +1,36 @@
-/* Nautilus Actions configuration tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
- * Rodrigo Moya (rodrigo gnome-db org)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef NAUTILUS_ACTIONS_H
-#define NAUTILUS_ACTIONS_H
+#ifndef __NAUTILUS_ACTIONS_H__
+#define __NAUTILUS_ACTIONS_H__
#include <glib-object.h>
#include <libnautilus-actions/nautilus-actions-config-gconf-reader.h>
@@ -39,7 +47,7 @@ G_BEGIN_DECLS
typedef struct _NautilusActions NautilusActions;
typedef struct _NautilusActionsClass NautilusActionsClass;
-struct _NautilusActions
+struct _NautilusActions
{
GObject __parent;
NautilusActionsConfigGconfReader* configs;
@@ -57,6 +65,4 @@ void nautilus_actions_register_type (GTypeModule *module);
G_END_DECLS
-#endif /* NAUTILUS_ACTIONS_H */
-
-// vim:ts=3:sw=3:tw=1024
+#endif /* __NAUTILUS_ACTIONS_H__ */
diff --git a/utils/nautilus-actions-check-actions-change.c b/utils/nautilus-actions-check-actions-change.c
index 617d92d..f5734c7 100644
--- a/utils/nautilus-actions-check-actions-change.c
+++ b/utils/nautilus-actions-check-actions-change.c
@@ -27,6 +27,7 @@
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
@@ -39,8 +40,8 @@ static void nautilus_actions_action_added_handler (NautilusActionsConfig* config
gpointer user_data)
{
printf ("Action added: <>\n");
- //nautilus_actions_config_free_actions_list (self->config_list);
- //self->config_list = nautilus_actions_config_get_actions (NAUTILUS_ACTIONS_CONFIG (self->configs));
+ /*nautilus_actions_config_free_actions_list (self->config_list);*/
+ /*self->config_list = nautilus_actions_config_get_actions (NAUTILUS_ACTIONS_CONFIG (self->configs));*/
}
static void nautilus_actions_action_changed_handler (NautilusActionsConfig* config,
@@ -50,8 +51,8 @@ static void nautilus_actions_action_changed_handler (NautilusActionsConfig* conf
printf ("Action changed: <%s>\n", action->label);
NautilusActionsConfigAction *cur_action = nautilus_actions_config_get_action (config, action->uuid);
printf ("Action changed: cur <%s>\n", cur_action->label);
- //nautilus_actions_config_free_actions_list (self->config_list);
- //self->config_list = nautilus_actions_config_get_actions (NAUTILUS_ACTIONS_CONFIG (self->configs));
+ /*nautilus_actions_config_free_actions_list (self->config_list);*/
+ /*self->config_list = nautilus_actions_config_get_actions (NAUTILUS_ACTIONS_CONFIG (self->configs));*/
}
static void nautilus_actions_action_removed_handler (NautilusActionsConfig* config,
@@ -59,8 +60,8 @@ static void nautilus_actions_action_removed_handler (NautilusActionsConfig* conf
gpointer user_data)
{
printf ("Action removed: <>\n");
- //nautilus_actions_config_free_actions_list (self->config_list);
- //self->config_list = nautilus_actions_config_get_actions (NAUTILUS_ACTIONS_CONFIG (self->configs));
+ /*nautilus_actions_config_free_actions_list (self->config_list);*/
+ /*self->config_list = nautilus_actions_config_get_actions (NAUTILUS_ACTIONS_CONFIG (self->configs));*/
}
diff --git a/utils/nautilus-actions-new-config.c b/utils/nautilus-actions-new-config.c
index a57e6f2..21cc312 100644
--- a/utils/nautilus-actions-new-config.c
+++ b/utils/nautilus-actions-new-config.c
@@ -1,23 +1,32 @@
-/* Nautilus Actions new config tool
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
@@ -64,7 +73,7 @@ static GOptionEntry entries[] =
int main (int argc, char** argv)
{
- //GSList* iter;
+ /*GSList* iter;*/
GError * error = NULL;
GOptionContext* context;
gchar* path;
@@ -119,7 +128,7 @@ int main (int argc, char** argv)
nautilus_actions_config_action_profile_set_basenames (action_profile, basenames);
g_slist_foreach (basenames, (GFunc) g_free, NULL);
g_slist_free (basenames);
-
+
nautilus_actions_config_action_profile_set_match_case (action_profile, match_case);
i = 0;
@@ -156,16 +165,16 @@ int main (int argc, char** argv)
path = nautilus_actions_config_schema_writer_get_saved_filename (schema_configs, action->uuid);
if (output_file)
{
- // Copy the content of the temporary file into the one asked by the user
+ /* Copy the content of the temporary file into the one asked by the user */
if ((success = g_file_get_contents (path, &contents, &length, &error)))
{
success = nautilus_actions_file_set_contents (output_file, contents, length, &error);
g_free (contents);
}
- //--> Remove the temporary file
+ /* --> Remove the temporary file */
g_unlink (path);
-
+
if (!success)
{
printf (_(" Failed: Can't create %s: %s\n"), output_file, error->message);
@@ -191,5 +200,3 @@ int main (int argc, char** argv)
exit (EXIT_SUCCESS);
}
-
-// vim:ts=3:sw=3:tw=1024:cin
diff --git a/utils/nautilus-actions-tools-utils.c b/utils/nautilus-actions-tools-utils.c
index 17888c5..05e98c4 100644
--- a/utils/nautilus-actions-tools-utils.c
+++ b/utils/nautilus-actions-tools-utils.c
@@ -27,6 +27,7 @@
* and many others (see AUTHORS)
*
* pwi 2009-05-16 fix compilation warnings
+ * pwi 2009-05-17 make the source ansi-compliant
*/
#include <config.h>
diff --git a/utils/nautilus-actions-tools-utils.h b/utils/nautilus-actions-tools-utils.h
index 8386a46..6e98999 100644
--- a/utils/nautilus-actions-tools-utils.h
+++ b/utils/nautilus-actions-tools-utils.h
@@ -1,39 +1,46 @@
-/* Nautilus Actions Tools
- * Copyright (C) 2005 The GNOME Foundation
+/*
+ * Nautilus Actions
*
- * Authors:
- * Frederic Ruaudel (grumz grumz net)
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
*
* 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 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation; either version 2 of
+ * the License, 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.
+ * 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 Library; see the file COPYING. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * and many others (see AUTHORS)
+ *
+ * pwi 2009-05-17 make the source ansi-compliant
*/
-#ifndef NAUTILUS_ACTIONS_TOOLS_UTILS_H
-#define NAUTILUS_ACTIONS_TOOLS_UTILS_H
+#ifndef __NAUTILUS_ACTIONS_TOOLS_UTILS_H__
+#define __NAUTILUS_ACTIONS_TOOLS_UTILS_H__
#include <glib.h>
G_BEGIN_DECLS
-gboolean nautilus_actions_file_set_contents (const gchar* filename,
+gboolean nautilus_actions_file_set_contents (const gchar* filename,
const gchar* contents,
gssize length,
GError** error);
G_END_DECLS
-#endif /* NAUTILUS_ACTIONS_TOOLS_UTILS_H */
-
-// vim:ts=3:sw=3:tw=1024:cin
+#endif /* __NAUTILUS_ACTIONS_TOOLS_UTILS_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
