diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2014-03-05 12:58:54 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2014-03-05 13:00:09 +0100 |
| commit | 0fdc7d88d3b38972b8d2242c981a6e09da4647a3 (patch) | |
| tree | 2d528a4cdfac7284d516a1c0e86879e5151ef80e /shell | |
| parent | be766f12c4c9629d720e149a983503034d75c192 (diff) | |
| download | graynard-0fdc7d88d3b38972b8d2242c981a6e09da4647a3.tar.gz graynard-0fdc7d88d3b38972b8d2242c981a6e09da4647a3.zip | |
rename project from weston-gtk-shell to maynard
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 24 | ||||
| -rw-r--r-- | shell/favorites.c | 2 | ||||
| -rw-r--r-- | shell/gtk-shell.c | 6 | ||||
| -rw-r--r-- | shell/maynard.gresource.xml (renamed from shell/weston-gtk-shell.gresource.xml) | 2 | ||||
| -rw-r--r-- | shell/sound-applet.c | 2 |
5 files changed, 18 insertions, 18 deletions
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); |
