summaryrefslogtreecommitdiff
path: root/src/cheese-effects-manager.vala
diff options
context:
space:
mode:
authordaniel g. siegel <dgsiegel@gnome.org>2010-07-03 12:02:05 +0200
committerdaniel g. siegel <dgsiegel@gnome.org>2010-07-03 12:02:05 +0200
commit06c410fcaffde0f125d9b3a1cdcd7925f7d49c9e (patch)
tree5b727ab2113715752d1c69bc234b796a30a5ded4 /src/cheese-effects-manager.vala
parentc859f564889922456dd688e634ffdc426f097577 (diff)
downloadcheese-06c410fcaffde0f125d9b3a1cdcd7925f7d49c9e.tar.gz
only load effect files ending with ".effect"
Diffstat (limited to 'src/cheese-effects-manager.vala')
-rw-r--r--src/cheese-effects-manager.vala7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/cheese-effects-manager.vala b/src/cheese-effects-manager.vala
index 4be6e59b..00c77db1 100644
--- a/src/cheese-effects-manager.vala
+++ b/src/cheese-effects-manager.vala
@@ -54,8 +54,10 @@ internal class Cheese.EffectsManager : GLib.Object
cur_file = dir.read_name ();
while (cur_file != null)
{
- Effect effect = EffectsManager.parse_effect_file (GLib.Path.build_filename (directory, cur_file));
- effects.add (effect);
+ if (cur_file.has_suffix(".effect")) {
+ Effect effect = EffectsManager.parse_effect_file (GLib.Path.build_filename (directory, cur_file));
+ effects.add (effect);
+ }
cur_file = dir.read_name ();
}
}
@@ -70,7 +72,6 @@ internal class Cheese.EffectsManager : GLib.Object
public void load_effects ()
{
string system_effects = GLib.Path.build_filename (Config.PACKAGE_DATADIR, "effects");
-
effects.add_all (load_effects_from_directory (system_effects));
string user_effects = GLib.Path.build_filename (Environment.get_user_data_dir (), ".cheese", "effects");