gnome-utils r8148 - trunk/gnome-screenshot

[ebassi svn gnome org]

Author: ebassi
Date: Mon Oct 20 18:58:50 2008
New Revision: 8148
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8148&view=rev

Log:
2008-10-20  Emmanuele Bassi  <ebassi gnome org>

	Bug 553085 â After doing gnome-screenshot -w (grab a window), "grab the entire
	screen" works to grab a window.

	* gnome-screenshot.c:
	(load_options), (save_options): Ignore the take_window_shot GConf key
	when loading and saving the options.
	
	(main): Include a -B|--remove-border command line switch to disable the
	window border.

Modified:
   trunk/gnome-screenshot/ChangeLog
   trunk/gnome-screenshot/gnome-screenshot.c

Modified: trunk/gnome-screenshot/gnome-screenshot.c
==============================================================================
--- trunk/gnome-screenshot/gnome-screenshot.c	(original)
+++ trunk/gnome-screenshot/gnome-screenshot.c	Mon Oct 20 18:58:50 2008
@@ -1042,9 +1042,11 @@
   if (!border_effect)
     border_effect = g_strdup ("none");
 
+#if 0
   take_window_shot = gconf_client_get_bool (gconf_client,
                                             TAKE_WINDOW_SHOT_KEY,
                                             NULL);
+#endif
 
   delay = gconf_client_get_int (gconf_client, DELAY_KEY, NULL);
 
@@ -1059,14 +1061,21 @@
   gconf_client = gconf_client_get_default ();
 
   /* Error is NULL, as there's nothing we can do */
+
+#if 0
+  /* Disable saving the window key as it breaks command line
+   * and global key binding
+   */
   gconf_client_set_bool (gconf_client,
                          TAKE_WINDOW_SHOT_KEY,
                          take_window_shot,
                          NULL);
-  gconf_client_set_int (gconf_client, DELAY_KEY, delay, NULL);
+#endif
+
   gconf_client_set_bool (gconf_client,
                          INCLUDE_BORDER_KEY, include_border,
                          NULL);
+  gconf_client_set_int (gconf_client, DELAY_KEY, delay, NULL);
   gconf_client_set_string (gconf_client,
                            BORDER_EFFECT_KEY, border_effect,
                            NULL);
@@ -1113,6 +1122,7 @@
   GOptionGroup *group;
   gboolean window_arg = FALSE;
   gboolean include_border_arg = FALSE;
+  gboolean disable_border_arg = FALSE;
   gboolean interactive_arg = FALSE;
   gchar *border_effect_arg = NULL;
   guint delay_arg = 0;
@@ -1120,6 +1130,7 @@
   const GOptionEntry entries[] = {
     { "window", 'w', 0, G_OPTION_ARG_NONE, &window_arg, N_("Grab a window instead of the entire screen"), NULL },
     { "include-border", 'b', 0, G_OPTION_ARG_NONE, &include_border_arg, N_("Include the window border with the screenshot"), NULL },
+    { "remove-border", 'B', 0, G_OPTION_ARG_NONE, &disable_border_arg, "Remove the window border from the screenshot", NULL },
     { "delay", 'd', 0, G_OPTION_ARG_INT, &delay_arg, N_("Take screenshot after specified delay [in seconds]"), N_("seconds") },
     { "border-effect", 'e', 0, G_OPTION_ARG_STRING, &border_effect_arg, N_("Effect to add to the border (shadow, border or none)"), N_("effect") },
     { "interactive", 'i', 0, G_OPTION_ARG_NONE, &interactive_arg, N_("Interactively set options"), NULL },
@@ -1153,6 +1164,9 @@
   if (include_border_arg)
     include_border = TRUE;
 
+  if (disable_border_arg)
+    include_border = FALSE;
+
   if (border_effect_arg)
     {
       g_free (border_effect);