GNOME.org
 

[nautilus-actions/file-manager-actions] Fix FMAApplication header inclusion

commit ac7812717eb124d9b957cbaf59f3df934878a145
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 19:27:07 2015 +0200

    Fix FMAApplication header inclusion

 src/ui/Makefile.am               |    4 ++--
 src/ui/base-assistant.c          |    2 +-
 src/ui/base-dialog.c             |    2 +-
 src/ui/base-window.c             |    2 +-
 src/ui/fma-application.c         |    2 +-
 src/ui/fma-application.h         |    2 +-
 src/ui/fma-assistant-export.c    |    2 +-
 src/ui/fma-assistant-import.c    |    2 +-
 src/ui/main.c                    |    2 +-
 src/ui/nact-clipboard.c          |    2 +-
 src/ui/nact-export-ask.c         |    2 +-
 src/ui/nact-iaction-tab.c        |    2 +-
 src/ui/nact-icommand-tab.c       |    2 +-
 src/ui/nact-icon-chooser.c       |    2 +-
 src/ui/nact-ifolders-tab.c       |    2 +-
 src/ui/nact-main-window.h        |    2 +-
 src/ui/nact-menu-edit.c          |    2 +-
 src/ui/nact-menu-file.c          |    2 +-
 src/ui/nact-menu.h               |    2 +-
 src/ui/nact-preferences-editor.c |    2 +-
 src/ui/nact-providers-list.c     |    2 +-
 src/ui/nact-schemes-list.c       |    2 +-
 src/ui/nact-sort-buttons.c       |    2 +-
 src/ui/nact-tree-ieditable.c     |    2 +-
 src/ui/nact-tree-model-dnd.c     |    2 +-
 src/ui/nact-tree-model.c         |    2 +-
 src/ui/nact-tree-view.c          |    2 +-
 27 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 218ae9b..5071b35 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -73,8 +73,8 @@ fma_config_tool_SOURCES = \
        nact-add-capability-dialog.h                                            \
        nact-add-scheme-dialog.c                                                        \
        nact-add-scheme-dialog.h                                                        \
-       nact-application.c                                                                      \
-       nact-application.h                                                                      \
+       fma-application.c                                                                       \
+       fma-application.h                                                                       \
        nact-assistant-export.c                                                         \
        nact-assistant-export.h                                                         \
        nact-assistant-import.c                                                         \
diff --git a/src/ui/base-assistant.c b/src/ui/base-assistant.c
index ea47cba..6c753d9 100644
--- a/src/ui/base-assistant.c
+++ b/src/ui/base-assistant.c
@@ -36,7 +36,7 @@
 
 #include "base-assistant.h"
 #include "base-keysyms.h"
-#include "nact-application.h"
+#include "fma-application.h"
 
 /* private instance data
  */
diff --git a/src/ui/base-dialog.c b/src/ui/base-dialog.c
index ba3298b..b99c3a4 100644
--- a/src/ui/base-dialog.c
+++ b/src/ui/base-dialog.c
@@ -32,7 +32,7 @@
 #endif
 
 #include "base-dialog.h"
-#include "nact-application.h"
+#include "fma-application.h"
 
 /* private class data
  */
diff --git a/src/ui/base-window.c b/src/ui/base-window.c
index d2dc811..13d6527 100644
--- a/src/ui/base-window.c
+++ b/src/ui/base-window.c
@@ -40,7 +40,7 @@
 #include "base-builder.h"
 #include "base-window.h"
 #include "base-gtk-utils.h"
-#include "nact-application.h"
+#include "fma-application.h"
 
 /* private class data
  */
diff --git a/src/ui/fma-application.c b/src/ui/fma-application.c
index bd1a2af..5e08dcc 100644
--- a/src/ui/fma-application.c
+++ b/src/ui/fma-application.c
@@ -39,7 +39,7 @@
 #include "core/fma-about.h"
 
 #include "base-isession.h"
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-main-window.h"
 #include "nact-menu.h"
 
diff --git a/src/ui/fma-application.h b/src/ui/fma-application.h
index 397ac85..4e4d138 100644
--- a/src/ui/fma-application.h
+++ b/src/ui/fma-application.h
@@ -33,7 +33,7 @@
 /**
  * SECTION: fma_application
  * @short_description: #FMAApplication class definition.
- * @include: nact/nact-application.h
+ * @include: nact/fma-application.h
  *
  * This is the main class for filemanager-actions-config-tool program.
  *
diff --git a/src/ui/fma-assistant-export.c b/src/ui/fma-assistant-export.c
index 5563d9e..7f38cd7 100644
--- a/src/ui/fma-assistant-export.c
+++ b/src/ui/fma-assistant-export.c
@@ -42,7 +42,7 @@
 #include "core/fma-gtk-utils.h"
 #include "core/fma-ioptions-list.h"
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-main-window.h"
 #include "nact-assistant-export.h"
 #include "nact-export-ask.h"
diff --git a/src/ui/fma-assistant-import.c b/src/ui/fma-assistant-import.c
index 340d000..80db88f 100644
--- a/src/ui/fma-assistant-import.c
+++ b/src/ui/fma-assistant-import.c
@@ -44,7 +44,7 @@
 #include <core/fma-gtk-utils.h>
 #include <core/fma-settings.h>
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-assistant-import.h"
 #include "nact-main-window.h"
 #include "nact-tree-ieditable.h"
diff --git a/src/ui/main.c b/src/ui/main.c
index 938c78a..5ebc09f 100644
--- a/src/ui/main.c
+++ b/src/ui/main.c
@@ -33,7 +33,7 @@
 
 #include <core/fma-gconf-migration.h>
 
-#include "nact-application.h"
+#include "fma-application.h"
 
 /*
  * The 'configure' script may define a NA_MAINTAINER_MODE variable when
diff --git a/src/ui/nact-clipboard.c b/src/ui/nact-clipboard.c
index b8b31b9..174eb27 100644
--- a/src/ui/nact-clipboard.c
+++ b/src/ui/nact-clipboard.c
@@ -39,7 +39,7 @@
 #include "core/fma-exporter.h"
 #include "core/fma-export-format.h"
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-export-ask.h"
 #include "nact-main-window.h"
 #include "nact-tree-model.h"
diff --git a/src/ui/nact-export-ask.c b/src/ui/nact-export-ask.c
index d340d3e..5e5e900 100644
--- a/src/ui/nact-export-ask.c
+++ b/src/ui/nact-export-ask.c
@@ -41,7 +41,7 @@
 #include "core/fma-ioptions-list.h"
 
 #include "base-gtk-utils.h"
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-export-ask.h"
 #include "nact-main-window.h"
 
diff --git a/src/ui/nact-iaction-tab.c b/src/ui/nact-iaction-tab.c
index 374bb9f..6e83461 100644
--- a/src/ui/nact-iaction-tab.c
+++ b/src/ui/nact-iaction-tab.c
@@ -40,7 +40,7 @@
 #include "core/fma-gtk-utils.h"
 #include "core/fma-io-provider.h"
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-statusbar.h"
 #include "base-gtk-utils.h"
 #include "nact-main-tab.h"
diff --git a/src/ui/nact-icommand-tab.c b/src/ui/nact-icommand-tab.c
index a8e6039..f05c123 100644
--- a/src/ui/nact-icommand-tab.c
+++ b/src/ui/nact-icommand-tab.c
@@ -41,7 +41,7 @@
 #include "core/fma-gtk-utils.h"
 #include "core/fma-tokens.h"
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-statusbar.h"
 #include "base-gtk-utils.h"
 #include "nact-main-tab.h"
diff --git a/src/ui/nact-icon-chooser.c b/src/ui/nact-icon-chooser.c
index 410eb44..0f6070b 100644
--- a/src/ui/nact-icon-chooser.c
+++ b/src/ui/nact-icon-chooser.c
@@ -34,7 +34,7 @@
 #include <core/fma-gtk-utils.h>
 
 #include "base-keysyms.h"
-#include "nact-application.h"
+#include "fma-application.h"
 #include "base-gtk-utils.h"
 #include "nact-icon-chooser.h"
 #include "nact-main-window.h"
diff --git a/src/ui/nact-ifolders-tab.c b/src/ui/nact-ifolders-tab.c
index 0b5a429..1f640e2 100644
--- a/src/ui/nact-ifolders-tab.c
+++ b/src/ui/nact-ifolders-tab.c
@@ -40,7 +40,7 @@
 #include "core/fma-gtk-utils.h"
 
 #include "base-gtk-utils.h"
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-main-tab.h"
 #include "nact-main-window.h"
 #include "nact-match-list.h"
diff --git a/src/ui/nact-main-window.h b/src/ui/nact-main-window.h
index 8ca28e9..7a8a530 100644
--- a/src/ui/nact-main-window.h
+++ b/src/ui/nact-main-window.h
@@ -37,7 +37,7 @@
  * @include: nact-main-window.h
  */
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-clipboard.h"
 #include "nact-main-window-def.h"
 #include "nact-sort-buttons.h"
diff --git a/src/ui/nact-menu-edit.c b/src/ui/nact-menu-edit.c
index 1764310..1265ba6 100644
--- a/src/ui/nact-menu-edit.c
+++ b/src/ui/nact-menu-edit.c
@@ -37,7 +37,7 @@
 
 #include "core/fma-io-provider.h"
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-clipboard.h"
 #include "nact-main-tab.h"
 #include "nact-main-window.h"
diff --git a/src/ui/nact-menu-file.c b/src/ui/nact-menu-file.c
index 06b1349..917fec0 100644
--- a/src/ui/nact-menu-file.c
+++ b/src/ui/nact-menu-file.c
@@ -40,7 +40,7 @@
 #include <core/fma-io-provider.h>
 #include <core/fma-iprefs.h>
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-statusbar.h"
 #include "nact-main-tab.h"
 #include "nact-main-window.h"
diff --git a/src/ui/nact-menu.h b/src/ui/nact-menu.h
index a250533..80ba35e 100644
--- a/src/ui/nact-menu.h
+++ b/src/ui/nact-menu.h
@@ -39,7 +39,7 @@
 
 #include "core/fma-updater.h"
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-main-window-def.h"
 
 G_BEGIN_DECLS
diff --git a/src/ui/nact-preferences-editor.c b/src/ui/nact-preferences-editor.c
index 14a8ce3..6b91117 100644
--- a/src/ui/nact-preferences-editor.c
+++ b/src/ui/nact-preferences-editor.c
@@ -46,7 +46,7 @@
 #include <core/fma-iprefs.h>
 #include <core/fma-tokens.h>
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "base-gtk-utils.h"
 #include "nact-main-window.h"
 #include "nact-schemes-list.h"
diff --git a/src/ui/nact-providers-list.c b/src/ui/nact-providers-list.c
index df12d88..26ac631 100644
--- a/src/ui/nact-providers-list.c
+++ b/src/ui/nact-providers-list.c
@@ -39,7 +39,7 @@
 
 #include <core/fma-io-provider.h>
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "base-gtk-utils.h"
 #include "nact-providers-list.h"
 
diff --git a/src/ui/nact-schemes-list.c b/src/ui/nact-schemes-list.c
index 29738b2..7ee3d53 100644
--- a/src/ui/nact-schemes-list.c
+++ b/src/ui/nact-schemes-list.c
@@ -37,7 +37,7 @@
 #include <api/fma-object-api.h>
 
 #include "base-keysyms.h"
-#include "nact-application.h"
+#include "fma-application.h"
 #include "base-gtk-utils.h"
 #include "nact-main-tab.h"
 #include "nact-schemes-list.h"
diff --git a/src/ui/nact-sort-buttons.c b/src/ui/nact-sort-buttons.c
index 2ec3e11..6f303da 100644
--- a/src/ui/nact-sort-buttons.c
+++ b/src/ui/nact-sort-buttons.c
@@ -35,7 +35,7 @@
 #include "core/fma-iprefs.h"
 #include "core/fma-updater.h"
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-main-window.h"
 #include "nact-sort-buttons.h"
 #include "nact-tree-view.h"
diff --git a/src/ui/nact-tree-ieditable.c b/src/ui/nact-tree-ieditable.c
index 7f5a69a..e48628c 100644
--- a/src/ui/nact-tree-ieditable.c
+++ b/src/ui/nact-tree-ieditable.c
@@ -38,7 +38,7 @@
 #include <core/fma-updater.h>
 
 #include "base-keysyms.h"
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-main-window.h"
 #include "nact-tree-ieditable.h"
 #include "nact-tree-model.h"
diff --git a/src/ui/nact-tree-model-dnd.c b/src/ui/nact-tree-model-dnd.c
index d4e3664..df31204 100644
--- a/src/ui/nact-tree-model-dnd.c
+++ b/src/ui/nact-tree-model-dnd.c
@@ -41,7 +41,7 @@
 #include <core/fma-gnome-vfs-uri.h>
 #include <core/fma-importer.h>
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-clipboard.h"
 #include "nact-statusbar.h"
 #include "nact-main-window.h"
diff --git a/src/ui/nact-tree-model.c b/src/ui/nact-tree-model.c
index f9b1d4f..d10404d 100644
--- a/src/ui/nact-tree-model.c
+++ b/src/ui/nact-tree-model.c
@@ -38,7 +38,7 @@
 
 #include "core/fma-iprefs.h"
 
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-clipboard.h"
 #include "base-gtk-utils.h"
 #include "nact-main-tab.h"
diff --git a/src/ui/nact-tree-view.c b/src/ui/nact-tree-view.c
index 309b16b..30a4755 100644
--- a/src/ui/nact-tree-view.c
+++ b/src/ui/nact-tree-view.c
@@ -38,7 +38,7 @@
 #include "core/fma-gtk-utils.h"
 
 #include "base-keysyms.h"
-#include "nact-application.h"
+#include "fma-application.h"
 #include "nact-main-window.h"
 #include "nact-tree-view.h"
 #include "nact-tree-model.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]