[nautilus-actions] Rename libnautilus-actions/libnautilus-actions to common/libnact
- From: Pierre Wieser <pwieser src gnome org>
- To: svn-commits-list gnome org
- Subject: [nautilus-actions] Rename libnautilus-actions/libnautilus-actions to common/libnact
- Date: Fri, 29 May 2009 09:23:15 -0400 (EDT)
commit f56f352ddf3f1e9dd09e5fe07b338c235d21b273
Author: Pierre Wieser <pwieser trychlos org>
Date: Fri May 29 15:22:42 2009 +0200
Rename libnautilus-actions/libnautilus-actions to common/libnact
---
ChangeLog | 4 +++-
configure.ac | 2 +-
src/Makefile.am | 2 +-
src/{libnautilus-actions => common}/Makefile.am | 6 +++---
.../nautilus-actions-config-gconf-private.h | 0
.../nautilus-actions-config-gconf-reader.c | 0
.../nautilus-actions-config-gconf-reader.h | 0
.../nautilus-actions-config-gconf-writer.c | 0
.../nautilus-actions-config-gconf-writer.h | 0
.../nautilus-actions-config-gconf.c | 0
.../nautilus-actions-config-gconf.h | 0
.../nautilus-actions-config-schema-reader.c | 0
.../nautilus-actions-config-schema-reader.h | 0
.../nautilus-actions-config-schema-writer.c | 0
.../nautilus-actions-config-schema-writer.h | 0
.../nautilus-actions-config.c | 0
.../nautilus-actions-config.h | 0
src/nact/Makefile.am | 4 ++--
src/nact/nact-action-editor.c | 2 +-
src/nact/nact-action-editor.h | 2 +-
src/nact/nact-editor.h | 2 +-
src/nact/nact-import-export.c | 8 ++++----
src/nact/nact-profile-editor.h | 4 ++--
src/nact/nact.c | 4 ++--
src/plugin/Makefile.am | 4 ++--
src/plugin/nautilus-actions-test.h | 2 +-
src/plugin/nautilus-actions.c | 4 ++--
src/plugin/nautilus-actions.h | 2 +-
src/utils/Makefile.am | 8 ++++----
src/utils/nautilus-actions-check-actions-change.c | 4 ++--
src/utils/nautilus-actions-new-config.c | 4 ++--
31 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 877b9d8..320cc6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,12 +2,14 @@
Move all sources directories under src/
Remove one directory level when installing Glade file
+ Rename libnautilus-actions/libnautilus-actions to common/libnact
* configure.ac:
* Makefile.am:
- Updated accordingly.
Build and install po/ directory after sources.
+ * All sources: Updated accordingly.
+
* src/nact/Makefile.am:
Remove one directory level when installing Glade file.
diff --git a/configure.ac b/configure.ac
index 3dab4ea..9e02d9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ AC_CONFIG_FILES([
icons/48x48/Makefile
icons/scalable/Makefile
src/Makefile
- src/libnautilus-actions/Makefile
+ src/common/Makefile
src/nact/Makefile
src/utils/Makefile
src/plugin/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 0a618f4..f86e2a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@
# ... and many others (see AUTHORS)
SUBDIRS = \
- libnautilus-actions \
+ common \
nact \
$(OPTIONAL_SUBDIR) \
plugin \
diff --git a/src/libnautilus-actions/Makefile.am b/src/common/Makefile.am
similarity index 93%
rename from src/libnautilus-actions/Makefile.am
rename to src/common/Makefile.am
index aa9cb86..0a1aa4a 100644
--- a/src/libnautilus-actions/Makefile.am
+++ b/src/common/Makefile.am
@@ -26,7 +26,7 @@
# Pierre Wieser <pwieser trychlos org>
# ... and many others (see AUTHORS)
-noinst_LTLIBRARIES = libnautilus-actions.la
+noinst_LTLIBRARIES = libnact.la
AM_CPPFLAGS += \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
@@ -34,7 +34,7 @@ AM_CPPFLAGS += \
$(NAUTILUS_ACTIONS_CFLAGS) \
$(NULL)
-libnautilus_actions_la_SOURCES = \
+libnact_la_SOURCES = \
nautilus-actions-config.c \
nautilus-actions-config.h \
nautilus-actions-config-gconf.c \
@@ -50,4 +50,4 @@ libnautilus_actions_la_SOURCES = \
nautilus-actions-config-schema-reader.h \
$(NULL)
-libnautilus_actions_la_LIBADD = -lxml2 -luuid
+libnact_la_LIBADD = -lxml2 -luuid
diff --git a/src/libnautilus-actions/nautilus-actions-config-gconf-private.h b/src/common/nautilus-actions-config-gconf-private.h
similarity index 100%
rename from src/libnautilus-actions/nautilus-actions-config-gconf-private.h
rename to src/common/nautilus-actions-config-gconf-private.h
diff --git a/src/libnautilus-actions/nautilus-actions-config-gconf-reader.c b/src/common/nautilus-actions-config-gconf-reader.c
similarity index 100%
rename from src/libnautilus-actions/nautilus-actions-config-gconf-reader.c
rename to src/common/nautilus-actions-config-gconf-reader.c
diff --git a/src/libnautilus-actions/nautilus-actions-config-gconf-reader.h b/src/common/nautilus-actions-config-gconf-reader.h
similarity index 100%
rename from src/libnautilus-actions/nautilus-actions-config-gconf-reader.h
rename to src/common/nautilus-actions-config-gconf-reader.h
diff --git a/src/libnautilus-actions/nautilus-actions-config-gconf-writer.c b/src/common/nautilus-actions-config-gconf-writer.c
similarity index 100%
rename from src/libnautilus-actions/nautilus-actions-config-gconf-writer.c
rename to src/common/nautilus-actions-config-gconf-writer.c
diff --git a/src/libnautilus-actions/nautilus-actions-config-gconf-writer.h b/src/common/nautilus-actions-config-gconf-writer.h
similarity index 100%
rename from src/libnautilus-actions/nautilus-actions-config-gconf-writer.h
rename to src/common/nautilus-actions-config-gconf-writer.h
diff --git a/src/libnautilus-actions/nautilus-actions-config-gconf.c b/src/common/nautilus-actions-config-gconf.c
similarity index 100%
rename from src/libnautilus-actions/nautilus-actions-config-gconf.c
rename to src/common/nautilus-actions-config-gconf.c
diff --git a/src/libnautilus-actions/nautilus-actions-config-gconf.h b/src/common/nautilus-actions-config-gconf.h
similarity index 100%
rename from src/libnautilus-actions/nautilus-actions-config-gconf.h
rename to src/common/nautilus-actions-config-gconf.h
diff --git a/src/libnautilus-actions/nautilus-actions-config-schema-reader.c b/src/common/nautilus-actions-config-schema-reader.c
similarity index 100%
rename from src/libnautilus-actions/nautilus-actions-config-schema-reader.c
rename to src/common/nautilus-actions-config-schema-reader.c
diff --git a/src/libnautilus-actions/nautilus-actions-config-schema-reader.h b/src/common/nautilus-actions-config-schema-reader.h
similarity index 100%
rename from src/libnautilus-actions/nautilus-actions-config-schema-reader.h
rename to src/common/nautilus-actions-config-schema-reader.h
diff --git a/src/libnautilus-actions/nautilus-actions-config-schema-writer.c b/src/common/nautilus-actions-config-schema-writer.c
similarity index 100%
rename from src/libnautilus-actions/nautilus-actions-config-schema-writer.c
rename to src/common/nautilus-actions-config-schema-writer.c
diff --git a/src/libnautilus-actions/nautilus-actions-config-schema-writer.h b/src/common/nautilus-actions-config-schema-writer.h
similarity index 100%
rename from src/libnautilus-actions/nautilus-actions-config-schema-writer.h
rename to src/common/nautilus-actions-config-schema-writer.h
diff --git a/src/libnautilus-actions/nautilus-actions-config.c b/src/common/nautilus-actions-config.c
similarity index 100%
rename from src/libnautilus-actions/nautilus-actions-config.c
rename to src/common/nautilus-actions-config.c
diff --git a/src/libnautilus-actions/nautilus-actions-config.h b/src/common/nautilus-actions-config.h
similarity index 100%
rename from src/libnautilus-actions/nautilus-actions-config.h
rename to src/common/nautilus-actions-config.h
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index ee4c740..4a8f733 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -54,8 +54,8 @@ nautilus_actions_config_SOURCES = \
$(NULL)
nautilus_actions_config_LDADD = \
- $(top_builddir)/src/libnautilus-actions/libnautilus-actions.la \
- $(NAUTILUS_ACTIONS_LIBS) \
+ $(top_builddir)/src/common/libnact.la \
+ $(NAUTILUS_ACTIONS_LIBS) \
$(NULL)
gladedir = $(datadir)/nautilus-actions
diff --git a/src/nact/nact-action-editor.c b/src/nact/nact-action-editor.c
index 6a7b211..97cd204 100644
--- a/src/nact/nact-action-editor.c
+++ b/src/nact/nact-action-editor.c
@@ -37,7 +37,7 @@
#include <gtk/gtkentry.h>
#include <gtk/gtktogglebutton.h>
#include <glade/glade-xml.h>
-#include <libnautilus-actions/nautilus-actions-config-gconf-writer.h>
+#include <common/nautilus-actions-config-gconf-writer.h>
#include "nact-editor.h"
#include "nact-action-editor.h"
#include "nact-profile-editor.h"
diff --git a/src/nact/nact-action-editor.h b/src/nact/nact-action-editor.h
index 2693d76..29dd2ad 100644
--- a/src/nact/nact-action-editor.h
+++ b/src/nact/nact-action-editor.h
@@ -31,7 +31,7 @@
#ifndef __NACT_ACTION_EDITOR_H__
#define __NACT_ACTION_EDITOR_H__
-#include <libnautilus-actions/nautilus-actions-config.h>
+#include <common/nautilus-actions-config.h>
gboolean nact_action_editor_new( void );
gboolean nact_action_editor_edit( NautilusActionsConfigAction *action );
diff --git a/src/nact/nact-editor.h b/src/nact/nact-editor.h
index 82b2aea..8a4a667 100644
--- a/src/nact/nact-editor.h
+++ b/src/nact/nact-editor.h
@@ -32,7 +32,7 @@
#define __NACT_EDITOR_H__
#include <gtk/gtk.h>
-#include <libnautilus-actions/nautilus-actions-config.h>
+#include <common/nautilus-actions-config.h>
enum {
PROFILE_LABEL_COLUMN = 0,
diff --git a/src/nact/nact-import-export.c b/src/nact/nact-import-export.c
index 013e73d..2ff4685 100644
--- a/src/nact/nact-import-export.c
+++ b/src/nact/nact-import-export.c
@@ -34,10 +34,10 @@
#include <glib.h>
#include <gtk/gtk.h>
#include <glade/glade-xml.h>
-#include <libnautilus-actions/nautilus-actions-config.h>
-#include <libnautilus-actions/nautilus-actions-config-schema-reader.h>
-#include <libnautilus-actions/nautilus-actions-config-schema-writer.h>
-#include <libnautilus-actions/nautilus-actions-config-gconf-writer.h>
+#include <common/nautilus-actions-config.h>
+#include <common/nautilus-actions-config-schema-reader.h>
+#include <common/nautilus-actions-config-schema-writer.h>
+#include <common/nautilus-actions-config-gconf-writer.h>
#include "nact-utils.h"
#include "nact-import-export.h"
#include "nact-prefs.h"
diff --git a/src/nact/nact-profile-editor.h b/src/nact/nact-profile-editor.h
index 3904119..2425414 100644
--- a/src/nact/nact-profile-editor.h
+++ b/src/nact/nact-profile-editor.h
@@ -33,8 +33,8 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include <libnautilus-actions/nautilus-actions-config.h>
-#include <libnautilus-actions/nautilus-actions-config-gconf-writer.h>
+#include <common/nautilus-actions-config.h>
+#include <common/nautilus-actions-config-gconf-writer.h>
gboolean nact_profile_editor_new_profile (NautilusActionsConfigAction* action);
gboolean nact_profile_editor_edit_profile (NautilusActionsConfigAction *action, gchar* profile_name, NautilusActionsConfigActionProfile* action_profile);
diff --git a/src/nact/nact.c b/src/nact/nact.c
index 6cc1baf..9902c0f 100644
--- a/src/nact/nact.c
+++ b/src/nact/nact.c
@@ -37,8 +37,8 @@
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtktreeview.h>
#include <glade/glade-xml.h>
-#include <libnautilus-actions/nautilus-actions-config.h>
-#include <libnautilus-actions/nautilus-actions-config-gconf-writer.h>
+#include <common/nautilus-actions-config.h>
+#include <common/nautilus-actions-config-gconf-writer.h>
#include "nact-utils.h"
#include "nact.h"
#include "nact-editor.h"
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index d79a4cd..6a8f3de 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -49,6 +49,6 @@ libnautilus_actions_la_SOURCES = \
libnautilus_actions_la_LDFLAGS = -module -avoid-version
libnautilus_actions_la_LIBADD = \
- $(top_builddir)/src/libnautilus-actions/libnautilus-actions.la \
- $(NAUTILUS_ACTIONS_LIBS) \
+ $(top_builddir)/src/common/libnact.la \
+ $(NAUTILUS_ACTIONS_LIBS) \
$(NULL)
diff --git a/src/plugin/nautilus-actions-test.h b/src/plugin/nautilus-actions-test.h
index aab2d7a..9bca772 100644
--- a/src/plugin/nautilus-actions-test.h
+++ b/src/plugin/nautilus-actions-test.h
@@ -31,7 +31,7 @@
#ifndef __NAUTILUS_ACTIONS_TEST_H__
#define __NAUTILUS_ACTIONS_TEST_H__
-#include <libnautilus-actions/nautilus-actions-config.h>
+#include <common/nautilus-actions-config.h>
G_BEGIN_DECLS
diff --git a/src/plugin/nautilus-actions.c b/src/plugin/nautilus-actions.c
index 6fd9b0f..cf63ef6 100644
--- a/src/plugin/nautilus-actions.c
+++ b/src/plugin/nautilus-actions.c
@@ -38,8 +38,8 @@
#include <libnautilus-extension/nautilus-file-info.h>
#include <libnautilus-extension/nautilus-menu-provider.h>
#include "nautilus-actions.h"
-#include <libnautilus-actions/nautilus-actions-config.h>
-#include <libnautilus-actions/nautilus-actions-config-gconf-reader.h>
+#include <common/nautilus-actions-config.h>
+#include <common/nautilus-actions-config-gconf-reader.h>
#include "nautilus-actions-test.h"
#include "nautilus-actions-utils.h"
diff --git a/src/plugin/nautilus-actions.h b/src/plugin/nautilus-actions.h
index a2c4d56..be9b607 100644
--- a/src/plugin/nautilus-actions.h
+++ b/src/plugin/nautilus-actions.h
@@ -32,7 +32,7 @@
#define __NAUTILUS_ACTIONS_H__
#include <glib-object.h>
-#include <libnautilus-actions/nautilus-actions-config-gconf-reader.h>
+#include <common/nautilus-actions-config-gconf-reader.h>
G_BEGIN_DECLS
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index d5c6595..45d1058 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -44,14 +44,14 @@ nautilus_actions_new_config_SOURCES = \
$(NULL)
nautilus_actions_new_config_LDADD = \
- $(top_builddir)/src/libnautilus-actions/libnautilus-actions.la \
- $(NAUTILUS_ACTIONS_UTILS_LIBS) \
+ $(top_builddir)/src/common/libnact.la \
+ $(NAUTILUS_ACTIONS_UTILS_LIBS) \
$(NULL)
nautilus_actions_check_actions_change_SOURCES = \
nautilus-actions-check-actions-change.c
nautilus_actions_check_actions_change_LDADD = \
- $(top_builddir)/src/libnautilus-actions/libnautilus-actions.la \
- $(NAUTILUS_ACTIONS_LIBS) \
+ $(top_builddir)/src/common/libnact.la \
+ $(NAUTILUS_ACTIONS_LIBS) \
$(NULL)
diff --git a/src/utils/nautilus-actions-check-actions-change.c b/src/utils/nautilus-actions-check-actions-change.c
index c783879..62dea09 100644
--- a/src/utils/nautilus-actions-check-actions-change.c
+++ b/src/utils/nautilus-actions-check-actions-change.c
@@ -30,8 +30,8 @@
#include <config.h>
#include <gtk/gtk.h>
-#include <libnautilus-actions/nautilus-actions-config.h>
-#include <libnautilus-actions/nautilus-actions-config-gconf-reader.h>
+#include <common/nautilus-actions-config.h>
+#include <common/nautilus-actions-config-gconf-reader.h>
static void nautilus_actions_action_added_handler (NautilusActionsConfig* config,
NautilusActionsConfigAction* action,
diff --git a/src/utils/nautilus-actions-new-config.c b/src/utils/nautilus-actions-new-config.c
index 5a2e669..44311c3 100644
--- a/src/utils/nautilus-actions-new-config.c
+++ b/src/utils/nautilus-actions-new-config.c
@@ -34,8 +34,8 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <unistd.h>
-#include <libnautilus-actions/nautilus-actions-config.h>
-#include <libnautilus-actions/nautilus-actions-config-schema-writer.h>
+#include <common/nautilus-actions-config.h>
+#include <common/nautilus-actions-config-schema-writer.h>
#include "nautilus-actions-tools-utils.h"
static gchar* label = "";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]