Replace any references to mutter with muffin (#726)

Author: Sunderland93

clutter/clutter/cally/cally-util.c

@@ -142,7 +142,7 @@ cally_util_get_toolkit_name (void)
 static const gchar *
 cally_util_get_toolkit_version (void)
 {
-  return MUTTER_VERSION;
+  return MUFFIN_VERSION;
 }
 
 static guint

clutter/clutter/clutter-actor.c

@@ -642,7 +642,7 @@
 #include "clutter-interval.h"
 #include "clutter-main.h"
 #include "clutter-marshal.h"
-#include "clutter-mutter.h"
+#include "clutter-muffin.h"
 #include "clutter-paint-context-private.h"
 #include "clutter-paint-nodes.h"
 #include "clutter-paint-node-private.h"

clutter/clutter/clutter-backend.c

@@ -46,7 +46,7 @@
 #include "clutter-debug.h"
 #include "clutter-event-private.h"
 #include "clutter-marshal.h"
-#include "clutter-mutter.h"
+#include "clutter-muffin.h"
 #include "clutter-private.h"
 #include "clutter-stage-manager-private.h"
 #include "clutter-stage-private.h"

clutter/clutter/clutter-build-config.h.meson

@@ -1,5 +1,5 @@
 /* Mutter version */
-#mesondefine MUTTER_VERSION
+#mesondefine MUFFIN_VERSION
 
 /* List of Cogl drivers */
 #mesondefine CLUTTER_DRIVERS

clutter/clutter/clutter-main.c

@@ -62,7 +62,7 @@
 #include "clutter-graphene.h"
 #include "clutter-main.h"
 #include "clutter-master-clock.h"
-#include "clutter-mutter.h"
+#include "clutter-muffin.h"
 #include "clutter-paint-node-private.h"
 #include "clutter-private.h"
 #include "clutter-settings-private.h"

clutter/clutter/clutter-mutter.h renamed to clutter/clutter/clutter-muffin.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __CLUTTER_MUTTER_H__
-#define __CLUTTER_MUTTER_H__
+#ifndef __CLUTTER_MUFFIN_H__
+#define __CLUTTER_MUFFIN_H__
 
 #define __CLUTTER_H_INSIDE__
 
@@ -85,4 +85,4 @@ void clutter_stage_get_device_coords (ClutterStage         *stage,
                                       graphene_point_t     *coords);
 #undef __CLUTTER_H_INSIDE__
 
-#endif /* __CLUTTER_MUTTER_H__ */
+#endif /* __CLUTTER_MUFFIN_H__ */

clutter/clutter/clutter-stage.c

@@ -67,7 +67,7 @@
 #include "clutter-main.h"
 #include "clutter-marshal.h"
 #include "clutter-master-clock.h"
-#include "clutter-mutter.h"
+#include "clutter-muffin.h"
 #include "clutter-paint-context-private.h"
 #include "clutter-paint-volume-private.h"
 #include "clutter-pick-context-private.h"
@@ -3212,7 +3212,7 @@ clutter_stage_new (void)
  * be used by applications.
  *
  * Since: 0.8
- * Deprecated: mutter: This function does not do anything.
+ * Deprecated: muffin: This function does not do anything.
  */
 void
 clutter_stage_ensure_current (ClutterStage *stage)

clutter/clutter/meson.build

@@ -54,7 +54,7 @@ clutter_headers = [
   'clutter-layout-meta.h',
   'clutter-macros.h',
   'clutter-main.h',
-  'clutter-mutter.h',
+  'clutter-muffin.h',
   'clutter-offscreen-effect.h',
   'clutter-page-turn-effect.h',
   'clutter-paint-context.h',
@@ -329,7 +329,7 @@ clutter_built_headers = []
 clutter_built_private_headers = []
 
 cdata = configuration_data()
-cdata.set_quoted('MUTTER_VERSION', meson.project_version())
+cdata.set_quoted('MUFFIN_VERSION', meson.project_version())
 cdata.set('CLUTTER_DRIVERS', '"*"')
 cdata.set('HAVE_EVDEV', have_native_backend)
 cdata.set('HAVE_LIBWACOM', have_libwacom)
@@ -403,8 +403,8 @@ clutter_marshal = gnome.genmarshal('clutter-marshal',
 clutter_built_sources += clutter_marshal[0]
 clutter_built_headers += clutter_marshal[1]
 
-libmutter_clutter_name = 'muffin-clutter-' + libmutter_api_version
-libmutter_clutter = shared_library(libmutter_clutter_name,
+libmuffin_clutter_name = 'muffin-clutter-' + libmuffin_api_version
+libmuffin_clutter = shared_library(libmuffin_clutter_name,
   sources: [
     clutter_sources,
     clutter_headers,
@@ -421,7 +421,7 @@ libmutter_clutter = shared_library(libmutter_clutter_name,
     cally_sources,
     cally_headers,
     cally_private_headers,
-    libmutter_cogl_path_enum_types_h
+    libmuffin_cogl_path_enum_types_h
   ],
   version: '0.0.0',
   soversion: 0,
@@ -430,17 +430,17 @@ libmutter_clutter = shared_library(libmutter_clutter_name,
   dependencies: [clutter_deps],
   gnu_symbol_visibility: 'hidden',
   link_with: [
-    libmutter_cogl,
-    libmutter_cogl_pango,
-    libmutter_cogl_path,
+    libmuffin_cogl,
+    libmuffin_cogl_pango,
+    libmuffin_cogl_path,
   ],
   install_rpath: pkglibdir,
   install_dir: pkglibdir,
   install: true,
 )
-libmutter_clutter_dep = declare_dependency(
+libmuffin_clutter_dep = declare_dependency(
   sources: [clutter_enum_types[1]],
-  link_with: libmutter_clutter,
+  link_with: libmuffin_clutter,
   dependencies: clutter_deps,
 )
 
@@ -452,7 +452,7 @@ if have_introspection
     '-DG_LOG_DOMAIN="Clutter"'
   ]
 
-  libmutter_clutter_gir = gnome.generate_gir(libmutter_clutter,
+  libmuffin_clutter_gir = gnome.generate_gir(libmuffin_clutter,
     sources: [
       clutter_built_sources,
       clutter_built_headers,
@@ -461,12 +461,12 @@ if have_introspection
       clutter_deprecated_sources,
       clutter_deprecated_headers,
     ],
-    nsversion: libmutter_api_version,
+    nsversion: libmuffin_api_version,
     namespace: 'Clutter',
-    export_packages: [libmutter_clutter_name],
+    export_packages: [libmuffin_clutter_name],
     includes: [
-      libmutter_cogl_gir[0],
-      libmutter_cogl_pango_gir[0],
+      libmuffin_cogl_gir[0],
+      libmuffin_cogl_pango_gir[0],
       'GL-1.0',
       'GObject-2.0',
       'cairo-1.0',
@@ -480,17 +480,17 @@ if have_introspection
     install: true,
   )
 
-  libmutter_cally_gir = gnome.generate_gir(libmutter_clutter,
+  libmuffin_cally_gir = gnome.generate_gir(libmuffin_clutter,
     sources: [
       cally_sources,
       cally_headers,
     ],
-    nsversion: libmutter_api_version,
+    nsversion: libmuffin_api_version,
     namespace: 'Cally',
     includes: [
-      libmutter_cogl_gir[0],
-      libmutter_cogl_pango_gir[0],
-      libmutter_clutter_gir[0],
+      libmuffin_cogl_gir[0],
+      libmuffin_cogl_pango_gir[0],
+      libmuffin_clutter_gir[0],
     ],
     dependencies: [cogl_deps],
     extra_args: clutter_introspection_args,
@@ -500,18 +500,18 @@ if have_introspection
   )
 
   if have_x11
-    libmutter_clutter_x11_gir = gnome.generate_gir(libmutter_clutter,
+    libmuffin_clutter_x11_gir = gnome.generate_gir(libmuffin_clutter,
       sources: [
         clutter_x11_sources,
         clutter_x11_headers,
       ],
-      nsversion: libmutter_api_version,
+      nsversion: libmuffin_api_version,
       namespace: 'ClutterX11',
-      export_packages: ['muffin-clutter-x11-' + libmutter_api_version],
+      export_packages: ['muffin-clutter-x11-' + libmuffin_api_version],
       includes: [
-        libmutter_cogl_gir[0],
-        libmutter_cogl_pango_gir[0],
-        libmutter_clutter_gir[0],
+        libmuffin_cogl_gir[0],
+        libmuffin_cogl_pango_gir[0],
+        libmuffin_clutter_gir[0],
         'xlib-2.0',
       ],
       dependencies: [],
@@ -535,30 +535,30 @@ install_headers(clutter_deprecated_headers,
 install_headers(clutter_x11_headers,
   subdir: join_paths(clutter_clutter_includesubdir, 'x11'))
 
-pkg.generate(libmutter_clutter,
+pkg.generate(libmuffin_clutter,
   name: 'Muffins Clutter',
-  filebase: libmutter_clutter_name,
+  filebase: libmuffin_clutter_name,
   description: 'Muffinss Clutter Private Library',
   libraries: [m_dep],
   subdirs: join_paths(pkgname, 'clutter'),
-  requires: [clutter_pkg_deps, libmutter_cogl_name],
+  requires: [clutter_pkg_deps, libmuffin_cogl_name],
   version: meson.project_version(),
   variables: [
-    'apiversion=' + libmutter_api_version,
+    'apiversion=' + libmuffin_api_version,
   ],
   install_dir: pcdir,
 )
 
-pkg.generate(libmutter_clutter,
+pkg.generate(libmuffin_clutter,
   name: 'Muffins ClutterX11',
-  filebase: 'muffin-clutter-x11-' + libmutter_api_version,
+  filebase: 'muffin-clutter-x11-' + libmuffin_api_version,
   description: 'Muffin ClutterX11 Private Library',
   libraries: [m_dep],
   subdirs: join_paths(pkgname, 'clutter'),
-  requires: [clutter_pkg_deps, libmutter_cogl_name],
+  requires: [clutter_pkg_deps, libmuffin_cogl_name],
   version: meson.project_version(),
   variables: [
-    'apiversion=' + libmutter_api_version,
+    'apiversion=' + libmuffin_api_version,
   ],
   install_dir: pcdir,
 )

clutter/meson.build

@@ -80,7 +80,7 @@ endif
 clutter_deps = [
   clutter_pkg_deps,
   clutter_pkg_private_deps,
-  libmutter_cogl_dep,
+  libmuffin_cogl_dep,
   m_dep
 ]
 

cogl/.gitignore

@@ -40,7 +40,7 @@ cogl-path-enum-types.c
 cogl-path-enum-types.h
 cogl-config.h
 cogl-config.h.in
-cogl-mutter-config.h
+cogl-muffin-config.h
 config.log
 config.lt
 config.status