unity-gtk-module: rename public headers

rilian-la-te · Dec 9, 2017 · 23c94cd · 23c94cd
1 parent 0f2227e
commit 23c94cd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/unity-gtk-module/lib/CMakeLists.txt b/unity-gtk-module/lib/CMakeLists.txt
@@ -1,10 +1,10 @@
 set(LIB_SOURCES
-	unity-gtk-action-group.h
+        appmenu-gtk-action-group.h
 	unity-gtk-action-group-private.h
 	unity-gtk-action-group.c
 	unity-gtk-action-private.h
 	unity-gtk-action.c
-	unity-gtk-menu-shell.h
+        appmenu-gtk-menu-shell.h
 	unity-gtk-menu-shell-private.h
 	unity-gtk-menu-shell.c
 	unity-gtk-menu-section-private.h
@@ -43,11 +43,9 @@ endif()
 
 set(LIB_PUBLIC_HEADERS
         appmenu-gtk-parser.h
-	unity-gtk-menu-shell.h
-	unity-gtk-action-group.h)
+        appmenu-gtk-menu-shell.h
+        appmenu-gtk-action-group.h)
 
 set(GTK_MODULE_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/appmenu-gtk-parser)
 
-install(FILES "appmenu-gtk-parser.h" DESTINATION ${GTK_MODULE_INCLUDE_DIR} RENAME "appmenu-gtk-parser.h")
-install(FILES "unity-gtk-menu-shell.h" DESTINATION ${GTK_MODULE_INCLUDE_DIR} RENAME "appmenu-gtk-menu-shell.h")
-install(FILES "unity-gtk-action-group.h" DESTINATION ${GTK_MODULE_INCLUDE_DIR} RENAME "appmenu-gtk-action-group.h")
+install(FILES ${LIB_PUBLIC_HEADERS} DESTINATION ${GTK_MODULE_INCLUDE_DIR})
diff --git a/...y-gtk-module/lib/unity-gtk-action-group.h → ...gtk-module/lib/appmenu-gtk-action-group.h b/...y-gtk-module/lib/unity-gtk-action-group.h → ...gtk-module/lib/appmenu-gtk-action-group.h
@@ -41,7 +41,7 @@ typedef GObjectClass UnityGtkActionGroupClass;
 
 G_END_DECLS
 
-#include "unity-gtk-menu-shell.h"
+#include "appmenu-gtk-menu-shell.h"
 
 G_BEGIN_DECLS
 

diff --git a/unity-gtk-module/lib/unity-gtk-menu-shell.h → ...y-gtk-module/lib/appmenu-gtk-menu-shell.h b/unity-gtk-module/lib/unity-gtk-menu-shell.h → ...y-gtk-module/lib/appmenu-gtk-menu-shell.h
@@ -40,7 +40,7 @@ typedef GMenuModelClass UnityGtkMenuShellClass;
 
 G_END_DECLS
 
-#include "unity-gtk-action-group.h"
+#include "appmenu-gtk-action-group.h"
 
 G_BEGIN_DECLS
 

diff --git a/unity-gtk-module/lib/unity-gtk-action-group-private.h b/unity-gtk-module/lib/unity-gtk-action-group-private.h
@@ -20,7 +20,7 @@
 #ifndef __UNITY_GTK_ACTION_GROUP_PRIVATE_H__
 #define __UNITY_GTK_ACTION_GROUP_PRIVATE_H__
 
-#include "unity-gtk-action-group.h"
+#include "appmenu-gtk-action-group.h"
 #include "unity-gtk-menu-item-private.h"
 #include <glib.h>
 

diff --git a/unity-gtk-module/lib/unity-gtk-menu-shell-private.h b/unity-gtk-module/lib/unity-gtk-menu-shell-private.h
@@ -20,7 +20,7 @@
 #ifndef __UNITY_GTK_MENU_SHELL_PRIVATE_H__
 #define __UNITY_GTK_MENU_SHELL_PRIVATE_H__
 
-#include "unity-gtk-menu-shell.h"
+#include "appmenu-gtk-menu-shell.h"
 #include "unity-gtk-menu-item-private.h"
 
 #include <glib-object.h>

diff --git a/unity-gtk-module/src/main.c b/unity-gtk-module/src/main.c
@@ -17,8 +17,8 @@
  *          William Hua <william.hua@canonical.com>
  */
 
-#include <unity-gtk-action-group.h>
-#include <unity-gtk-menu-shell.h>
+#include <appmenu-gtk-action-group.h>
+#include <appmenu-gtk-menu-shell.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>