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

Add parameter GNOME_PARAM_APP_DATADIR

Browse source 
2001-12-20  Bradford Hovinen  <hovinen@ximian.com>

	* capplets/screensaver/main.c (main): Add parameter
	GNOME_PARAM_APP_DATADIR

	* mouse-properties-capplet.c (main): Add parameter
	GNOME_PARAM_APP_DATADIR

	* configure.in (GNOMECC_DESKTOP_DIR): Define
	(GNOMECC_DATA_DIR): Define
	Remove AC_DEFINE_UNQUOTED for the rest of the directories

	* All: Update to reflect above
This commit is contained in:
Bradford Hovinen 2001-12-20 18:52:39 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent 2dd5ccf964
commit 30389610b4
15 changed files with 99 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

39
capplets/mouse/mouse-properties-capplet.c
View file

@ -278,21 +278,37 @@ static void
load_pixbufs (void)
{
static gboolean called = FALSE;
gchar *filename;
GnomeProgram *program;
if (called) return;
left_handed_pixbuf = gdk_pixbuf_new_from_file ("mouse-left.png", NULL);
right_handed_pixbuf = gdk_pixbuf_new_from_file ("mouse-right.png", NULL);
double_click_on_pixbuf = gdk_pixbuf_new_from_file ("double-click-on.png", NULL);
double_click_maybe_pixbuf = gdk_pixbuf_new_from_file ("double-click-maybe.png", NULL);
double_click_off_pixbuf = gdk_pixbuf_new_from_file ("double-click-off.png", NULL);
program = gnome_program_get ();
/* Let's be paranoid here. I like this feature :-) */
g_object_add_weak_pointer (G_OBJECT (left_handed_pixbuf), (gpointer *) &left_handed_pixbuf);
g_object_add_weak_pointer (G_OBJECT (right_handed_pixbuf), (gpointer *) &right_handed_pixbuf);
g_object_add_weak_pointer (G_OBJECT (double_click_on_pixbuf), (gpointer *) &double_click_on_pixbuf);
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-left.png", TRUE, NULL);
left_handed_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_object_add_weak_pointer (G_OBJECT (left_handed_pixbuf), (gpointer *) &left_handed_pixbuf);
g_free (filename);
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-right.png", TRUE, NULL);
right_handed_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_object_add_weak_pointer (G_OBJECT (right_handed_pixbuf), (gpointer *) &right_handed_pixbuf);
g_free (filename);
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "double-click-on.png", TRUE, NULL);
double_click_on_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_object_add_weak_pointer (G_OBJECT (double_click_on_pixbuf), (gpointer *) &double_click_on_pixbuf);
g_free (filename);
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "double-click-maybe.png", TRUE, NULL);
double_click_maybe_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_object_add_weak_pointer (G_OBJECT (double_click_maybe_pixbuf), (gpointer *) &double_click_maybe_pixbuf);
g_object_add_weak_pointer (G_OBJECT (double_click_off_pixbuf), (gpointer *) &double_click_off_pixbuf);
g_free (filename);
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "double-click-off.png", TRUE, NULL);
double_click_off_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_object_add_weak_pointer (G_OBJECT (double_click_off_pixbuf), (gpointer *) &double_click_off_pixbuf);
g_free (filename);
called = TRUE;
}
@ -360,7 +376,7 @@ create_dialog (void)
GladeXML *dialog;
GtkSizeGroup *size_group;
dialog = glade_xml_new (GNOMECC_GLADE_DIR "/mouse-properties.glade", "prefs_widget", NULL);
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/mouse-properties.glade", "prefs_widget", NULL);
widget = glade_xml_get_widget (dialog, "prefs_widget");
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@ -425,6 +441,7 @@ main (int argc, char **argv)
gnome_program_init (argv[0], VERSION, LIBGNOMEUI_MODULE, argc, argv,
GNOME_PARAM_POPT_TABLE, cap_options,
GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
NULL);
client = gconf_client_get_default ();