[nautilus-actions] Fix glade regression

From: Pierre Wieser <pwieser src gnome org>
To: svn-commits-list gnome org
Subject: [nautilus-actions] Fix glade regression
Date: Mon, 18 May 2009 16:43:21 -0400 (EDT)
commit 7796eba77cb1f3f5f1c3d3ef896de662ee62151c
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon May 18 22:30:40 2009 +0200

    Fix glade regression
---
 .gitignore                                         |    1 +
 Makefile.am                                        |    4 +-
 configure.ac                                       |   12 ++--
 icons/16x16/Makefile.am                            |    4 +-
 icons/22x22/Makefile.am                            |    4 +-
 icons/32x32/Makefile.am                            |    4 +-
 icons/48x48/Makefile.am                            |    4 +-
 icons/Makefile.am                                  |    4 +-
 icons/scalable/Makefile.am                         |    4 +-
 libnautilus-actions/Makefile.am                    |    4 +-
 .../nautilus-actions-config-gconf-private.h        |    4 +-
 .../nautilus-actions-config-gconf-reader.c         |    5 +-
 .../nautilus-actions-config-gconf-reader.h         |    4 +-
 .../nautilus-actions-config-gconf-writer.c         |    4 +-
 .../nautilus-actions-config-gconf-writer.h         |    4 +-
 .../nautilus-actions-config-gconf.c                |    4 +-
 .../nautilus-actions-config-gconf.h                |    4 +-
 .../nautilus-actions-config-schema-reader.c        |    5 +-
 .../nautilus-actions-config-schema-reader.h        |    4 +-
 .../nautilus-actions-config-schema-writer.c        |    4 +-
 .../nautilus-actions-config-schema-writer.h        |    4 +-
 libnautilus-actions/nautilus-actions-config.c      |    4 +-
 libnautilus-actions/nautilus-actions-config.h      |    4 +-
 m4/Makefile.am                                     |    4 +-
 m4/nact-cmdline-tools.m4                           |    4 +-
 m4/nact-nautilus-extdir.m4                         |    4 +-
 nact/Makefile.am                                   |    4 +-
 nact/nact-editor.c                                 |   65 ++++++++------
 nact/nact-editor.h                                 |   10 +--
 nact/nact-import-export.c                          |   25 +++---
 nact/nact-import-export.h                          |    4 +-
 nact/nact-prefs.c                                  |    4 +-
 nact/nact-prefs.h                                  |    4 +-
 nact/nact-profile-editor.c                         |   46 ++++++----
 nact/nact-profile-editor.h                         |    4 +-
 nact/nact-utils.c                                  |    5 +-
 nact/nact-utils.h                                  |    4 +-
 nact/nact.c                                        |   17 +++-
 nact/nact.h                                        |   15 +---
 plugin/Makefile.am                                 |    5 +-
 plugin/nautilus-actions-module.c                   |    4 +-
 plugin/nautilus-actions-test.c                     |    4 +-
 plugin/nautilus-actions-test.h                     |    4 +-
 plugin/nautilus-actions-utils.c                    |    4 +-
 plugin/nautilus-actions-utils.h                    |    4 +-
 plugin/nautilus-actions.c                          |   93 +++++++++++++++++---
 plugin/nautilus-actions.h                          |    8 +-
 utils/Makefile.am                                  |    4 +-
 utils/nautilus-actions-check-actions-change.c      |    5 +-
 utils/nautilus-actions-new-config.c                |    4 +-
 utils/nautilus-actions-tools-utils.c               |    5 +-
 utils/nautilus-actions-tools-utils.h               |    4 +-
 52 files changed, 224 insertions(+), 242 deletions(-)

diff --git a/.gitignore b/.gitignore
index 08cd46c..5a9f529 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .project
 .deps/
 .libs/
+.install/
 Makefile
 Makefile.in
 aclocal.m4
diff --git a/Makefile.am b/Makefile.am
index 1fc74ea..330f8a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,9 +23,7 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 add distcheck_configure_flags and distcleanfiles
+#   ... and many others (see AUTHORS)
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/configure.ac b/configure.ac
index 7119e45..e16a0f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,14 +23,11 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 created from configure.in
+#   ... and many others (see AUTHORS)
 
 AC_PREREQ([2.53])
 
-# Caution: 1.11 is unstable/development version
-AC_INIT([nautilus-actions],[1.11],[maintainer nautilus-actions org])
+AC_INIT([nautilus-actions],[1.10.1],[maintainer nautilus-actions org])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 
@@ -56,7 +53,7 @@ AC_CONFIG_FILES([
 
 AC_CONFIG_MACRO_DIR([m4])
 
-# pwi 2009-05-15 disabled as useless or badly explained
+# pwi 2009-05-15 disabled as GNOME_COMMON_INIT takes care if that
 #AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
 
 # don't agree with maintainer mode use
@@ -147,6 +144,9 @@ NACT_NAUTILUS_EXTDIR
 # building or not the commandline tools
 NACT_COMMANDLINE_TOOLS
 
+# define NACT_MAINTAINER_MODE variable
+NACT_IS_MAINTAINER_MODE
+
 # Check for menu update function
 AC_CHECK_LIB(nautilus-extension, nautilus_menu_item_new)
 AC_CHECK_FUNCS(nautilus_menu_provider_emit_items_updated_signal)
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 5a35434..920cdc9 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -23,9 +23,7 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 fix to make distcheck successfully
+#   ... and many others (see AUTHORS)
 
 icondir = $(datadir)/icons/hicolor/16x16/apps
 
diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am
index a1ffafc..2415c50 100644
--- a/icons/22x22/Makefile.am
+++ b/icons/22x22/Makefile.am
@@ -23,9 +23,7 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 fix to make distcheck successfully
+#   ... and many others (see AUTHORS)
 
 icondir = $(datadir)/icons/hicolor/22x22/apps
 
diff --git a/icons/32x32/Makefile.am b/icons/32x32/Makefile.am
index b22657c..32ee81c 100644
--- a/icons/32x32/Makefile.am
+++ b/icons/32x32/Makefile.am
@@ -23,9 +23,7 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 fix to make distcheck successfully
+#   ... and many others (see AUTHORS)
 
 icondir = $(datadir)/icons/hicolor/32x32/apps
 
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index 7b6c284..2600707 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -23,9 +23,7 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 fix to make distcheck successfully
+#   ... and many others (see AUTHORS)
 
 icondir = $(datadir)/icons/hicolor/48x48/apps
 
diff --git a/icons/Makefile.am b/icons/Makefile.am
index afd8d63..1e2995c 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -23,9 +23,7 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 fix to make distcheck successfully
+#   ... and many others (see AUTHORS)
 
 SUBDIRS = \
 	16x16	\
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
index 7a15963..6ad826e 100644
--- a/icons/scalable/Makefile.am
+++ b/icons/scalable/Makefile.am
@@ -23,9 +23,7 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 fix to make distcheck successfully
+#   ... and many others (see AUTHORS)
 
 svgicondir = $(datadir)/icons/hicolor/scalable/apps
 
diff --git a/libnautilus-actions/Makefile.am b/libnautilus-actions/Makefile.am
index 0f74d6e..ec5aa8b 100644
--- a/libnautilus-actions/Makefile.am
+++ b/libnautilus-actions/Makefile.am
@@ -23,9 +23,7 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 replace INCLUDES by AM_CPPFLAGS
+#   ... and many others (see AUTHORS)
 
 noinst_LTLIBRARIES = libnautilus-actions.la
 
diff --git a/libnautilus-actions/nautilus-actions-config-gconf-private.h b/libnautilus-actions/nautilus-actions-config-gconf-private.h
index 4916c89..f064f83 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf-private.h
+++ b/libnautilus-actions/nautilus-actions-config-gconf-private.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
diff --git a/libnautilus-actions/nautilus-actions-config-gconf-reader.c b/libnautilus-actions/nautilus-actions-config-gconf-reader.c
index b6e74d0..f7e9a01 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf-reader.c
+++ b/libnautilus-actions/nautilus-actions-config-gconf-reader.c
@@ -24,10 +24,7 @@
  *   Frederic Ruaudel <grumz grumz net>
  *   Rodrigo Moya <rodrigo gnome-db org>
  *   Pierre Wieser <pwieser trychlos org>
- *   and many others (see AUTHORS)
- *
- * pwi 2009-05-16 fix compilation warnings
- * pwi 2009-05-17 make the source ansi-compliant
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
diff --git a/libnautilus-actions/nautilus-actions-config-gconf-reader.h b/libnautilus-actions/nautilus-actions-config-gconf-reader.h
index e4bf060..4066adc 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf-reader.h
+++ b/libnautilus-actions/nautilus-actions-config-gconf-reader.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __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 a869894..902de4f 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf-writer.c
+++ b/libnautilus-actions/nautilus-actions-config-gconf-writer.c
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
diff --git a/libnautilus-actions/nautilus-actions-config-gconf-writer.h b/libnautilus-actions/nautilus-actions-config-gconf-writer.h
index 2785c99..341df45 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf-writer.h
+++ b/libnautilus-actions/nautilus-actions-config-gconf-writer.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __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 66f1abe..7f9aecf 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf.c
+++ b/libnautilus-actions/nautilus-actions-config-gconf.c
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
diff --git a/libnautilus-actions/nautilus-actions-config-gconf.h b/libnautilus-actions/nautilus-actions-config-gconf.h
index 1e3cd80..485b6a7 100644
--- a/libnautilus-actions/nautilus-actions-config-gconf.h
+++ b/libnautilus-actions/nautilus-actions-config-gconf.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __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 e9d9636..b3cbf8f 100644
--- a/libnautilus-actions/nautilus-actions-config-schema-reader.c
+++ b/libnautilus-actions/nautilus-actions-config-schema-reader.c
@@ -24,10 +24,7 @@
  *   Frederic Ruaudel <grumz grumz net>
  *   Rodrigo Moya <rodrigo gnome-db org>
  *   Pierre Wieser <pwieser trychlos org>
- *   and many others (see AUTHORS)
- *
- * pwi 2009-05-16 fix compilation warnings
- * pwi 2009-05-17 make the source ansi-compliant
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
diff --git a/libnautilus-actions/nautilus-actions-config-schema-reader.h b/libnautilus-actions/nautilus-actions-config-schema-reader.h
index b204c4b..da60221 100644
--- a/libnautilus-actions/nautilus-actions-config-schema-reader.h
+++ b/libnautilus-actions/nautilus-actions-config-schema-reader.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __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 2a82abc..2aeca3c 100644
--- a/libnautilus-actions/nautilus-actions-config-schema-writer.c
+++ b/libnautilus-actions/nautilus-actions-config-schema-writer.c
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
diff --git a/libnautilus-actions/nautilus-actions-config-schema-writer.h b/libnautilus-actions/nautilus-actions-config-schema-writer.h
index 50e6bca..f731baf 100644
--- a/libnautilus-actions/nautilus-actions-config-schema-writer.h
+++ b/libnautilus-actions/nautilus-actions-config-schema-writer.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __NAUTILUS_ACTIONS_CONFIG_SCHEMA_WRITER_H__
diff --git a/libnautilus-actions/nautilus-actions-config.c b/libnautilus-actions/nautilus-actions-config.c
index 0672b14..c35db36 100644
--- a/libnautilus-actions/nautilus-actions-config.c
+++ b/libnautilus-actions/nautilus-actions-config.c
@@ -24,9 +24,7 @@
  *   Frederic Ruaudel <grumz grumz net>
  *   Rodrigo Moya <rodrigo gnome-db org>
  *   Pierre Wieser <pwieser trychlos org>
- *   and many others (see AUTHORS)
- *
- * pwi 2009-05-16 fix compilation warnings
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
diff --git a/libnautilus-actions/nautilus-actions-config.h b/libnautilus-actions/nautilus-actions-config.h
index 17890c3..3e5638d 100644
--- a/libnautilus-actions/nautilus-actions-config.h
+++ b/libnautilus-actions/nautilus-actions-config.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __NAUTILUS_ACTIONS_CONFIG_H__
diff --git a/m4/Makefile.am b/m4/Makefile.am
index d7cee45..d6b6d76 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -23,6 +23,4 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 creation
+#   ... and many others (see AUTHORS)
diff --git a/m4/nact-cmdline-tools.m4 b/m4/nact-cmdline-tools.m4
index 672f3a6..8584dd8 100644
--- a/m4/nact-cmdline-tools.m4
+++ b/m4/nact-cmdline-tools.m4
@@ -23,9 +23,7 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 creation
+#   ... and many others (see AUTHORS)
 
 # serial 1 creation
 
diff --git a/m4/nact-nautilus-extdir.m4 b/m4/nact-nautilus-extdir.m4
index aa09655..3f88fac 100644
--- a/m4/nact-nautilus-extdir.m4
+++ b/m4/nact-nautilus-extdir.m4
@@ -23,9 +23,7 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 creation
+#   ... and many others (see AUTHORS)
 
 # serial 1 creation
 
diff --git a/nact/Makefile.am b/nact/Makefile.am
index 739e586..c6d559b 100644
--- a/nact/Makefile.am
+++ b/nact/Makefile.am
@@ -23,9 +23,7 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 replace INCLUDES by AM_CPPFLAGS
+#   ... and many others (see AUTHORS)
 
 bin_PROGRAMS = \
 	nautilus-actions-config
diff --git a/nact/nact-editor.c b/nact/nact-editor.c
index 7139eca..cbe4a5e 100644
--- a/nact/nact-editor.c
+++ b/nact/nact-editor.c
@@ -24,10 +24,7 @@
  *   Frederic Ruaudel <grumz grumz net>
  *   Rodrigo Moya <rodrigo gnome-db org>
  *   Pierre Wieser <pwieser trychlos org>
- *   and many others (see AUTHORS)
- *
- * pwi 2009-05-16 fix compilation warnings
- * pwi 2009-05-17 make the source ansi-compliant
+ *   ... and many others (see AUTHORS)
  */
 
 #include <string.h>
@@ -42,7 +39,16 @@
 #include "nact-prefs.h"
 #include "nact.h"
 
-static void field_changed_cb (GObject *object, gpointer user_data);
+/* gui callback functions */
+void icon_browse_button_clicked_cb (GtkButton *button, gpointer user_data);
+void field_changed_cb (GObject *object, gpointer user_data);
+void delete_prof_button_clicked_cb (GtkButton *button, gpointer user_data);
+void paste_prof_button_clicked_cb (GtkButton *button, gpointer user_data);
+void add_prof_button_clicked_cb (GtkButton *button, gpointer user_data);
+void copy_prof_button_clicked_cb (GtkButton *button, gpointer user_data);
+void edit_prof_button_clicked_cb (GtkButton *button, gpointer user_data);
+
+static void nact_editor_fill_profiles_list (GtkWidget *list, NautilusActionsConfigAction* action);
 
 enum {
 	ICON_STOCK_COLUMN = 0,
@@ -73,7 +79,7 @@ strip_underscore (const gchar *text)
 	return result;
 }
 
-static void
+void
 field_changed_cb (GObject *object, gpointer user_data)
 {
 	GtkWidget* editor = nact_get_glade_widget_from ("EditActionDialog", GLADE_EDIT_DIALOG_WIDGET);
@@ -86,7 +92,7 @@ field_changed_cb (GObject *object, gpointer user_data)
 		gtk_dialog_set_response_sensitive (GTK_DIALOG (editor), GTK_RESPONSE_OK, FALSE);
 }
 
-/*void
+void
 icon_browse_button_clicked_cb (GtkButton *button, gpointer user_data)
 {
 	gchar* last_dir;
@@ -122,7 +128,7 @@ icon_browse_button_clicked_cb (GtkButton *button, gpointer user_data)
 		case GTK_RESPONSE_DELETE_EVENT:
 			gtk_widget_hide (filechooser);
 	}
-}*/
+}
 
 static gint sort_stock_ids (gconstpointer a, gconstpointer b)
 {
@@ -336,7 +342,8 @@ profile_name_edited_cb (GtkCellRendererText *cell,
 	gtk_tree_path_free (path);
 }
 
-void nact_editor_fill_profiles_list (GtkWidget *list, NautilusActionsConfigAction* action)
+static void
+nact_editor_fill_profiles_list (GtkWidget *list, NautilusActionsConfigAction* action)
 {
 	GSList *profile_names = NULL, *l;
 	GtkListStore *model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW (list)));
@@ -367,7 +374,7 @@ void nact_editor_fill_profiles_list (GtkWidget *list, NautilusActionsConfigActio
 	g_slist_free (profile_names);
 }
 
-/*void
+void
 add_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 {
 	GtkWidget* profile_list = nact_get_glade_widget_from ("ProfilesList", GLADE_EDIT_DIALOG_WIDGET);
@@ -380,9 +387,9 @@ add_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 		nact_editor_fill_profiles_list (nact_get_glade_widget_from ("ProfilesList", GLADE_EDIT_DIALOG_WIDGET), action);
 		field_changed_cb (G_OBJECT (profile_list), NULL);
 	}
-}*/
+}
 
-/*void
+void
 edit_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 {
 	GtkTreeSelection *selection;
@@ -415,15 +422,15 @@ edit_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 
 		g_free (profile_name);
 	}
-}*/
+}
 
-/*void
+void
 copy_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 {
 	GtkTreeSelection *selection;
 	GtkTreeIter iter;
 	GtkTreeModel* model;
-	GError* error = NULL;
+	/*GError* error = NULL;*/
 	gchar* tmp;
 	GtkWidget *nact_prof_paste_button;
 	GtkWidget *nact_profiles_list = nact_get_glade_widget_from ("ProfilesList", GLADE_EDIT_DIALOG_WIDGET);
@@ -447,7 +454,7 @@ copy_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 
 		if (action && new_action_profile)
 		{
-			// Remove and free any existing data
+			/* Remove and free any existing data */
 			nautilus_actions_config_action_profile_free (g_object_steal_data (G_OBJECT (nact_prof_paste_button), "profile"));
 
 			g_object_set_data (G_OBJECT (nact_prof_paste_button), "profile", new_action_profile);
@@ -456,7 +463,7 @@ copy_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 		}
 		else
 		{
-			// i18n notes: will be displayed in a dialog
+			/* i18n notes: will be displayed in a dialog */
 			tmp = g_strdup_printf (_("Can't copy action's profile '%s'!"), profile_name);
 			nautilus_actions_display_error (tmp, "");
 			g_free (tmp);
@@ -464,14 +471,14 @@ copy_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 
 		g_free (profile_name);
 	}
-}*/
+}
 
-/*void
+void
 paste_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 {
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	GtkTreeModel* model;
+	/*GtkTreeSelection *selection;*/
+	/*GtkTreeIter iter;*/
+	/*GtkTreeModel* model;*/
 	GError* error = NULL;
 	gchar* tmp;
 	gchar* new_profile_name;
@@ -480,15 +487,15 @@ paste_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 	GtkWidget *nact_prof_paste_button = nact_get_glade_widget_from ("PasteProfileButton", GLADE_EDIT_DIALOG_WIDGET);
 	NautilusActionsConfigActionProfile* action_profile = (NautilusActionsConfigActionProfile*)g_object_get_data (G_OBJECT (nact_prof_paste_button), "profile");
 
-	/ * i18n notes: will be displayed in a dialog * /
+	/* i18n notes: will be displayed in a dialog */
 	const gchar *cantpaste = _( "Can't paste action's profile '%s'!" );
 
 	printf ("profile_name : %s\n", action_profile->desc_name);
 
-	// i18n notes: this is the default name of a copied profile
+	/* i18n notes: this is the default name of a copied profile */
 	gchar* new_profile_desc_name = g_strdup_printf (_("%s Copy"), action_profile->desc_name);
 
-	// Get a new uniq profile key name but not a new desc name because we already have it.
+	/* Get a new uniq profile key name but not a new desc name because we already have it. */
 	nautilus_actions_config_action_get_new_default_profile_name (action, &new_profile_name, NULL);
 
 	NautilusActionsConfigActionProfile* new_action_profile = nautilus_actions_config_action_profile_dup (action_profile);
@@ -515,9 +522,9 @@ paste_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 		nautilus_actions_display_error (tmp, "");
 		g_free (tmp);
 	}
-}*/
+}
 
-/*void
+void
 delete_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 {
 	GtkTreeSelection *selection;
@@ -544,7 +551,7 @@ delete_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 		}
 		else
 		{
-			// i18n notes: will be displayed in a dialog
+			/* i18n notes: will be displayed in a dialog */
 			tmp = g_strdup_printf (_("Can't delete action's profile '%s'!"), profile_name);
 			nautilus_actions_display_error (tmp, "");
 			g_free (tmp);
@@ -552,7 +559,7 @@ delete_prof_button_clicked_cb (GtkButton *button, gpointer user_data)
 
 		g_free (profile_name);
 	}
-}*/
+}
 
 static void
 profile_list_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data)
diff --git a/nact/nact-editor.h b/nact/nact-editor.h
index ef92dab..d8789d0 100644
--- a/nact/nact-editor.h
+++ b/nact/nact-editor.h
@@ -24,16 +24,13 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __NACT_EDITOR_H__
 #define __NACT_EDITOR_H__
 
 #include <libnautilus-actions/nautilus-actions-config.h>
-#include <libnautilus-actions/nautilus-actions-config-gconf-writer.h>
 
 enum {
 	PROFILE_LABEL_COLUMN = 0,
@@ -41,8 +38,7 @@ enum {
 	N_PROF_COLUMN
 };
 
-gboolean nact_editor_new_action (void);
-gboolean nact_editor_edit_action (NautilusActionsConfigAction *action);
-void nact_editor_fill_profiles_list (GtkWidget *list, NautilusActionsConfigAction* action);
+gboolean nact_editor_new_action(void );
+gboolean nact_editor_edit_action( NautilusActionsConfigAction* action );
 
 #endif /* __NACT_EDITOR_H__ */
diff --git a/nact/nact-import-export.c b/nact/nact-import-export.c
index ff365c2..a35101c 100644
--- a/nact/nact-import-export.c
+++ b/nact/nact-import-export.c
@@ -24,10 +24,7 @@
  *   Frederic Ruaudel <grumz grumz net>
  *   Rodrigo Moya <rodrigo gnome-db org>
  *   Pierre Wieser <pwieser trychlos org>
- *   and many others (see AUTHORS)
- *
- * pwi 2009-05-16 fix compilation warnings
- * pwi 2009-05-17 make the source ansi-compliant
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
@@ -45,11 +42,16 @@
 #include "nact-prefs.h"
 #include "nact.h"
 
+/* gui callback functions */
+void import_browse_button_clicked_cb (GtkWidget* widget, gpointer data);
+void export_browse_button_clicked_cb (GtkWidget* widget, gpointer data);
+void mode_toggled_cb (GtkWidget* widget, gpointer user_data);
+
 static gboolean nact_import_actions (void);
 static gboolean nact_export_actions (void);
 
-/*
-void mode_toggled_cb (GtkWidget* widget, gpointer user_data)
+void
+mode_toggled_cb (GtkWidget* widget, gpointer user_data)
 {
 	GtkWidget* import_radio = nact_get_glade_widget_from ("ImportRadioButton", GLADE_IM_EX_PORT_DIALOG_WIDGET);
 
@@ -64,10 +66,9 @@ void mode_toggled_cb (GtkWidget* widget, gpointer user_data)
 		gtk_widget_set_sensitive (nact_get_glade_widget_from ("ImportVBox", GLADE_IM_EX_PORT_DIALOG_WIDGET), FALSE);
 	}
 }
-*/
 
-/*
-void import_browse_button_clicked_cb (GtkWidget* widget, gpointer data)
+void
+import_browse_button_clicked_cb (GtkWidget* widget, gpointer data)
 {
 	gchar* last_dir;
 	gchar* filename;
@@ -103,10 +104,9 @@ void import_browse_button_clicked_cb (GtkWidget* widget, gpointer data)
 			gtk_widget_hide (filechooser);
 	}
 }
-*/
 
-/*
-void export_browse_button_clicked_cb (GtkWidget* widget, gpointer data)
+void
+export_browse_button_clicked_cb (GtkWidget* widget, gpointer data)
 {
 	gchar* last_dir;
 	gchar* foldername;
@@ -142,7 +142,6 @@ void export_browse_button_clicked_cb (GtkWidget* widget, gpointer data)
 			gtk_widget_hide (folderchooser);
 	}
 }
-*/
 
 static void
 list_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data)
diff --git a/nact/nact-import-export.h b/nact/nact-import-export.h
index 5e9c71f..1ef66f3 100644
--- a/nact/nact-import-export.h
+++ b/nact/nact-import-export.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __NACT_IMPORT_EXPORT_H__
diff --git a/nact/nact-prefs.c b/nact/nact-prefs.c
index eaf90b4..19a5937 100644
--- a/nact/nact-prefs.c
+++ b/nact/nact-prefs.c
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
diff --git a/nact/nact-prefs.h b/nact/nact-prefs.h
index 8e824df..ebf0604 100644
--- a/nact/nact-prefs.h
+++ b/nact/nact-prefs.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __NACT_PREFS_H__
diff --git a/nact/nact-profile-editor.c b/nact/nact-profile-editor.c
index e3c02b8..5a17e07 100644
--- a/nact/nact-profile-editor.c
+++ b/nact/nact-profile-editor.c
@@ -24,10 +24,7 @@
  *   Frederic Ruaudel <grumz grumz net>
  *   Rodrigo Moya <rodrigo gnome-db org>
  *   Pierre Wieser <pwieser trychlos org>
- *   and many others (see AUTHORS)
- *
- * pwi 2009-05-16 fix compilation warnings
- * pwi 2009-05-17 make the source ansi-compliant
+ *   ... and many others (see AUTHORS)
  */
 
 #include <string.h>
@@ -42,8 +39,16 @@
 #include "nact-prefs.h"
 #include "nact.h"
 
+/* gui callback functions */
+void profile_field_changed_cb (GObject *object, gpointer user_data);
+void path_browse_button_clicked_cb (GtkButton *button, gpointer user_data);
+void legend_button_toggled_cb (GtkToggleButton *button, gpointer user_data);
+void add_scheme_clicked (GtkWidget* widget, gpointer user_data);
+void remove_scheme_clicked (GtkWidget* widget, gpointer user_data);
+
 static void update_example_label (void);
-static void profile_field_changed_cb (GObject *object, gpointer user_data);
+static void show_legend_dialog( void );
+static void hide_legend_dialog( void );
 
 static void
 update_example_label (void)
@@ -67,7 +72,7 @@ update_example_label (void)
 	g_free (tmp);
 }
 
-static void
+void
 profile_field_changed_cb (GObject *object, gpointer user_data)
 {
 	GtkWidget* editor = nact_get_glade_widget_from ("EditProfileDialog", GLADE_EDIT_PROFILE_DIALOG_WIDGET);
@@ -87,7 +92,8 @@ example_changed_cb (GObject *object, gpointer user_data)
 {
 }*/
 
-/*void path_browse_button_clicked_cb (GtkButton *button, gpointer user_data)
+void
+path_browse_button_clicked_cb (GtkButton *button, gpointer user_data)
 {
 	gchar* last_dir;
 	gchar* filename;
@@ -122,18 +128,18 @@ example_changed_cb (GObject *object, gpointer user_data)
 		case GTK_RESPONSE_DELETE_EVENT:
 			gtk_widget_hide (filechooser);
 	}
-}*/
+}
 
-/*static void
+static void
 show_legend_dialog ()
 {
 	GtkWidget* editor = nact_get_glade_widget_from ("EditActionDialog", GLADE_EDIT_PROFILE_DIALOG_WIDGET);
 	GtkWidget *legend_dialog = nact_get_glade_widget_from ("LegendDialog", GLADE_LEGEND_DIALOG_WIDGET);
 	gtk_window_set_deletable (GTK_WINDOW (legend_dialog), FALSE);
 	gtk_window_set_transient_for (GTK_WINDOW (legend_dialog), GTK_WINDOW (editor));
-	// TODO: Get back the last position saved !!
+	/* TODO: Get back the last position saved !! */
 	gtk_widget_show (legend_dialog);
-}*/
+}
 
 static void
 hide_legend_dialog ()
@@ -149,7 +155,7 @@ hide_legend_dialog ()
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (legend_button), FALSE);
 }
 
-/*void
+void
 legend_button_toggled_cb (GtkToggleButton *button, gpointer user_data)
 {
 	if (gtk_toggle_button_get_active (button))
@@ -160,7 +166,7 @@ legend_button_toggled_cb (GtkToggleButton *button, gpointer user_data)
 	{
 		hide_legend_dialog ();
 	}
-}*/
+}
 
 static void scheme_selection_toggled_cb (GtkCellRendererToggle *cell_renderer,
 													  gchar *path_str,
@@ -246,7 +252,8 @@ scheme_list_selection_changed_cb (GtkTreeSelection *selection, gpointer user_dat
 	}
 }
 
-/*void add_scheme_clicked (GtkWidget* widget, gpointer user_data)
+void
+add_scheme_clicked (GtkWidget* widget, gpointer user_data)
 {
 	GtkWidget* listview = nact_get_glade_widget_from ("SchemesTreeView", GLADE_EDIT_PROFILE_DIALOG_WIDGET);
 	GtkTreeModel* model = gtk_tree_view_get_model (GTK_TREE_VIEW (listview));
@@ -254,12 +261,13 @@ scheme_list_selection_changed_cb (GtkTreeSelection *selection, gpointer user_dat
 
 	gtk_list_store_append (GTK_LIST_STORE (model), &row);
 	gtk_list_store_set (GTK_LIST_STORE (model), &row, SCHEMES_CHECKBOX_COLUMN, FALSE,
-												/ * i18n notes : scheme name set for a new entry in the scheme list * /
+												/* i18n notes : scheme name set for a new entry in the scheme list */
 												SCHEMES_KEYWORD_COLUMN, _("new-scheme"),
 												SCHEMES_DESC_COLUMN, _("New Scheme Description"), -1);
-}*/
+}
 
-/*void remove_scheme_clicked (GtkWidget* widget, gpointer user_data)
+void
+remove_scheme_clicked (GtkWidget* widget, gpointer user_data)
 {
 	GtkWidget* listview = nact_get_glade_widget_from ("SchemesTreeView", GLADE_EDIT_PROFILE_DIALOG_WIDGET);
 	GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (listview));
@@ -282,7 +290,7 @@ scheme_list_selection_changed_cb (GtkTreeSelection *selection, gpointer user_dat
 
 		if (toggle_state)
 		{
-			//--> if column was checked, set the action has edited
+			/* --> if column was checked, set the action has edited */
 			profile_field_changed_cb (G_OBJECT (widget), NULL);
 			update_example_label ();
 		}
@@ -290,7 +298,7 @@ scheme_list_selection_changed_cb (GtkTreeSelection *selection, gpointer user_dat
 
 	g_list_foreach (selected_values_path, (GFunc)gtk_tree_path_free, NULL);
 	g_list_free (selected_values_path);
-}*/
+}
 
 static void create_schemes_selection_list (void)
 {
diff --git a/nact/nact-profile-editor.h b/nact/nact-profile-editor.h
index bc2f031..47788d2 100644
--- a/nact/nact-profile-editor.h
+++ b/nact/nact-profile-editor.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __NACT_PROFILE_EDITOR_H__
diff --git a/nact/nact-utils.c b/nact/nact-utils.c
index abc5f38..bc52c25 100644
--- a/nact/nact-utils.c
+++ b/nact/nact-utils.c
@@ -24,10 +24,7 @@
  *   Frederic Ruaudel <grumz grumz net>
  *   Rodrigo Moya <rodrigo gnome-db org>
  *   Pierre Wieser <pwieser trychlos org>
- *   and many others (see AUTHORS)
- *
- * pwi 2009-05-16 fix compilation warnings
- * pwi 2009-05-17 make the source ansi-compliant
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
diff --git a/nact/nact-utils.h b/nact/nact-utils.h
index 4f14164..d0b0765 100644
--- a/nact/nact-utils.h
+++ b/nact/nact-utils.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __NACT_UTILS_H__
diff --git a/nact/nact.c b/nact/nact.c
index b08c99a..0740dde 100644
--- a/nact/nact.c
+++ b/nact/nact.c
@@ -24,10 +24,7 @@
  *   Frederic Ruaudel <grumz grumz net>
  *   Rodrigo Moya <rodrigo gnome-db org>
  *   Pierre Wieser <pwieser trychlos org>
- *   and many others (see AUTHORS)
- *
- * pwi 2009-05-16 fix compilation warnings
- * pwi 2009-05-17 make the source ansi-compliant
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
@@ -47,8 +44,17 @@
 #include "nact-import-export.h"
 #include "nact-prefs.h"
 
+/* gui callback functions */
+void dialog_response_cb (GtkDialog *dialog, gint response_id, gpointer user_data);
+void add_button_clicked_cb (GtkButton *button, gpointer user_data);
+void delete_button_clicked_cb (GtkButton *button, gpointer user_data);
+void duplicate_button_clicked_cb (GtkButton *button, gpointer user_data);
+void edit_button_clicked_cb (GtkButton *button, gpointer user_data);
+void im_export_button_clicked_cb (GtkButton *button, gpointer user_data);
+
 static gint actions_list_sort_by_label (gconstpointer a1, gconstpointer a2);
 static void list_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data);
+static void nact_fill_actions_list (GtkWidget *list);
 
 static NautilusActionsConfigGconfWriter *config = NULL;
 
@@ -61,7 +67,8 @@ actions_list_sort_by_label (gconstpointer a1, gconstpointer a2)
 	return g_utf8_collate (action1->label, action2->label);
 }
 
-void nact_fill_actions_list (GtkWidget *list)
+static void
+nact_fill_actions_list (GtkWidget *list)
 {
 	GSList *actions, *l;
 	GtkListStore *model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW (list)));
diff --git a/nact/nact.h b/nact/nact.h
index 6210f35..32ca80e 100644
--- a/nact/nact.h
+++ b/nact/nact.h
@@ -24,16 +24,12 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __NACT_H__
 #define __NACT_H__
 
-#include <gtk/gtk.h>
-
 enum {
 	MENU_ICON_COLUMN = 0,
 	MENU_LABEL_COLUMN,
@@ -41,13 +37,4 @@ enum {
 	N_COLUMN
 };
 
-void nact_fill_actions_list (GtkWidget *list);
-
-void dialog_response_cb (GtkDialog *dialog, gint response_id, gpointer user_data);
-void add_button_clicked_cb (GtkButton *button, gpointer user_data);
-void delete_button_clicked_cb (GtkButton *button, gpointer user_data);
-void duplicate_button_clicked_cb (GtkButton *button, gpointer user_data);
-void edit_button_clicked_cb (GtkButton *button, gpointer user_data);
-void im_export_button_clicked_cb (GtkButton *button, gpointer user_data);
-
 #endif /* __NACT_H__ */
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index a4bec8b..48eca35 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -23,12 +23,11 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 replace INCLUDES by AM_CPPFLAGS
+#   ... and many others (see AUTHORS)
 
 AM_CPPFLAGS += \
 	-I $(top_srcdir)									\
+	-DG_LOG_DOMAIN=\"NACT-Plugin\"						\
 	$(NAUTILUS_ACTIONS_CFLAGS)
 
 nautilus_extensiondir = $(NAUTILUS_EXTENSIONS_DIR)
diff --git a/plugin/nautilus-actions-module.c b/plugin/nautilus-actions-module.c
index 1cccf30..3eb2eb8 100644
--- a/plugin/nautilus-actions-module.c
+++ b/plugin/nautilus-actions-module.c
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #include <libnautilus-extension/nautilus-extension-types.h>
diff --git a/plugin/nautilus-actions-test.c b/plugin/nautilus-actions-test.c
index 100687a..6375a7d 100644
--- a/plugin/nautilus-actions-test.c
+++ b/plugin/nautilus-actions-test.c
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #include <libnautilus-extension/nautilus-file-info.h>
diff --git a/plugin/nautilus-actions-test.h b/plugin/nautilus-actions-test.h
index 077ffae..8816803 100644
--- a/plugin/nautilus-actions-test.h
+++ b/plugin/nautilus-actions-test.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __NAUTILUS_ACTIONS_TEST_H__
diff --git a/plugin/nautilus-actions-utils.c b/plugin/nautilus-actions-utils.c
index 83acfcc..b9360c6 100644
--- a/plugin/nautilus-actions-utils.c
+++ b/plugin/nautilus-actions-utils.c
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #include <glib.h>
diff --git a/plugin/nautilus-actions-utils.h b/plugin/nautilus-actions-utils.h
index 6bbce67..0411420 100644
--- a/plugin/nautilus-actions-utils.h
+++ b/plugin/nautilus-actions-utils.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __NAUTILUS_ACTIONS_UTILS_H__
diff --git a/plugin/nautilus-actions.c b/plugin/nautilus-actions.c
index 4eeca4b..181a5c7 100644
--- a/plugin/nautilus-actions.c
+++ b/plugin/nautilus-actions.c
@@ -24,14 +24,12 @@
  *   Frederic Ruaudel <grumz grumz net>
  *   Rodrigo Moya <rodrigo gnome-db org>
  *   Pierre Wieser <pwieser trychlos org>
- *   and many others (see AUTHORS)
- *
- * pwi 2009-05-16 fix compilation warnings
- * pwi 2009-05-17 make the source ansi-compliant
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
 #include <string.h>
+#include <syslog.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-file-info.h>
@@ -47,6 +45,9 @@
 
 static GObjectClass *parent_class = NULL;
 static GType actions_type = 0;
+static guint log_handler = 0;
+
+static void nact_log_handler( const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data );
 
 GType nautilus_actions_get_type (void)
 {
@@ -64,6 +65,9 @@ static void nautilus_menu_provider_emit_items_updated_signal (NautilusMenuProvid
 
 static void nautilus_actions_execute (NautilusMenuItem *item, NautilusActionsConfigActionProfile *action_profile)
 {
+	static const gchar *thisfn = "nautilus_actions_execute";
+	g_debug( "%s", thisfn );
+
 	GList *files;
 	GString *cmd;
 	gchar* param = NULL;
@@ -81,6 +85,7 @@ static void nautilus_actions_execute (NautilusMenuItem *item, NautilusActionsCon
 	}
 
 	g_spawn_command_line_async (cmd->str, NULL);
+	g_debug( "%s: commande='%s'", thisfn, cmd->str );
 
 	g_string_free (cmd, TRUE);
 
@@ -105,6 +110,9 @@ static const gchar* get_verified_icon_name (const gchar* icon_name)
 
 static NautilusMenuItem *nautilus_actions_create_menu_item (NautilusActionsConfigAction *action, GList *files, NautilusActionsConfigActionProfile* action_profile)
 {
+	static const gchar *thisfn = "nautilus_actions_create_menu_item";
+	g_debug( "%s", thisfn );
+
 	NautilusMenuItem *item;
 	gchar* name;
 	const gchar* icon_name = get_verified_icon_name (g_strstrip (action->icon));
@@ -142,6 +150,9 @@ static void get_hash_keys (gchar* key, gchar* value, GSList** list)
 
 static GList *nautilus_actions_get_file_items (NautilusMenuProvider *provider, GtkWidget *window, GList *files)
 {
+	static const gchar *thisfn = "nautilus_actions_get_file_items";
+	g_debug( "%s provider=%p, window=%p, files=%p, count=%d", thisfn, provider, window, files, g_list_length( files ));
+
 	GList *items = NULL;
 	GSList *iter;
 	NautilusMenuItem *item;
@@ -199,6 +210,9 @@ static GList *nautilus_actions_get_background_items (NautilusMenuProvider *provi
 
 static void nautilus_actions_instance_dispose (GObject *obj)
 {
+	static const gchar *thisfn = "nautilus_actions_instance_dispose";
+	g_debug( "%s: obj=%p", thisfn, obj );
+
 	NautilusActions* self = NAUTILUS_ACTIONS (obj);
 
 	if (!self->dispose_has_run)
@@ -216,6 +230,9 @@ static void nautilus_actions_action_changed_handler (NautilusActionsConfig* conf
 																				NautilusActionsConfigAction* action,
 																				gpointer user_data)
 {
+	static const gchar *thisfn = "nautilus_actions_action_changed_handler";
+	g_debug( "%s", thisfn );
+
 	NautilusActions* self = NAUTILUS_ACTIONS (user_data);
 
 	g_return_if_fail (NAUTILUS_IS_ACTIONS (self));
@@ -231,27 +248,34 @@ static void nautilus_actions_action_changed_handler (NautilusActionsConfig* conf
 
 static void nautilus_actions_instance_finalize (GObject* obj)
 {
+	static const gchar *thisfn = "nautilus_actions_instance_finalize";
+	g_debug( "%s: obj=%p", thisfn, obj );
+
 	/*NautilusActions* self = NAUTILUS_ACTIONS (obj);*/
 
+	/* remove the log handler
+	 * almost useless as the process is nonetheless terminating at this time
+	 * but this is the beauty of the code...
+	 */
+	if( log_handler ){
+		g_log_remove_handler( G_LOG_DOMAIN, log_handler );
+		log_handler = 0;
+	}
+
 	/* Chain up to the parent class */
 	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
-static void nautilus_actions_class_init (NautilusActionsClass *actions_class)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (actions_class);
-
-	gobject_class->dispose = nautilus_actions_instance_dispose;
-	gobject_class->finalize = nautilus_actions_instance_finalize;
-}
-
 static void nautilus_actions_instance_init (GTypeInstance *instance, gpointer klass)
 {
+	static const gchar *thisfn = "nautilus_actions_instance_init";
+	g_debug( "%s: instance=%p, klass=%p", thisfn, instance, 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
+	 * a good idea to rewrite this extension to use equivalent methods
 	 * from GIO/GVFS.
 	 *
 	 * plugins/nautilus-actions-utils.c:nautilus_actions_utils_parse_parameter
@@ -284,12 +308,39 @@ static void nautilus_actions_instance_init (GTypeInstance *instance, gpointer kl
 
 static void nautilus_actions_menu_provider_iface_init (NautilusMenuProviderIface *iface)
 {
+	static const gchar *thisfn = "nautilus_actions_menu_provider_iface_init";
+	g_debug( "%s: iface=%p", thisfn, iface );
+
 	iface->get_file_items = nautilus_actions_get_file_items;
 	iface->get_background_items = nautilus_actions_get_background_items;
 }
 
+static void nautilus_actions_class_init (NautilusActionsClass *actions_class)
+{
+	static const gchar *thisfn = "nautilus_actions_class_init";
+	g_debug( "%s: action_class=%p", thisfn, actions_class );
+
+	GObjectClass *gobject_class = G_OBJECT_CLASS (actions_class);
+
+	gobject_class->dispose = nautilus_actions_instance_dispose;
+	gobject_class->finalize = nautilus_actions_instance_finalize;
+}
+
 void nautilus_actions_register_type (GTypeModule *module)
 {
+	/* install a debug log handler
+	 * (if development mode and not already done)
+	 */
+#ifdef NACT_MAINTAINER_MODE
+	if( !log_handler ){
+		openlog( G_LOG_DOMAIN, LOG_PID, LOG_USER );
+		log_handler = g_log_set_handler( G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, nact_log_handler, NULL );
+	}
+#endif
+
+	static const gchar *thisfn = "nautilus_actions_register_type";
+	g_debug( "%s: module=%p", thisfn, module );
+
 	static const GTypeInfo info = {
 		sizeof (NautilusActionsClass),
 		(GBaseInitFunc) NULL,
@@ -318,3 +369,19 @@ void nautilus_actions_register_type (GTypeModule *module)
 								NAUTILUS_TYPE_MENU_PROVIDER,
 								&menu_provider_iface_info);
 }
+
+/*
+ * a log handler that we install when in development mode in order to be
+ * able to log plugin runtime
+ * TODO: add a debug flag in GConf, so that an advanced user could setup
+ * a given key and obtain a full log to send to Bugzilla..
+ * For now, is always install when compiled in maintainer mode, never else
+ */
+static void
+nact_log_handler( const gchar *log_domain,
+					GLogLevelFlags log_level,
+					const gchar *message,
+					gpointer user_data )
+{
+	syslog( LOG_USER | LOG_DEBUG, "%s", message );
+}
diff --git a/plugin/nautilus-actions.h b/plugin/nautilus-actions.h
index 80ed12d..8193b7e 100644
--- a/plugin/nautilus-actions.h
+++ b/plugin/nautilus-actions.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __NAUTILUS_ACTIONS_H__
@@ -60,8 +58,8 @@ struct _NautilusActionsClass
 	GObjectClass __parent;
 };
 
-GType nautilus_actions_get_type (void);
-void nautilus_actions_register_type (GTypeModule *module);
+GType	nautilus_actions_get_type (void);
+void	nautilus_actions_register_type (GTypeModule *module);
 
 G_END_DECLS
 
diff --git a/utils/Makefile.am b/utils/Makefile.am
index c94d0e1..2be9bb9 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -23,9 +23,7 @@
 #   Frederic Ruaudel <grumz grumz net>
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
-#   and many others (see AUTHORS)
-#
-# pwi 2009-05-16 replace INCLUDES by AM_CPPFLAGS
+#   ... and many others (see AUTHORS)
 
 bin_PROGRAMS = \
 	nautilus-actions-new-config					\
diff --git a/utils/nautilus-actions-check-actions-change.c b/utils/nautilus-actions-check-actions-change.c
index f5734c7..317a84a 100644
--- a/utils/nautilus-actions-check-actions-change.c
+++ b/utils/nautilus-actions-check-actions-change.c
@@ -24,10 +24,7 @@
  *   Frederic Ruaudel <grumz grumz net>
  *   Rodrigo Moya <rodrigo gnome-db org>
  *   Pierre Wieser <pwieser trychlos org>
- *   and many others (see AUTHORS)
- *
- * pwi 2009-05-16 fix compilation warnings
- * pwi 2009-05-17 make the source ansi-compliant
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
diff --git a/utils/nautilus-actions-new-config.c b/utils/nautilus-actions-new-config.c
index 21cc312..138d286 100644
--- a/utils/nautilus-actions-new-config.c
+++ b/utils/nautilus-actions-new-config.c
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
diff --git a/utils/nautilus-actions-tools-utils.c b/utils/nautilus-actions-tools-utils.c
index 05e98c4..d669207 100644
--- a/utils/nautilus-actions-tools-utils.c
+++ b/utils/nautilus-actions-tools-utils.c
@@ -24,10 +24,7 @@
  *   Frederic Ruaudel <grumz grumz net>
  *   Rodrigo Moya <rodrigo gnome-db org>
  *   Pierre Wieser <pwieser trychlos org>
- *   and many others (see AUTHORS)
- *
- * pwi 2009-05-16 fix compilation warnings
- * pwi 2009-05-17 make the source ansi-compliant
+ *   ... and many others (see AUTHORS)
  */
 
 #include <config.h>
diff --git a/utils/nautilus-actions-tools-utils.h b/utils/nautilus-actions-tools-utils.h
index 6e98999..33b88cf 100644
--- a/utils/nautilus-actions-tools-utils.h
+++ b/utils/nautilus-actions-tools-utils.h
@@ -24,9 +24,7 @@
  *   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
+ *   ... and many others (see AUTHORS)
  */
 
 #ifndef __NAUTILUS_ACTIONS_TOOLS_UTILS_H__
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]