From 9a98ec81d7e758f33ec9c2beb4006af322d7fbd0 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 22 Apr 2014 17:03:22 -0400 Subject: [PATCH] Rename meta-weston-launch to meta-launcher We're going to replace this with a login1 implementation soon enough. --- src/Makefile.am | 4 ++-- src/backends/native/meta-backend-native.c | 2 +- .../native/{meta-weston-launch.c => meta-launcher.c} | 2 +- .../native/{meta-weston-launch.h => meta-launcher.h} | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) rename src/backends/native/{meta-weston-launch.c => meta-launcher.c} (99%) rename src/backends/native/{meta-weston-launch.h => meta-launcher.h} (93%) diff --git a/src/Makefile.am b/src/Makefile.am index 13e7c8e9a..2e94283c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -78,8 +78,8 @@ libmutter_la_SOURCES = \ backends/native/meta-idle-monitor-native.h \ backends/native/meta-monitor-manager-kms.c \ backends/native/meta-monitor-manager-kms.h \ - backends/native/meta-weston-launch.c \ - backends/native/meta-weston-launch.h \ + backends/native/meta-launcher.c \ + backends/native/meta-launcher.h \ backends/x11/meta-backend-x11.c \ backends/x11/meta-backend-x11.h \ backends/x11/meta-idle-monitor-xsync.c \ diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c index 7a20e08e7..ff772c5a4 100644 --- a/src/backends/native/meta-backend-native.c +++ b/src/backends/native/meta-backend-native.c @@ -31,7 +31,7 @@ #include "meta-idle-monitor-native.h" #include "meta-monitor-manager-kms.h" #include "meta-cursor-renderer-native.h" -#include "meta-weston-launch.h" +#include "meta-launcher.h" struct _MetaBackendNativePrivate { diff --git a/src/backends/native/meta-weston-launch.c b/src/backends/native/meta-launcher.c similarity index 99% rename from src/backends/native/meta-weston-launch.c rename to src/backends/native/meta-launcher.c index 1c98b26ba..3a34115fb 100644 --- a/src/backends/native/meta-weston-launch.c +++ b/src/backends/native/meta-launcher.c @@ -45,7 +45,7 @@ #include "wayland/meta-wayland-private.h" #include "backends/meta-backend.h" #include "meta-cursor-renderer-native.h" -#include "meta-weston-launch.h" +#include "meta-launcher.h" struct _MetaLauncher { diff --git a/src/backends/native/meta-weston-launch.h b/src/backends/native/meta-launcher.h similarity index 93% rename from src/backends/native/meta-weston-launch.h rename to src/backends/native/meta-launcher.h index b70faf88e..e25a37ce9 100644 --- a/src/backends/native/meta-weston-launch.h +++ b/src/backends/native/meta-launcher.h @@ -17,8 +17,8 @@ * 02111-1307, USA. */ -#ifndef META_WESTON_LAUNCH_H -#define META_WESTON_LAUNCH_H +#ifndef META_LAUNCHER_H +#define META_LAUNCHER_H #include #include "weston-launch.h" @@ -31,4 +31,4 @@ void meta_launcher_free (MetaLauncher *self); gboolean meta_launcher_activate_vt (MetaLauncher *self, signed char vt, GError **error); -#endif +#endif /* META_LAUNCHER_H */