[gnome-screenshot] screenshot: fix an inverted logic error

[Cosimo Cecchi <cosimoc src gnome org>]

commit 25203a16e532b8474c92dfd931ce07d59c21764c
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Tue May 22 15:10:05 2012 -0400

    screenshot: fix an inverted logic error
    
    When a commandline argument is specified for the border, it should
    override the value from GSettings, not the other way around.

 src/screenshot-config.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/screenshot-config.c b/src/screenshot-config.c
index 4d372ba..f99a553 100644
--- a/src/screenshot-config.c
+++ b/src/screenshot-config.c
@@ -88,11 +88,11 @@ screenshot_load_config (gboolean clipboard_arg,
         config->include_border = FALSE;
 
       if (border_effect_arg != NULL)
+        config->border_effect = g_strdup (border_effect_arg);
+      else
         config->border_effect =
           g_settings_get_string (config->settings,
                                  BORDER_EFFECT_KEY);
-      else
-        config->border_effect = g_strdup (border_effect_arg);
     }
   else
     {