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

Use correct location for Glade data

Browse source 
2001-07-03  Bradford Hovinen  <hovinen@ximian.com>

	* capplets/Makefile.am (INCLUDES): Use correct location for Glade
	data
This commit is contained in:
Bradford Hovinen 2001-07-03 18:06:27 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent 9718834cfb
commit 963cbcaff5
3 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2001-07-03 Bradford Hovinen <hovinen@ximian.com>
* capplets/Makefile.am (INCLUDES): Use correct location for Glade
data
2001-07-03 Richard Hestilow <hestilow@ximian.com> 2001-07-03 Richard Hestilow <hestilow@ximian.com>
* configure.in: Add PKG_CHECK_MODULES for SCREENSAVER_CAPPLET. * configure.in: Add PKG_CHECK_MODULES for SCREENSAVER_CAPPLET.

2
capplets/Makefile.am
View file

@ -10,7 +10,7 @@ SUBDIRS = $(always_built_SUBDIRS)
INCLUDES = \ INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DGLADE_DATADIR=\""$(Gladedir)"\" \ -DGLADE_DATADIR=\""$(datadir)/control-center-data"\" \
@CAPPLET_CFLAGS@ \ @CAPPLET_CFLAGS@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl -I$(top_srcdir)/intl

19
capplets/sound-properties-capplet.c
View file

@ -25,6 +25,10 @@
# include <config.h> # include <config.h>
#endif #endif
#define DEBUG_MSG(str, args...) \
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "(%d:%s) " str, \
getpid (), __FUNCTION__ , ## args)
/* Macros for variables that vary from capplet to capplet */ /* Macros for variables that vary from capplet to capplet */
#define DEFAULT_MONIKER "archiver:sound-properties" #define DEFAULT_MONIKER "archiver:sound-properties"
@ -199,9 +203,24 @@ create_dialog_cb (BonoboGenericFactory *factory, gpointer data)
GtkWidget *pf; GtkWidget *pf;
if (control == NULL) { if (control == NULL) {
DEBUG_MSG ("Creating control");
dialog = glade_xml_new (GLADE_FILE, "prefs_widget"); dialog = glade_xml_new (GLADE_FILE, "prefs_widget");
if (dialog == NULL) {
g_critical ("Could not load glade file");
return NULL;
}
widget = glade_xml_get_widget (dialog, "prefs_widget"); widget = glade_xml_get_widget (dialog, "prefs_widget");
if (widget == NULL) {
g_critical ("Could not find preferences widget");
return NULL;
}
DEBUG_MSG ("Loaded dialog: %p, %p", dialog, widget);
pf = bonobo_property_frame_new (NULL, NULL); pf = bonobo_property_frame_new (NULL, NULL);
gtk_container_add (GTK_CONTAINER (pf), widget); gtk_container_add (GTK_CONTAINER (pf), widget);
gtk_widget_show_all (pf); gtk_widget_show_all (pf);