Minor cleaups

po/POTFILES.in

@@ -1,3 +1,4 @@
 src/WindowManager.vala
+src/Widgets/WindowMenu.vala
 data/gala-multitaskingview.desktop.in
 data/org.pantheon.desktop.gala.gschema.xml.in.in

po/POTFILES.skip

@@ -1,2 +1,3 @@
 data/org.pantheon.desktop.gala.gschema.xml.in
 src/WindowManager.c
+src/Widgets/WindowMenu.c

po/gala.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-06 18:48+0100\n"
+"POT-Creation-Date: 2015-01-04 16:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,18 +17,58 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/WindowManager.vala:1251
+#: ../src/WindowManager.vala:1346
 msgid "Does the display look OK?"
 msgstr ""
 
-#: ../src/WindowManager.vala:1254
+#: ../src/WindowManager.vala:1349
 msgid "Keep This Configuration"
 msgstr ""
 
-#: ../src/WindowManager.vala:1255
+#: ../src/WindowManager.vala:1350
 msgid "Restore Previous Configuration"
 msgstr ""
 
+#: ../src/Widgets/WindowMenu.vala:58
+msgid "Minimize"
+msgstr ""
+
+#: ../src/Widgets/WindowMenu.vala:73
+msgid "Move"
+msgstr ""
+
+#: ../src/Widgets/WindowMenu.vala:80
+msgid "Resize"
+msgstr ""
+
+#: ../src/Widgets/WindowMenu.vala:87
+msgid "Always on Top"
+msgstr ""
+
+#: ../src/Widgets/WindowMenu.vala:96
+msgid "Always on Visible Workspace"
+msgstr ""
+
+#: ../src/Widgets/WindowMenu.vala:105
+msgid "Move to Workspace Left"
+msgstr ""
+
+#: ../src/Widgets/WindowMenu.vala:113
+msgid "Move to Workspace Right"
+msgstr ""
+
+#: ../src/Widgets/WindowMenu.vala:121
+msgid "Close"
+msgstr ""
+
+#: ../src/Widgets/WindowMenu.vala:133
+msgid "Unmaximize"
+msgstr ""
+
+#: ../src/Widgets/WindowMenu.vala:133
+msgid "Maximize"
+msgstr ""
+
 #: ../data/gala-multitaskingview.desktop.in.h:1
 msgid "Multitasking View"
 msgstr ""
@@ -249,3 +289,25 @@ msgstr ""
 #: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:45
 msgid "Defines the shadow of an unfocused dialog"
 msgstr ""
+
+#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:46
+msgid "Disable all notifications"
+msgstr ""
+
+#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:47
+msgid "The default setting for the bubbles that would be used for new apps"
+msgstr ""
+
+#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:48
+msgid "The default setting for the sounds that would be used for new apps"
+msgstr ""
+
+#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:49
+msgid ""
+"List of apps and their notification-permissions. Example: ['noise:show,on', "
+"'pantheon-terminal:show,off']"
+msgstr ""
+
+#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:50
+msgid "Structure: ['{APP-NAME}:{PRIORITY (show/hide)},{SOUNDS on/off}', ...]"
+msgstr ""

src/Background/BackgroundSource.vala

@@ -83,9 +83,7 @@ namespace Gala
 
 			if (!backgrounds.has_key (monitor_index)) {
 				var background = new Background (screen, monitor_index, filename, this, (GDesktop.BackgroundStyle) style);
-
 				background.changed.connect (background_changed);
-
 				backgrounds[monitor_index] = background;
 			}
 

src/Makefile.am

@@ -52,25 +52,32 @@ gala_VALASOURCES = \
 	Widgets/WindowMenu.vala \
 	Widgets/WindowOverview.vala \
 	Widgets/WindowSwitcher.vala \
-	Widgets/WorkspaceClone.vala
+	Widgets/WorkspaceClone.vala \
+	$(NULL)
 
-if HAVE_MUTTER314
+gala_background = \
-gala_VALASOURCES += Background/Animation.vala \
+	Background/Animation.vala \
 	Background/Background.vala \
 	Background/BackgroundCache.vala \
 	Background/BackgroundContainer.vala \
 	Background/BackgroundManager.vala \
 	Background/BackgroundSource.vala \
-	Background/SystemBackground.vala
+	Background/SystemBackground.vala \
-else
+	$(NULL)
-gala_VALASOURCES += Background312/Background.vala \
-	Background312/BackgroundCache.vala \
-	Background312/BackgroundManager.vala \
-	Background312/SlideShow.vala \
-	Background312/SystemBackground.vala
-endif
 
-gala_VALASOURCES += $(NULL)
+gala_background312 = \
+	Background-3.12/Background.vala \
+	Background-3.12/BackgroundCache.vala \
+	Background-3.12/BackgroundManager.vala \
+	Background-3.12/SlideShow.vala \
+	Background-3.12/SystemBackground.vala \
+	$(NULL)
+
+if HAVE_MUTTER314
+gala_VALASOURCES += $(gala_background)
+else
+gala_VALASOURCES += $(gala_background312)
+endif
 
 nodist_gala_SOURCES = \
 	gala_vala.stamp \
@@ -91,6 +98,8 @@ CLEANFILES = \
 	$(NULL)
 
 EXTRA_DIST = \
+	$(gala_background) \
+	$(gala_background312) \
 	$(gala_VALASOURCES) \
 	$(NULL)