rename project from weston-gtk-shell to maynard

12 files changed, 38 insertions, 49 deletions

diff --git a/.gitignore b/.gitignore
index 1ed54e9..d044d85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,18 +35,18 @@ _gen
 /m4
 /missing
 /stamp-h1
-/weston-gtk-shell-*.tar.xz
+/maynard-*.tar.xz
 shell/desktop-shell-client-protocol.h
 shell/desktop-shell-protocol.c
 shell/shell-helper-client-protocol.h
 shell/shell-helper-protocol.c
 shell/shell-helper-server-protocol.h
 shell/mod-shell-helper-protocol.c
-shell/weston-gtk-shell-resources.c
-shell/weston-gtk-shell-resources.h
-shell/weston-gtk-shell
+shell/maynard-resources.c
+shell/maynard-resources.h
+shell/maynard
 data/gschemas.compiled
-data/org.raspberrypi.weston-gtk-shell.gschema.valid
-data/org.raspberrypi.weston-gtk-shell.gschema.xml
+data/org.raspberrypi.maynard.gschema.valid
+data/org.raspberrypi.maynard.gschema.xml
 po/POTFILES
 po/stamp-it
\ No newline at end of file
diff --git a/NEWS b/NEWS
index de0c044..93eade5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1 @@
-weston-desktop-shell 0.2.0 (27 Nov 2013)
-========================================
-
-- Sort items alphabetically in the menu
-- Add a clock to the panel
-- Add favorite launchers to the panel
-- Add i18n support
-
-weston-desktop-shell 0.1.0 (20 Nov 2013)
-========================================
-
-- Initial release
+Use 'git log' to list the changes to this repository.
\ No newline at end of file
diff --git a/README.md b/README.md
index fe14106..dcdb585 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
-# Gtk shell
+# maynard
 
-It's an example how to have a desktop shell client for Weston based on a real
-toolkit.
+This is a desktop shell client for Weston based on GTK. It was based
+on weston-gtk-shell, a project by Tiago Vignatti.
+
+## Original idea
 
 The idea is that this client and any other based on any toolkit can be
 interchangeable to use with a single desktop plugin like the [weston desktop
@@ -9,6 +11,4 @@ plugin](https://github.com/tiagovignatti/weston-desktop-plugin). Therefore,
 one compositor, with a single desktop plugin can be used as a foundation for
 building different shell UIs based on different graphics toolkits.
 
-## More
-
 http://vignatti.wordpress.com/2013/03/05/ui-customization-on-wayland/
diff --git a/configure.ac b/configure.ac
index 4cb5f34..cfc58ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.64])
-AC_INIT([weston-gtk-shell],
+AC_INIT([maynard],
         [0.2.0+git])
 
 AC_CONFIG_HEADERS([config.h])
@@ -13,7 +13,7 @@ AC_PROG_CC
 
 IT_PROG_INTLTOOL([0.40])
 
-GETTEXT_PACKAGE=weston-gtk-shell
+GETTEXT_PACKAGE=maynard
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The prefix for our gettext translation domains.])
diff --git a/data/Makefile.am b/data/Makefile.am
index f7378ef..ddb8d7f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-gsettings_SCHEMAS = org.raspberrypi.weston-gtk-shell.gschema.xml
+gsettings_SCHEMAS = org.raspberrypi.maynard.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
@@ -16,10 +16,10 @@ gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid)
 all-local: gschemas.compiled
 
 EXTRA_DIST =						\
-	org.raspberrypi.weston-gtk-shell.gschema.xml.in.in
+	org.raspberrypi.maynard.gschema.xml.in.in
 
 CLEANFILES =						\
 	gschemas.compiled				\
-	org.raspberrypi.weston-gtk-shell.gschema.valid	\
+	org.raspberrypi.maynard.gschema.valid	\
 	$(gsettings_SCHEMAS)				\
 	$(gsettings_SCHEMAS).in
diff --git a/data/org.raspberrypi.weston-gtk-shell.gschema.xml.in.in b/data/org.raspberrypi.maynard.gschema.xml.in.in
index 34d1136..fe5511f 100644
--- a/data/org.raspberrypi.weston-gtk-shell.gschema.xml.in.in
+++ b/data/org.raspberrypi.maynard.gschema.xml.in.in
@@ -1,6 +1,6 @@
 <schemalist>
-  <schema id="org.raspberrypi.weston-gtk-shell"
-          path="/org/raspberrypi/weston-gtk-shell/"
+  <schema id="org.raspberrypi.maynard"
+          path="/org/raspberrypi/maynard/"
           gettext-domain="@GETTEXT_PACKAGE@">
     <key name="favorites" type="as">
       <default>[ 'epiphany.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop' ]</default>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0a0bf28..3184434 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-data/org.raspberrypi.weston-gtk-shell.gschema.xml.in.in
+data/org.raspberrypi.maynard.gschema.xml.in.in
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 7f870c7..773bca5 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,9 +1,9 @@
-libexec_PROGRAMS = weston-gtk-shell
+libexec_PROGRAMS = maynard
 
 AM_CFLAGS = $(GCC_CFLAGS)
 AM_CPPFLAGS = $(CLIENT_CFLAGS) $(GTK_CFLAGS)
 
-weston_gtk_shell_SOURCES =			\
+maynard_SOURCES =				\
 	gtk-shell.c				\
 	app-icon.c				\
 	app-icon.h				\
@@ -21,28 +21,28 @@ weston_gtk_shell_SOURCES =			\
 	vertical-clock.h			\
 	launcher.c				\
 	launcher.h				\
-	weston-gtk-shell-resources.c		\
-	weston-gtk-shell-resources.h		\
+	maynard-resources.c			\
+	maynard-resources.h			\
 	desktop-shell-client-protocol.h		\
 	desktop-shell-protocol.c		\
 	shell-helper-client-protocol.h		\
 	shell-helper-protocol.c
-weston_gtk_shell_LDADD = $(GTK_LIBS)
+maynard_LDADD = $(GTK_LIBS)
 
 BUILT_SOURCES =					\
 	desktop-shell-client-protocol.h		\
 	desktop-shell-protocol.c		\
 	shell-helper-client-protocol.h		\
 	shell-helper-protocol.c			\
-	weston-gtk-shell-resources.c		\
-	weston-gtk-shell-resources.h
+	maynard-resources.c			\
+	maynard-resources.h
 
 # gresource for css
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/weston-gtk-shell.gresource.xml)
-weston-gtk-shell-resources.c: weston-gtk-shell.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name weston_gtk_shell $<
-weston-gtk-shell-resources.h: weston-gtk-shell.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name weston_gtk_shell $<
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/maynard.gresource.xml)
+maynard-resources.c: maynard.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name maynard $<
+maynard-resources.h: maynard.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name maynard $<
 
 EXTRA_DIST = style.css
 
diff --git a/shell/favorites.c b/shell/favorites.c
index c8a006c..267126d 100644
--- a/shell/favorites.c
+++ b/shell/favorites.c
@@ -110,7 +110,7 @@ weston_gtk_favorites_init (WestonGtkFavorites *self)
                                             WESTON_GTK_TYPE_FAVORITES,
                                             WestonGtkFavoritesPrivate);
 
-  self->priv->settings = g_settings_new ("org.raspberrypi.weston-gtk-shell");
+  self->priv->settings = g_settings_new ("org.raspberrypi.maynard");
   g_signal_connect (self->priv->settings, "changed::favorites",
                     G_CALLBACK (favorites_changed), self);
   favorites_changed (self->priv->settings, "favorites", self);
diff --git a/shell/gtk-shell.c b/shell/gtk-shell.c
index cb6d893..31ea5cc 100644
--- a/shell/gtk-shell.c
+++ b/shell/gtk-shell.c
@@ -7,7 +7,7 @@
 #include "desktop-shell-client-protocol.h"
 #include "shell-helper-client-protocol.h"
 
-#include "weston-gtk-shell-resources.h"
+#include "maynard-resources.h"
 
 #include "app-icon.h"
 #include "clock.h"
@@ -389,7 +389,7 @@ css_setup(struct desktop *desktop)
 
 	provider = gtk_css_provider_new ();
 
-	file = g_file_new_for_uri ("resource:///org/raspberry-pi/weston-gtk-shell/style.css");
+	file = g_file_new_for_uri ("resource:///org/raspberry-pi/maynard/style.css");
 
 	if (!gtk_css_provider_load_from_file (provider, file, &error)) {
 		g_warning ("Failed to load CSS file: %s", error->message);
@@ -445,7 +445,7 @@ main(int argc, char *argv[])
 
 	gtk_init(&argc, &argv);
 
-	g_resources_register (weston_gtk_shell_get_resource ());
+	g_resources_register (maynard_get_resource ());
 
 	desktop = malloc(sizeof *desktop);
 	desktop->output = NULL;
diff --git a/shell/weston-gtk-shell.gresource.xml b/shell/maynard.gresource.xml
index 4bd0744..109f2ac 100644
--- a/shell/weston-gtk-shell.gresource.xml
+++ b/shell/maynard.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/raspberry-pi/weston-gtk-shell">
+  <gresource prefix="/org/raspberry-pi/maynard">
     <file compressed="true">style.css</file>
   </gresource>
 </gresources>
diff --git a/shell/sound-applet.c b/shell/sound-applet.c
index 22e8d19..3e5bfbf 100644
--- a/shell/sound-applet.c
+++ b/shell/sound-applet.c
@@ -64,7 +64,7 @@ weston_gtk_sound_applet_init (WestonGtkSoundApplet *self)
                                             WESTON_GTK_TYPE_SOUND_APPLET,
                                             WestonGtkSoundAppletPrivate);
 
-  self->priv->settings = g_settings_new ("org.raspberrypi.weston-gtk-shell");
+  self->priv->settings = g_settings_new ("org.raspberrypi.maynard");
 
   gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_HORIZONTAL);