applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

As long as we're hard coding the path hard code it in only one place.

Browse source 
2004-01-12  Jody Goldberg <jody@gnome.org>

	* Makefile.am : As long as we're hard coding the path hard code it in
	  only one place.  Passing in datadir then adding the magic subdir in
	  C then building in Makefile seems unnecessary.
	  Use GNOMECC_CAPPLETS_*
This commit is contained in:
Jody Goldberg 2004-01-12 06:35:57 +00:00 • committed by Jody Goldberg
parent acdde5d39d
commit 55a692788a
5 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
capplets/background/ChangeLog
View file

@ -1,3 +1,10 @@
2004-01-12 Jody Goldberg <jody@gnome.org>
* Makefile.am : As long as we're hard coding the path hard code it in
only one place. Passing in datadir then adding the magic subdir in
C then building in Makefile seems unnecessary.
Use GNOMECC_CAPPLETS_*
2004-01-12 Rodney Dawes <dobey@ximian.com> 2004-01-12 Rodney Dawes <dobey@ximian.com>
* Makefile.am: Add install hook to create data directory * Makefile.am: Add install hook to create data directory

13
capplets/background/Makefile.am
View file

@ -1,14 +1,13 @@
INCLUDES = \ WALLPAPER_DATADIR = $(datadir)/gnome-wallpaper-properties
$(CAPPLET_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DWALLPAPER_DATADIR=\""$(WALLPAPER_DATADIR)"\"
-DGNOMELOCALEDIR=\""$(localedir)"\"
bin_PROGRAMS = gnome-wallpaper-properties bin_PROGRAMS = gnome-wallpaper-properties
noinst_LTLIBRARIES = libgnomewp.la noinst_LTLIBRARIES = libgnomewp.la
gnome_wallpaper_properties_LDADD = \ gnome_wallpaper_properties_LDADD = \
$(CAPPLET_LIBS) \ $(GNOMECC_CAPPLETS_LIBS) \
libgnomewp.la libgnomewp.la
gnome_wallpaper_properties_SOURCES = \ gnome_wallpaper_properties_SOURCES = \
@ -21,7 +20,7 @@ libgnomewp_la_SOURCES = \
gnome-wp-xml.c gnome-wp-xml.h gnome-wp-xml.c gnome-wp-xml.h
libgnomewp_la_LIBADD = \ libgnomewp_la_LIBADD = \
$(CAPPLET_LIBS) $(GNOMECC_CAPPLETS_LIBS)
desktopdir = $(GNOMECC_DESKTOP_DIR) desktopdir = $(GNOMECC_DESKTOP_DIR)
desktop_in_files = background.desktop.in desktop_in_files = background.desktop.in
@ -30,7 +29,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
install-data-local: install-data-local:
$(mkinstalldirs) $(datadir)/gnome-wallpaper-properties $(mkinstalldirs) $(WALLPAPER_DATADIR)
EXTRA_DIST = \ EXTRA_DIST = \
$(desktop_in_files) $(desktop_in_files)

1
capplets/background/gnome-wp-item.c
View file

@ -20,6 +20,7 @@
#include "gnome-wp-item.h" #include "gnome-wp-item.h"
#include "gnome-wp-utils.h" #include "gnome-wp-utils.h"
#include <string.h>
void gnome_wp_item_free (GnomeWPItem * item) { void gnome_wp_item_free (GnomeWPItem * item) {
if (item == NULL) { if (item == NULL) {

3
capplets/background/gnome-wp-utils.c
View file

@ -19,6 +19,7 @@
*/ */
#include "gnome-wp-utils.h" #include "gnome-wp-utils.h"
#include <string.h>
GdkPixbuf * gnome_wp_pixbuf_new_gradient (GtkOrientation orientation, GdkPixbuf * gnome_wp_pixbuf_new_gradient (GtkOrientation orientation,
GdkColor * c1, GdkColor * c1,
@ -106,7 +107,6 @@ GdkPixbuf * gnome_wp_pixbuf_new_solid (GdkColor * color,
GdkPixbuf * gnome_wp_pixbuf_tile (GdkPixbuf * src_pixbuf, GdkPixbuf * gnome_wp_pixbuf_tile (GdkPixbuf * src_pixbuf,
GdkPixbuf * dest_pixbuf) { GdkPixbuf * dest_pixbuf) {
gdouble cx, cy; gdouble cx, cy;
gdouble colorv;
gint dwidth, dheight; gint dwidth, dheight;
gint swidth, sheight; gint swidth, sheight;
guint alpha = 255; guint alpha = 255;
@ -136,7 +136,6 @@ GdkPixbuf * gnome_wp_pixbuf_tile (GdkPixbuf * src_pixbuf,
GdkPixbuf * gnome_wp_pixbuf_center (GdkPixbuf * src_pixbuf, GdkPixbuf * gnome_wp_pixbuf_center (GdkPixbuf * src_pixbuf,
GdkPixbuf * dest_pixbuf) { GdkPixbuf * dest_pixbuf) {
gdouble cx, cy; gdouble cx, cy;
gdouble colorv;
gint dwidth, dheight; gint dwidth, dheight;
gint swidth, sheight; gint swidth, sheight;
guint alpha = 255; guint alpha = 255;

10
capplets/background/gnome-wp-xml.c
View file

@ -297,9 +297,8 @@ void gnome_wp_xml_load_list (GnomeWPCapplet * capplet) {
g_strfreev (xdgdirs); g_strfreev (xdgdirs);
g_free (xdgdirslist); g_free (xdgdirslist);
wpdbfile = g_build_filename (DATADIR, "gnome-wallpaper-properties", NULL); if (g_file_test (WALLPAPER_DATADIR, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
if (g_file_test (wpdbfile, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) { gnome_vfs_directory_list_load (&list, WALLPAPER_DATADIR,
gnome_vfs_directory_list_load (&list, wpdbfile,
GNOME_VFS_FILE_INFO_DEFAULT | GNOME_VFS_FILE_INFO_DEFAULT |
GNOME_VFS_FILE_INFO_FOLLOW_LINKS); GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
@ -309,18 +308,17 @@ void gnome_wp_xml_load_list (GnomeWPCapplet * capplet) {
if (strcmp (".", info->name) != 0 && strcmp ("..", info->name) != 0) { if (strcmp (".", info->name) != 0 && strcmp ("..", info->name) != 0) {
gchar * filename; gchar * filename;
filename = g_build_filename (wpdbfile, info->name, NULL); filename = g_build_filename (WALLPAPER_DATADIR, info->name, NULL);
gnome_wp_xml_load_xml (capplet, filename); gnome_wp_xml_load_xml (capplet, filename);
g_free (filename); g_free (filename);
} }
} }
g_list_free (list); g_list_free (list);
gnome_vfs_monitor_add (&handle, wpdbfile, GNOME_VFS_MONITOR_DIRECTORY, gnome_vfs_monitor_add (&handle, WALLPAPER_DATADIR, GNOME_VFS_MONITOR_DIRECTORY,
(GnomeVFSMonitorCallback) gnome_wp_file_changed, (GnomeVFSMonitorCallback) gnome_wp_file_changed,
capplet); capplet);
} }
g_free (wpdbfile);
gnome_wp_load_legacy (capplet); gnome_wp_load_legacy (capplet);
} }