gnome-control-center r8417 - trunk/capplets/appearance

[ssp svn gnome org]

Author: ssp
Date: Fri Jan 25 20:11:22 2008
New Revision: 8417
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8417&view=rev

Log:
2008-01-25  Soren Sandmann  <sandmann redhat com>

	* gnome-wp-item.c (collect_save_options): Delete this function.

	* gnome-wp-xml.c: Don't include gnome-wp-utils.h
	* appearance-desktop.c: Don't include gnome-wp-utils.h
	* gnome-wp-item.c: Don't include gnome-wp-utils.h
	* gnome-wp-item.h: Move gconf key macros here from gnome-wp-utils.h

	* Makefile.am: Delete gnome-wp-utils.[ch]
	
	* gnome-wp-utils.[ch]: Delete these files.
	



Removed:
   trunk/capplets/appearance/gnome-wp-utils.c
   trunk/capplets/appearance/gnome-wp-utils.h
Modified:
   trunk/capplets/appearance/ChangeLog
   trunk/capplets/appearance/Makefile.am
   trunk/capplets/appearance/appearance-desktop.c
   trunk/capplets/appearance/gnome-wp-item.c
   trunk/capplets/appearance/gnome-wp-item.h
   trunk/capplets/appearance/gnome-wp-xml.c

Modified: trunk/capplets/appearance/Makefile.am
==============================================================================
--- trunk/capplets/appearance/Makefile.am	(original)
+++ trunk/capplets/appearance/Makefile.am	Fri Jan 25 20:11:22 2008
@@ -24,8 +24,6 @@
 	gnome-wp-info.h \
 	gnome-wp-item.c \
 	gnome-wp-item.h \
-	gnome-wp-utils.c \
-	gnome-wp-utils.h \
 	gnome-wp-xml.c \
 	gnome-wp-xml.h \
 	theme-installer.c \

Modified: trunk/capplets/appearance/appearance-desktop.c
==============================================================================
--- trunk/capplets/appearance/appearance-desktop.c	(original)
+++ trunk/capplets/appearance/appearance-desktop.c	Fri Jan 25 20:11:22 2008
@@ -22,7 +22,6 @@
 #include "appearance.h"
 #include "gnome-wp-info.h"
 #include "gnome-wp-item.h"
-#include "gnome-wp-utils.h"
 #include "gnome-wp-xml.h"
 #include "wp-cellrenderer.h"
 #include <glib/gi18n.h>

Modified: trunk/capplets/appearance/gnome-wp-item.c
==============================================================================
--- trunk/capplets/appearance/gnome-wp-item.c	(original)
+++ trunk/capplets/appearance/gnome-wp-item.c	Fri Jan 25 20:11:22 2008
@@ -27,9 +27,7 @@
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-bg.h>
-
 #include "gnome-wp-item.h"
-#include "gnome-wp-utils.h"
 
 static void set_bg_properties (GnomeWPItem *item)
 {
@@ -171,55 +169,6 @@
   g_free (item);
 }
 
-static void collect_save_options (GdkPixbuf * pixbuf,
-				  gchar *** keys,
-				  gchar *** vals,
-				  gint width,
-				  gint height) {
-  gchar ** options;
-  gint n, count;
-
-  count = 0;
-
-  options = g_object_get_qdata (G_OBJECT (pixbuf),
-				g_quark_from_static_string ("gdk_pixbuf_options"));
-  if (options) {
-    for (n = 0; options[2 * n]; n++) {
-      ++count;
-
-      *keys = g_realloc (*keys, sizeof (gchar *) * (count + 1));
-      *vals = g_realloc (*vals, sizeof (gchar *) * (count + 1));
-
-      (*keys)[count - 1] = g_strdup (options[2 * n]);
-      (*vals)[count - 1] = g_strdup (options[2 * n + 1]);
-
-      (*keys)[count] = NULL;
-      (*vals)[count] = NULL;
-    }
-  }
-  ++count;
-
-  *keys = g_realloc (*keys, sizeof (gchar *) * (count + 1));
-  *vals = g_realloc (*vals, sizeof (gchar *) * (count + 1));
-
-  (*keys)[count - 1] = g_strdup ("tEXt::Thumb::Image::Width");
-  (*vals)[count - 1] = g_strdup_printf ("%d", width);
-
-  (*keys)[count] = NULL;
-  (*vals)[count] = NULL;
-
-  ++count;
-
-  *keys = g_realloc (*keys, sizeof (gchar *) * (count + 1));
-  *vals = g_realloc (*vals, sizeof (gchar *) * (count + 1));
-
-  (*keys)[count - 1] = g_strdup ("tEXt::Thumb::Image::Height");
-  (*vals)[count - 1] = g_strdup_printf ("%d", height);
-
-  (*keys)[count] = NULL;
-  (*vals)[count] = NULL;
-}
-
 #define LIST_IMAGE_WIDTH 108
 
 GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item,

Modified: trunk/capplets/appearance/gnome-wp-item.h
==============================================================================
--- trunk/capplets/appearance/gnome-wp-item.h	(original)
+++ trunk/capplets/appearance/gnome-wp-item.h	Fri Jan 25 20:11:22 2008
@@ -30,6 +30,15 @@
 #ifndef _GNOME_WP_ITEM_H_
 #define _GNOME_WP_ITEM_H_
 
+#define WP_PATH_KEY "/desktop/gnome/background"
+#define WP_FILE_KEY WP_PATH_KEY "/picture_filename"
+#define WP_OPTIONS_KEY WP_PATH_KEY "/picture_options"
+#define WP_SHADING_KEY WP_PATH_KEY "/color_shading_type"
+#define WP_PCOLOR_KEY WP_PATH_KEY "/primary_color"
+#define WP_SCOLOR_KEY WP_PATH_KEY "/secondary_color"
+#define WP_KEYBOARD_PATH "/desktop/gnome/peripherals/keyboard"
+#define WP_DELAY_KEY WP_KEYBOARD_PATH "/delay"
+
 typedef struct _GnomeWPItem GnomeWPItem;
 
 struct _GnomeWPItem {

Modified: trunk/capplets/appearance/gnome-wp-xml.c
==============================================================================
--- trunk/capplets/appearance/gnome-wp-xml.c	(original)
+++ trunk/capplets/appearance/gnome-wp-xml.c	Fri Jan 25 20:11:22 2008
@@ -20,7 +20,6 @@
 
 #include "appearance.h"
 #include "gnome-wp-item.h"
-#include "gnome-wp-utils.h"
 #include <string.h>
 #include <libxml/parser.h>