GNOME.org
 

[nautilus-actions] Renamed na-obj-xxx files to na-object-xxx

commit 383f670c74b81a73c27d9ab069e988983293e003
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Sep 21 19:10:54 2009 +0200

    Renamed na-obj-xxx files to na-object-xxx
    
    This concerns:
    - na-obj-action to na-object-action
    - na-obj-profile to na-object-profile
    - na-obj-menu to na-object-menu.

 ChangeLog                                          |   11 +++++++++++
 po/POTFILES.in                                     |    2 +-
 src/common/Makefile.am                             |   16 ++++++++--------
 src/common/na-gconf-provider.c                     |    6 +++---
 src/common/na-iio-provider.c                       |    4 ++--
 ...obj-action-class.h => na-object-action-class.h} |    0
 src/common/{na-obj-action.c => na-object-action.c} |    4 ++--
 src/common/{na-obj-action.h => na-object-action.h} |    6 +++---
 src/common/{na-obj-menu.c => na-object-menu.c}     |    4 ++--
 src/common/{na-obj-menu.h => na-object-menu.h}     |    2 +-
 ...j-profile-class.h => na-object-profile-class.h} |    2 +-
 .../{na-obj-profile.c => na-object-profile.c}      |    4 ++--
 .../{na-obj-profile.h => na-object-profile.h}      |    6 +++---
 src/common/na-xml-writer.c                         |    4 ++--
 src/common/na-xml-writer.h                         |    2 +-
 src/nact/nact-assistant-import.c                   |    2 +-
 src/nact/nact-clipboard.c                          |    6 +++---
 src/nact/nact-iaction-tab.c                        |    2 +-
 src/nact/nact-iactions-list.c                      |    6 +++---
 src/nact/nact-iadvanced-tab.c                      |    4 ++--
 src/nact/nact-icommand-tab.c                       |    2 +-
 src/nact/nact-iconditions-tab.c                    |    4 ++--
 src/nact/nact-main-menubar.c                       |    4 ++--
 src/nact/nact-tree-model.c                         |    6 +++---
 src/nact/nact-window.h                             |    6 +++---
 src/nact/nact-xml-reader.h                         |    2 +-
 src/plugin/nautilus-actions.c                      |    4 ++--
 src/utils/nautilus-actions-new.c                   |    4 ++--
 28 files changed, 68 insertions(+), 57 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9e40140..a24531d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,17 @@
 	* src/common/na-object.c:
 	No more over-checks edition status of item's childs.
 
+	* src/common/na-obj-action-class.h: Renamed to na-object-action-class.h.
+	* src/common/na-obj-action.c: Renamed to na-object-action.c.
+	* src/common/na-obj-action.h: Renamed to na-object-action.h.
+
+	* src/common/na-obj-profile-class.h: Renamed to na-object-profile-class.h.
+	* src/common/na-obj-profile.c: Renamed to na-object-profile.c.
+	* src/common/na-obj-profile.h: Renamed to na-object-profile.h.
+
+	* src/common/na-obj-menu.c: Renamed to na-object-menu.c.
+	* src/common/na-obj-menu.h: Renamed to na-object-menu.h.
+
 	* src/nact/nact-iactions-list.c:
 	When duplicating an object, try to insert the new one besides
 	the original one.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6644338..985024b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 data/nautilus-actions.schemas.in
 src/common/na-about.c
-src/common/na-obj-action.h
+src/common/na-object-action.h
 src/common/na-iio-provider.c
 src/common/na-xml-names.h
 src/nact/base-application.c
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 22aace4..abf6560 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -66,14 +66,14 @@ libnact_la_SOURCES = \
 	na-object-item.c							\
 	na-object-item-class.h						\
 	na-object-item-fn.h							\
-	na-obj-action.c								\
-	na-obj-action.h								\
-	na-obj-action-class.h						\
-	na-obj-menu.c								\
-	na-obj-menu.h								\
-	na-obj-profile.c							\
-	na-obj-profile.h							\
-	na-obj-profile-class.h						\
+	na-object-action.c							\
+	na-object-action.h							\
+	na-object-action-class.h					\
+	na-object-menu.c							\
+	na-object-menu.h							\
+	na-object-profile.c							\
+	na-object-profile.h							\
+	na-object-profile-class.h					\
 	na-pivot.c									\
 	na-pivot.h									\
 	na-utils.c									\
diff --git a/src/common/na-gconf-provider.c b/src/common/na-gconf-provider.c
index 2b470f5..894343f 100644
--- a/src/common/na-gconf-provider.c
+++ b/src/common/na-gconf-provider.c
@@ -35,9 +35,9 @@
 #include <string.h>
 
 #include "na-object-api.h"
-#include "na-obj-action.h"
-#include "na-obj-profile.h"
-#include "na-obj-menu.h"
+#include "na-object-action.h"
+#include "na-object-profile.h"
+#include "na-object-menu.h"
 #include "na-gconf-monitor.h"
 #include "na-gconf-provider.h"
 #include "na-gconf-provider-keys.h"
diff --git a/src/common/na-iio-provider.c b/src/common/na-iio-provider.c
index ca17012..5e003d3 100644
--- a/src/common/na-iio-provider.c
+++ b/src/common/na-iio-provider.c
@@ -33,8 +33,8 @@
 #endif
 
 #include "na-object-api.h"
-#include "na-obj-action.h"
-#include "na-obj-menu.h"
+#include "na-object-action.h"
+#include "na-object-menu.h"
 #include "na-iio-provider.h"
 #include "na-iprefs.h"
 #include "na-utils.h"
diff --git a/src/common/na-obj-action-class.h b/src/common/na-object-action-class.h
similarity index 100%
rename from src/common/na-obj-action-class.h
rename to src/common/na-object-action-class.h
diff --git a/src/common/na-obj-action.c b/src/common/na-object-action.c
similarity index 99%
rename from src/common/na-obj-action.c
rename to src/common/na-object-action.c
index 1c7ec22..d19f7ce 100644
--- a/src/common/na-obj-action.c
+++ b/src/common/na-object-action.c
@@ -35,8 +35,8 @@
 #include <string.h>
 
 #include "na-object-api.h"
-#include "na-obj-action.h"
-#include "na-obj-profile.h"
+#include "na-object-action.h"
+#include "na-object-profile.h"
 #include "na-utils.h"
 
 /* private class data
diff --git a/src/common/na-obj-action.h b/src/common/na-object-action.h
similarity index 96%
rename from src/common/na-obj-action.h
rename to src/common/na-object-action.h
index c111bf6..1ecb8c8 100644
--- a/src/common/na-obj-action.h
+++ b/src/common/na-object-action.h
@@ -34,7 +34,7 @@
 /**
  * SECTION: na_object_action
  * @short_description: #NAObjectAction class definition.
- * @include: common/na-obj-action.h
+ * @include: common/na-object-action.h
  *
  * This is the class which maintains data and properties of an Nautilus
  * action.
@@ -53,8 +53,8 @@
 
 #include <glib/gi18n.h>
 
-#include "na-obj-action-class.h"
-#include "na-obj-profile-class.h"
+#include "na-object-action-class.h"
+#include "na-object-profile-class.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/common/na-obj-menu.c b/src/common/na-object-menu.c
similarity index 99%
rename from src/common/na-obj-menu.c
rename to src/common/na-object-menu.c
index f17f59a..1079ae4 100644
--- a/src/common/na-obj-menu.c
+++ b/src/common/na-object-menu.c
@@ -33,8 +33,8 @@
 #endif
 
 #include "na-object-api.h"
-#include "na-obj-action.h"
-#include "na-obj-menu.h"
+#include "na-object-action.h"
+#include "na-object-menu.h"
 #include "na-utils.h"
 
 /* private class data
diff --git a/src/common/na-obj-menu.h b/src/common/na-object-menu.h
similarity index 98%
rename from src/common/na-obj-menu.h
rename to src/common/na-object-menu.h
index dabf2c6..18497a8 100644
--- a/src/common/na-obj-menu.h
+++ b/src/common/na-object-menu.h
@@ -34,7 +34,7 @@
 /**
  * SECTION: na_object_menu
  * @short_description: #NAObjectMenu class definition.
- * @include: common/na-obj-menu.h
+ * @include: common/na-object-menu.h
  *
  * This is a menu.
  */
diff --git a/src/common/na-obj-profile-class.h b/src/common/na-object-profile-class.h
similarity index 98%
rename from src/common/na-obj-profile-class.h
rename to src/common/na-object-profile-class.h
index a62ecd7..47b2371 100644
--- a/src/common/na-obj-profile-class.h
+++ b/src/common/na-object-profile-class.h
@@ -57,7 +57,7 @@ typedef struct {
 typedef struct NAObjectProfileClassPrivate NAObjectProfileClassPrivate;
 
 typedef struct {
-	NAObjectIdClass             parent;
+	NAObjectIdClass              parent;
 	NAObjectProfileClassPrivate *private;
 }
 	NAObjectProfileClass;
diff --git a/src/common/na-obj-profile.c b/src/common/na-object-profile.c
similarity index 99%
rename from src/common/na-obj-profile.c
rename to src/common/na-object-profile.c
index 14640ae..60234dc 100644
--- a/src/common/na-obj-profile.c
+++ b/src/common/na-object-profile.c
@@ -37,8 +37,8 @@
 #include <libnautilus-extension/nautilus-file-info.h>
 
 #include "na-object-api.h"
-#include "na-obj-action.h"
-#include "na-obj-profile.h"
+#include "na-object-action.h"
+#include "na-object-profile.h"
 #include "na-utils.h"
 #include "na-gnome-vfs-uri.h"
 
diff --git a/src/common/na-obj-profile.h b/src/common/na-object-profile.h
similarity index 97%
rename from src/common/na-obj-profile.h
rename to src/common/na-object-profile.h
index 91d62ff..58a6c4d 100644
--- a/src/common/na-obj-profile.h
+++ b/src/common/na-object-profile.h
@@ -34,7 +34,7 @@
 /**
  * SECTION: na_object_profile
  * @short_description: #NAObjectProfile class definition.
- * @include: common/na-obj-profile.h
+ * @include: common/na-object-profile.h
  *
  * This is a companion class of NAObjectAction. It embeds the profile
  * definition of an action.
@@ -43,8 +43,8 @@
  * NAObject class, which takes care of IDuplicable interface management.
  */
 
-#include "na-obj-action-class.h"
-#include "na-obj-profile-class.h"
+#include "na-object-action-class.h"
+#include "na-object-profile-class.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/common/na-xml-writer.c b/src/common/na-xml-writer.c
index b8e540c..dd82f25 100644
--- a/src/common/na-xml-writer.c
+++ b/src/common/na-xml-writer.c
@@ -36,8 +36,8 @@
 #include <libxml/tree.h>
 
 #include "na-object-api.h"
-#include "na-obj-action.h"
-#include "na-obj-profile.h"
+#include "na-object-action.h"
+#include "na-object-profile.h"
 #include "na-gconf-provider-keys.h"
 #include "na-utils.h"
 #include "na-xml-names.h"
diff --git a/src/common/na-xml-writer.h b/src/common/na-xml-writer.h
index 5b566aa..fa2c006 100644
--- a/src/common/na-xml-writer.h
+++ b/src/common/na-xml-writer.h
@@ -42,7 +42,7 @@
  * nautilus-actions-new utility.
  */
 
-#include "na-obj-action-class.h"
+#include "na-object-action-class.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index 842fcb6..c588cd9 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -37,7 +37,7 @@
 #include <string.h>
 
 #include <common/na-object-api.h>
-#include <common/na-obj-action-class.h>
+#include <common/na-object-action-class.h>
 #include <common/na-iio-provider.h>
 #include <common/na-utils.h>
 
diff --git a/src/nact/nact-clipboard.c b/src/nact/nact-clipboard.c
index 08c8bed..a52b4ac 100644
--- a/src/nact/nact-clipboard.c
+++ b/src/nact/nact-clipboard.c
@@ -36,9 +36,9 @@
 #include <string.h>
 
 #include <common/na-object-api.h>
-#include <common/na-obj-action-class.h>
-#include <common/na-obj-menu.h>
-#include <common/na-obj-profile.h>
+#include <common/na-object-action-class.h>
+#include <common/na-object-menu.h>
+#include <common/na-object-profile.h>
 #include <common/na-xml-names.h>
 #include <common/na-xml-writer.h>
 
diff --git a/src/nact/nact-iaction-tab.c b/src/nact/nact-iaction-tab.c
index 8649c9c..d685526 100644
--- a/src/nact/nact-iaction-tab.c
+++ b/src/nact/nact-iaction-tab.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 #include <common/na-object-api.h>
-#include <common/na-obj-action-class.h>
+#include <common/na-object-action-class.h>
 
 #include "base-window.h"
 #include "nact-application.h"
diff --git a/src/nact/nact-iactions-list.c b/src/nact/nact-iactions-list.c
index fd79177..498ba94 100644
--- a/src/nact/nact-iactions-list.c
+++ b/src/nact/nact-iactions-list.c
@@ -36,9 +36,9 @@
 #include <string.h>
 
 #include <common/na-object-api.h>
-#include <common/na-obj-action.h>
-#include <common/na-obj-menu.h>
-#include <common/na-obj-profile.h>
+#include <common/na-object-action.h>
+#include <common/na-object-menu.h>
+#include <common/na-object-profile.h>
 #include <common/na-iprefs.h>
 
 #include "nact-application.h"
diff --git a/src/nact/nact-iadvanced-tab.c b/src/nact/nact-iadvanced-tab.c
index a0771de..f60dcc9 100644
--- a/src/nact/nact-iadvanced-tab.c
+++ b/src/nact/nact-iadvanced-tab.c
@@ -36,8 +36,8 @@
 #include <string.h>
 
 #include <common/na-object-api.h>
-#include <common/na-obj-action-class.h>
-#include <common/na-obj-profile.h>
+#include <common/na-object-action-class.h>
+#include <common/na-object-profile.h>
 #include <common/na-utils.h>
 
 #include "base-window.h"
diff --git a/src/nact/nact-icommand-tab.c b/src/nact/nact-icommand-tab.c
index 013c0bf..34ada8f 100644
--- a/src/nact/nact-icommand-tab.c
+++ b/src/nact/nact-icommand-tab.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 #include <common/na-object-api.h>
-#include <common/na-obj-profile.h>
+#include <common/na-object-profile.h>
 #include <common/na-utils.h>
 
 #include "base-window.h"
diff --git a/src/nact/nact-iconditions-tab.c b/src/nact/nact-iconditions-tab.c
index 08459fd..8642064 100644
--- a/src/nact/nact-iconditions-tab.c
+++ b/src/nact/nact-iconditions-tab.c
@@ -36,8 +36,8 @@
 #include <string.h>
 
 #include <common/na-object-api.h>
-#include <common/na-obj-action-class.h>
-#include <common/na-obj-profile.h>
+#include <common/na-object-action-class.h>
+#include <common/na-object-profile.h>
 #include <common/na-utils.h>
 
 #include "base-iprefs.h"
diff --git a/src/nact/nact-main-menubar.c b/src/nact/nact-main-menubar.c
index 7a57eb4..5d3935d 100644
--- a/src/nact/nact-main-menubar.c
+++ b/src/nact/nact-main-menubar.c
@@ -36,8 +36,8 @@
 
 #include <common/na-about.h>
 #include <common/na-object-api.h>
-#include <common/na-obj-action.h>
-#include <common/na-obj-menu.h>
+#include <common/na-object-action.h>
+#include <common/na-object-menu.h>
 #include <common/na-ipivot-consumer.h>
 
 #include "nact-application.h"
diff --git a/src/nact/nact-tree-model.c b/src/nact/nact-tree-model.c
index d86f935..f21c470 100644
--- a/src/nact/nact-tree-model.c
+++ b/src/nact/nact-tree-model.c
@@ -35,9 +35,9 @@
 #include <string.h>
 
 #include <common/na-object-api.h>
-#include <common/na-obj-action.h>
-#include <common/na-obj-menu.h>
-#include <common/na-obj-profile.h>
+#include <common/na-object-action.h>
+#include <common/na-object-menu.h>
+#include <common/na-object-profile.h>
 #include <common/na-iprefs.h>
 #include <common/na-utils.h>
 
diff --git a/src/nact/nact-window.h b/src/nact/nact-window.h
index 21f2818..a70c8b0 100644
--- a/src/nact/nact-window.h
+++ b/src/nact/nact-window.h
@@ -38,9 +38,9 @@
  * It is a common base class for all Nautilus Actions window documents.
  */
 
-#include <common/na-obj-action.h>
-#include <common/na-obj-menu.h>
-#include <common/na-obj-profile.h>
+#include <common/na-object-action.h>
+#include <common/na-object-menu.h>
+#include <common/na-object-profile.h>
 #include <common/na-pivot.h>
 
 #include "base-window.h"
diff --git a/src/nact/nact-xml-reader.h b/src/nact/nact-xml-reader.h
index a38a08e..dce0258 100644
--- a/src/nact/nact-xml-reader.h
+++ b/src/nact/nact-xml-reader.h
@@ -37,7 +37,7 @@
  * This is the base class for importing actions from XML files.
  */
 
-#include "common/na-obj-action-class.h"
+#include "common/na-object-action-class.h"
 #include "base-assistant.h"
 
 G_BEGIN_DECLS
diff --git a/src/plugin/nautilus-actions.c b/src/plugin/nautilus-actions.c
index 6e85831..b31528e 100644
--- a/src/plugin/nautilus-actions.c
+++ b/src/plugin/nautilus-actions.c
@@ -40,8 +40,8 @@
 
 #include <common/na-about.h>
 #include <common/na-object-api.h>
-#include <common/na-obj-action.h>
-#include <common/na-obj-profile.h>
+#include <common/na-object-action.h>
+#include <common/na-object-profile.h>
 #include <common/na-pivot.h>
 #include <common/na-iprefs.h>
 #include <common/na-ipivot-consumer.h>
diff --git a/src/utils/nautilus-actions-new.c b/src/utils/nautilus-actions-new.c
index f1c16f0..9ff257f 100644
--- a/src/utils/nautilus-actions-new.c
+++ b/src/utils/nautilus-actions-new.c
@@ -37,8 +37,8 @@
 #include <stdlib.h>
 
 #include <common/na-object-api.h>
-#include <common/na-obj-action.h>
-#include <common/na-obj-profile.h>
+#include <common/na-object-action.h>
+#include <common/na-object-profile.h>
 #include <common/na-gconf-provider.h>
 #include <common/na-iio-provider.h>
 #include <common/na-xml-names.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]