gnome-utils r8153 - trunk/gnome-screenshot

[ebassi svn gnome org]

Author: ebassi
Date: Mon Oct 20 20:11:12 2008
New Revision: 8153
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8153&view=rev

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

	* gnome-screenshot.c:
	(load_options), (save_options): Remove the code that loads/saves
	the take_window_shot GConf key.
	
	(main): Mark the -B switch description as translatable.

	* gnome-screenshot.schemas.in: Deprecate the take_window_shot key.

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

Modified: trunk/gnome-screenshot/gnome-screenshot.c
==============================================================================
--- trunk/gnome-screenshot/gnome-screenshot.c	(original)
+++ trunk/gnome-screenshot/gnome-screenshot.c	Mon Oct 20 20:11:12 2008
@@ -55,7 +55,6 @@
 #define LAST_SAVE_DIRECTORY_KEY GNOME_SCREENSHOT_GCONF "/last_save_directory"
 #define BORDER_EFFECT_KEY       GNOME_SCREENSHOT_GCONF "/border_effect"
 #define DELAY_KEY               GNOME_SCREENSHOT_GCONF "/delay"
-#define TAKE_WINDOW_SHOT_KEY    GNOME_SCREENSHOT_GCONF "/take_window_shot"
 
 
 enum
@@ -1042,12 +1041,6 @@
   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);
 
   g_object_unref (gconf_client);
@@ -1062,16 +1055,6 @@
 
   /* 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);
-#endif
-
   gconf_client_set_bool (gconf_client,
                          INCLUDE_BORDER_KEY, include_border,
                          NULL);
@@ -1130,7 +1113,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 },
+    { "remove-border", 'B', 0, G_OPTION_ARG_NONE, &disable_border_arg, N_("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 },

Modified: trunk/gnome-screenshot/gnome-screenshot.schemas.in
==============================================================================
--- trunk/gnome-screenshot/gnome-screenshot.schemas.in	(original)
+++ trunk/gnome-screenshot/gnome-screenshot.schemas.in	Mon Oct 20 20:11:12 2008
@@ -10,8 +10,9 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-        <short>Window-specific screenshot</short>
-        <long>Grab just the current window, rather than the whole desktop.</long>
+        <short>Window-specific screenshot (deprecated)</short>
+        <long>Grab just the current window, rather than the whole desktop.
+        This key has been deprecated and it is no longer in use.</long>
       </locale>
     </schema>