Fix fix fix fix fix & clean stuff. With their changelog entries for your
pleasure.
This commit is contained in:
Jose Maria Celorio
parent
35d967aed2
commit
ab0fef8323
21 changed files with 215 additions and 153 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2001-07-18 Chema Celorio <chema@celorio.com>
|
||||
|
||||
* configure.in (GNOMECC_SCREENSAVERS_DIR): define GNOMECC_SCREENSAVERS_DIR
|
||||
(dnl): remove the check for bonobo-conf and check in the PKG_CONFIG macro
|
||||
(capplet_modules): add versions that we require
|
||||
|
||||
2001-07-17 Chema Celorio <chema@celorio.com>
|
||||
|
||||
* configure.in: define the directories
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@
|
|||
#undef GNOMECC_ICONS_DIR
|
||||
#undef GNOMECC_GLADE_DIR
|
||||
#undef GNOMECC_PIXMAPS_DIR
|
||||
#undef GNOMECC_SCREENSAVERS_DIR
|
||||
|
||||
#undef PACKAGE
|
||||
#undef VERSION
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
.deps
|
||||
stamp-h.in
|
||||
|
|
@ -1,3 +1,9 @@
|
|||
2001-07-18 Chema Celorio <chema@celorio.com>
|
||||
|
||||
* default-applications.desktop.in.in (Exec): use the right binary name
|
||||
|
||||
* Makefile.am (INCLUDES): we are not using GNOMESYSCONFDIR. remove
|
||||
|
||||
2001-07-17 Chema Celorio <chema@celorio.com>
|
||||
|
||||
* Makefile.am (SUBDIRS): clean
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ pixmap_DATA =
|
|||
@XML_I18N_MERGE_DESKTOP_RULE@
|
||||
@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
[Desktop Entry]
|
||||
_Name=Default Applications
|
||||
_Comment=Choose the applications used by default
|
||||
Exec=default-application-properties-capplet
|
||||
Exec=default-applications-properties
|
||||
Icon=
|
||||
Terminal=0
|
||||
Type=Application
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
2001-07-18 Chema Celorio <chema@celorio.com>
|
||||
|
||||
* prefs-widget.c (set_pixmap_file): the path of the pixmaps was
|
||||
changed
|
||||
|
||||
* mouse-properties.glade: set a group for the radio buttons
|
||||
|
||||
2001-07-17 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* Makefile.am (EXTRA_DIST): Changed Applications_DATA to
|
||||
|
|
|
|||
|
|
@ -127,6 +127,7 @@
|
|||
<label>Left handed</label>
|
||||
<active>False</active>
|
||||
<draw_indicator>True</draw_indicator>
|
||||
<group>radio_group</group>
|
||||
<child>
|
||||
<left_attach>0</left_attach>
|
||||
<right_attach>1</right_attach>
|
||||
|
|
@ -155,6 +156,7 @@
|
|||
<label>Right handed</label>
|
||||
<active>False</active>
|
||||
<draw_indicator>True</draw_indicator>
|
||||
<group>radio_group</group>
|
||||
<child>
|
||||
<left_attach>1</left_attach>
|
||||
<right_attach>2</right_attach>
|
||||
|
|
|
|||
|
|
@ -104,8 +104,8 @@ prefs_widget_init (PrefsWidget *prefs_widget)
|
|||
"prefs_widget");
|
||||
gtk_container_add (GTK_CONTAINER (prefs_widget), widget);
|
||||
|
||||
set_pixmap_file (prefs_widget, "mouse_left_pixmap", "mouse-left.png");
|
||||
set_pixmap_file (prefs_widget, "mouse_right_pixmap", "mouse-right.png");
|
||||
set_pixmap_file (prefs_widget, "mouse_left_pixmap", GNOMECC_PIXMAPS_DIR "/mouse-left.png");
|
||||
set_pixmap_file (prefs_widget, "mouse_right_pixmap", GNOMECC_PIXMAPS_DIR "/mouse-right.png");
|
||||
|
||||
glade_xml_signal_connect_data
|
||||
(prefs_widget->dialog_data, "left_handed_selected_cb",
|
||||
|
|
@ -317,7 +317,6 @@ set_pixmap_file (PrefsWidget *prefs_widget, const gchar *widget_name, const gcha
|
|||
GdkPixbuf *pixbuf;
|
||||
GdkPixmap *pixmap;
|
||||
GdkBitmap *mask;
|
||||
gchar *path;
|
||||
|
||||
g_return_if_fail (IS_PREFS_WIDGET (prefs_widget));
|
||||
g_return_if_fail (widget_name != NULL);
|
||||
|
|
@ -326,9 +325,7 @@ set_pixmap_file (PrefsWidget *prefs_widget, const gchar *widget_name, const gcha
|
|||
widget = WID (widget_name);
|
||||
g_return_if_fail (widget != NULL);
|
||||
|
||||
path = gnome_pixmap_file (filename);
|
||||
pixbuf = gdk_pixbuf_new_from_file (path);
|
||||
g_free (path);
|
||||
pixbuf = gdk_pixbuf_new_from_file (filename);
|
||||
|
||||
if (pixbuf) {
|
||||
gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask,
|
||||
|
|
|
|||
|
|
@ -1,3 +1,15 @@
|
|||
2001-07-18 Chema Celorio <chema@celorio.com>
|
||||
|
||||
* screensaver.desktop.in.in: use the right binary name
|
||||
|
||||
* expr.c: include string.h
|
||||
|
||||
* Makefile.am (INCLUDES): remove the -DSSPROP_DIR we now use a define in acclocal.h
|
||||
|
||||
* screensavers/Makefile.am (Screensaversdir): use GNOMECC_SCREENSAVERS_DIR
|
||||
|
||||
* prefs-widget.c (prefs_widget_init): remove a warning
|
||||
|
||||
2001-07-17 Chema Celorio <chema@celorio.com>
|
||||
|
||||
* Makefile.am (SUBDIRS): clean
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ pixmap_DATA = no-hack.png
|
|||
@XML_I18N_MERGE_DESKTOP_RULE@
|
||||
@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DSSPROP_DATADIR=\""${prefix}/share"\"
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
#include "expr.h"
|
||||
|
||||
typedef enum {
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ prefs_widget_init (PrefsWidget *prefs_widget)
|
|||
|
||||
prefs_widget->priv = g_new0 (PrefsWidgetPrivate, 1);
|
||||
prefs_widget->priv->xml =
|
||||
glade_xml_new (GLADE_DATADIR "/screensaver-properties.glade",
|
||||
glade_xml_new (GNOMECC_GLADE_DIR "/screensaver-properties.glade",
|
||||
NULL);
|
||||
if (!prefs_widget->priv->xml)
|
||||
return;
|
||||
|
|
@ -171,11 +171,11 @@ prefs_widget_init (PrefsWidget *prefs_widget)
|
|||
titles[i] = gettext (titles[i]);
|
||||
|
||||
skel =
|
||||
"<ETableSpecification cursor-mode=\"line\" selection-mode=\"single\" draw-focus=\"true\">
|
||||
<ETableColumn model_col=\"0\" draw_grid=\"true\" _title=\"%s\" expansion=\"0.0\" minimum_width=\"20\" resizable=\"false\" cell=\"checkbox\" compare=\"integer\"/>
|
||||
<ETableColumn model_col=\"1\" draw_grid=\"true\" _title=\"%s\" expansion=\"1.0\" resizable=\"true\" cell=\"string\" compare=\"string\"/>
|
||||
%s
|
||||
</ETableSpecification>";
|
||||
"<ETableSpecification cursor-mode=\"line\" selection-mode=\"single\" draw-focus=\"true\">"
|
||||
" <ETableColumn model_col=\"0\" draw_grid=\"true\" _title=\"%s\" expansion=\"0.0\" minimum_width=\"20\" resizable=\"false\" cell=\"checkbox\" compare=\"integer\"/>"
|
||||
" <ETableColumn model_col=\"1\" draw_grid=\"true\" _title=\"%s\" expansion=\"1.0\" resizable=\"true\" cell=\"string\" compare=\"string\"/>"
|
||||
" %s"
|
||||
" </ETableSpecification>";
|
||||
|
||||
spec = g_strdup_printf (skel, titles[0], titles[1], table_compute_state (SM_CHOOSE_FROM_LIST));
|
||||
prefs_widget->priv->etm =
|
||||
|
|
|
|||
|
|
@ -753,14 +753,14 @@ get_argument_data (Screensaver *saver)
|
|||
else
|
||||
lang = g_strdup ("");
|
||||
|
||||
file_name = g_strconcat (SSPROP_DATADIR "/screensavers/",
|
||||
file_name = g_strconcat (GNOMECC_SCREENSAVERS_DIR "/screensavers/",
|
||||
lang, saver->name, ".xml", NULL);
|
||||
doc = xmlParseFile (file_name);
|
||||
g_free (file_name);
|
||||
|
||||
/* Fall back on default language if given language is not found */
|
||||
if (!doc && *lang != '\0') {
|
||||
file_name = g_strconcat (SSPROP_DATADIR "/screensavers/",
|
||||
file_name = g_strconcat (GNOMECC_SCREENSAVERS_DIR "/screensavers/",
|
||||
saver->name, ".xml", NULL);
|
||||
doc = xmlParseFile (file_name);
|
||||
g_free (file_name);
|
||||
|
|
@ -1680,7 +1680,7 @@ arg_mapping_exists (Screensaver *saver)
|
|||
|
||||
if (!saver->name) return FALSE;
|
||||
|
||||
filename = g_strconcat (SSPROP_DATADIR "/screensavers/",
|
||||
filename = g_strconcat (GNOMECC_SCREENSAVERS_DIR "/screensavers/",
|
||||
saver->name, ".xml", NULL);
|
||||
|
||||
if (stat (filename, &buf))
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
[Desktop Entry]
|
||||
_Name=Screensaver
|
||||
_Comment=Configure the settings of the screensaver
|
||||
Exec=screensaver-properties-capplet
|
||||
Exec=screensaver-properties
|
||||
Icon=gnome-ccscreensaver.png
|
||||
Terminal=0
|
||||
Type=Application
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Screensaversdir = $(datadir)/screensavers
|
||||
Screensaversdir = $(GNOMECC_SCREENSAVERS_DIR)
|
||||
Screensavers_DATA = \
|
||||
3d_clock.xml \
|
||||
ant.xml \
|
||||
|
|
@ -16,7 +16,7 @@ Screensavers_DATA = \
|
|||
critical.xml \
|
||||
crystal.xml \
|
||||
cynosure.xml \
|
||||
decayscreen.xml \
|
||||
decayscreen.xml\
|
||||
deco.xml \
|
||||
deluxe.xml \
|
||||
demon.xml \
|
||||
|
|
@ -41,10 +41,10 @@ Screensavers_DATA = \
|
|||
hypercube.xml \
|
||||
ifs.xml \
|
||||
imsmap.xml \
|
||||
interference.xml \
|
||||
interference.xml\
|
||||
jigsaw.xml \
|
||||
julia.xml \
|
||||
kaleidescope.xml \
|
||||
kaleidescope.xml\
|
||||
kumppa.xml \
|
||||
lament.xml \
|
||||
laser.xml \
|
||||
|
|
@ -71,9 +71,9 @@ Screensavers_DATA = \
|
|||
rocks.xml \
|
||||
rorschach.xml \
|
||||
rotor.xml \
|
||||
rubiks_cube.xml \
|
||||
rubiks_cube.xml\
|
||||
sierpinski.xml \
|
||||
slidescreen.xml \
|
||||
slidescreen.xml\
|
||||
slip.xml \
|
||||
sonar.xml \
|
||||
sphere.xml \
|
||||
|
|
|
|||
|
|
@ -257,7 +257,7 @@ get_known_savers (void)
|
|||
|
||||
if (known_savers) return known_savers;
|
||||
|
||||
parent_dir = opendir (SSPROP_DATADIR "/screensavers");
|
||||
parent_dir = opendir (GNOMECC_SCREENSAVERS_DIR "/screensavers");
|
||||
if (parent_dir == NULL)
|
||||
return NULL;
|
||||
|
||||
|
|
@ -266,7 +266,7 @@ get_known_savers (void)
|
|||
while ((child_dir = readdir (parent_dir)) != NULL) {
|
||||
if (child_dir->d_name[0] != '.') {
|
||||
fullpath = g_concat_dir_and_file
|
||||
(SSPROP_DATADIR "/screensavers",
|
||||
(GNOMECC_SCREENSAVERS_DIR "/screensavers",
|
||||
child_dir->d_name);
|
||||
|
||||
if (stat (fullpath, &filedata) != -1) {
|
||||
|
|
|
|||
80
configure.in
80
configure.in
|
|
@ -77,16 +77,15 @@ echo "ftp://ftp.labs.redhat.com/pub/imlib/"
|
|||
AC_MSG_ERROR([Fatal Error: no Imlib detected.])])
|
||||
|
||||
CFLAGS="-O2 -g -Wall $CFLAGS"
|
||||
AC_SUBST(CFLAGS)
|
||||
|
||||
dnl =============================================
|
||||
dnl END : Variables for config_archiverConf.sh.in
|
||||
dnl =============================================
|
||||
|
||||
dnl ==============================================
|
||||
dnl Check for pkg-config
|
||||
dnl ==============================================
|
||||
AC_PATH_PROG(PKGCONFIG, pkg-config, no)
|
||||
if test "$PKGCONFIG" = no ; then
|
||||
AC_MSG_ERROR(pkg-config was not found. Please install version 0.8.0 or newer from http://www.freedesktop.org/software.)
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(for pkg-config >= 0.8.0)
|
||||
vers=`$PKGCONFIG --version | awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 1000 + $3}'`
|
||||
if test "$vers" -ge 8000; then
|
||||
|
|
@ -94,32 +93,47 @@ if test "$vers" -ge 8000; then
|
|||
else
|
||||
AC_MSG_ERROR(You need at least pkg-config 0.8.0 or greater for this version of control-center. Please install a newer version from http://www.freedesktop.org/software.)
|
||||
fi
|
||||
dnl ==============================================
|
||||
dnl Check for pkg-config
|
||||
dnl ==============================================
|
||||
|
||||
AC_MSG_CHECKING(for bonobo-conf >= 0.7)
|
||||
vers=`$PKGCONFIG --version | awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 1000 + $3}'`
|
||||
if test "$vers" -ge 7000; then
|
||||
AC_MSG_RESULT(found)
|
||||
else
|
||||
AC_MSG_ERROR(You need at least bonobo-conf 0.7 or greater for this version of control-center.)
|
||||
fi
|
||||
|
||||
capplet_modules="libcapplet libglade-gnome gdk_pixbuf bonobo_conf gdk_pixbuf_xlib gal $ARCHIVER_MODULE"
|
||||
|
||||
dnl ==============================================
|
||||
dnl Check that we meet the dependencies
|
||||
dnl ==============================================
|
||||
capplet_modules="libcapplet >= 1.4.0 libglade-gnome gdk_pixbuf bonobo_conf >= 0.7 gdk_pixbuf_xlib gal > 0.8 $ARCHIVER_MODULE"
|
||||
PKG_CHECK_MODULES(CAPPLET, $capplet_modules)
|
||||
dnl PKG_CHECK_MODULES(BG_CAPPLET, $capplet_modules gdk_pixbuf_xlib)
|
||||
dnl PKG_CHECK_MODULES(SCREENSAVER_CAPPLET, $capplet_modules gal)
|
||||
dnl PKG_CHECK_MODULES(ROLLBACK_CAPPLET, $capplet_modules)
|
||||
PKG_CHECK_MODULES(GNOMECC, gnomeui libglade xml gdk_pixbuf gnomecanvaspixbuf bonobo bonobox gtkhtml)
|
||||
PKG_CHECK_MODULES(RMHELPER, gnomeui gnomecanvaspixbuf)
|
||||
PKG_CHECK_MODULES(ARCHIVER, bonobo bonobo_conf xml)
|
||||
PKG_CHECK_MODULES(MONIKER, bonobo bonobo_conf xml)
|
||||
PKG_CHECK_MODULES(CONFIG_ARCHIVER, gnome xml)
|
||||
dnl ==============================================
|
||||
dnl End: Check that we meet the dependencies
|
||||
dnl ==============================================
|
||||
|
||||
|
||||
dnl ==============================================
|
||||
dnl Define the main variables
|
||||
dnl ==============================================
|
||||
GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} -I\$(top_srcdir)/intl -I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-properties\\\"\" -DGLADE_DATADIR=\"\\\"${datadir}/control-center\\\"\" -DGNOMELOCALEDIR=\"\\\"${datadir}/locale\\\"\" -I\$(top_srcdir)/capplets/common "
|
||||
GNOMECC_CAPPLETS_LIBS="${CAPPLET_LIBS} \$(top_builddir)/capplets/common/libcommon.a"
|
||||
GNOMECC_CAPPLETS_CLEANFILES="\$(desktop) \$(desktop).in"
|
||||
GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(desktop).in.in \$(desktop).in \$(desktop) \$(cappletname)-capplet.png \$(cappletname)-properties.glade"
|
||||
|
||||
AC_SUBST(GNOMECC_CAPPLETS_EXTRA_DIST)
|
||||
AC_SUBST(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
AC_SUBST(GNOMECC_CAPPLETS_CFLAGS)
|
||||
AC_SUBST(GNOMECC_CAPPLETS_LIBS)
|
||||
dnl ==============================================
|
||||
dnl End: Define the main variables
|
||||
dnl ==============================================
|
||||
|
||||
|
||||
|
||||
dnl ==============================================
|
||||
dnl Define the directories
|
||||
dnl ==============================================
|
||||
AC_DEFINE_UNQUOTED(GNOMECC_ICONS_DIR, "${prefix}/share/${PACKAGE}/icons")
|
||||
GNOMECC_ICONS_DIR=""${datadir}/${PACKAGE}/icons""
|
||||
AC_SUBST(GNOMECC_ICONS_DIR)
|
||||
|
|
@ -129,29 +143,18 @@ AC_SUBST(GNOMECC_GLADE_DIR)
|
|||
AC_DEFINE_UNQUOTED(GNOMECC_PIXMAPS_DIR, "${prefix}/share/${PACKAGE}/pixmaps")
|
||||
GNOMECC_PIXMAPS_DIR=""${datadir}/${PACKAGE}/pixmaps""
|
||||
AC_SUBST(GNOMECC_PIXMAPS_DIR)
|
||||
AC_DEFINE_UNQUOTED(GNOMECC_SCREENSAVERS_DIR, "${prefix}/share/${PACKAGE}/screensavers")
|
||||
GNOMECC_SCREENSAVERS_DIR=""${datadir}/${PACKAGE}/screensavers""
|
||||
AC_SUBST(GNOMECC_SCREENSAVERS_DIR)
|
||||
dnl ==============================================
|
||||
dnl End: Define the directories
|
||||
dnl ==============================================
|
||||
|
||||
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
|
||||
GNOMECC_CAPPLETS_CLEANFILES="\$(desktop) \$(desktop).in"
|
||||
GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(desktop).in.in \$(desktop).in \$(desktop) \$(cappletname)-capplet.png \$(cappletname)-properties.glade"
|
||||
|
||||
AC_SUBST(GNOMECC_CAPPLETS_EXTRA_DIST)
|
||||
AC_SUBST(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
dnl =======================================
|
||||
dnl Variables for config_archiverConf.sh.in
|
||||
dnl =======================================
|
||||
|
||||
|
||||
dnl consdir = $(GNOMECC_ICONS_DIR)\
|
||||
dnl icons_DATA = $(cappletname)-capplet.png\
|
||||
dnl Gladedir = $(datadir)/control-center-data\
|
||||
dnl Glade_DATA = $(cappletname)-properties.glade\
|
||||
|
||||
|
||||
dnl ==============================================
|
||||
dnl End : Macro for the common code
|
||||
dnl Macro for the common code
|
||||
dnl ==============================================
|
||||
AC_DEFUN(AC_PROG_GNOMECC_CAPPLETS,
|
||||
[
|
||||
|
|
@ -175,6 +178,10 @@ dnl End : Macro for the common code
|
|||
dnl ==============================================
|
||||
|
||||
|
||||
|
||||
dnl =======================================
|
||||
dnl Variables for config_archiverConf.sh.in
|
||||
dnl =======================================
|
||||
CONFIG_ARCHIVER_LIBDIR='-L${libdir}'
|
||||
CONFIG_ARCHIVER_LIBS="$CONFIG_ARCHIVER_LIBS -lconfig_archiver"
|
||||
CONFIG_ARCHIVER_INCLUDEDIR="$CONFIG_ARCHIVER_CFLAGS -I${includedir}"
|
||||
|
|
@ -182,6 +189,9 @@ CONFIG_ARCHIVER_INCLUDEDIR="$CONFIG_ARCHIVER_CFLAGS -I${includedir}"
|
|||
AC_SUBST(CONFIG_ARCHIVER_LIBDIR)
|
||||
AC_SUBST(CONFIG_ARCHIVER_LIBS)
|
||||
AC_SUBST(CONFIG_ARCHIVER_INCLUDEDIR)
|
||||
dnl =======================================
|
||||
dnl End: Variables for config_archiverConf.sh.in
|
||||
dnl =======================================
|
||||
|
||||
|
||||
AC_OUTPUT([
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
2001-07-18 Chema Celorio <chema@celorio.com>
|
||||
|
||||
* capplet-dir.c (get_root_capplet_dir): if the directory is not found, warn
|
||||
and exit. Don't coredump
|
||||
* main.c (main):
|
||||
|
||||
2001-07-17 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* capplet-dir.c (capplet_cancel_cb):
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ capplet_new (CappletDir *dir, gchar *desktop_path)
|
|||
entry->dir = dir;
|
||||
|
||||
if (!entry->icon)
|
||||
entry->icon = PIXMAPS_DIR "/control-center.png";
|
||||
entry->icon = GNOMECC_PIXMAPS_DIR "/control-center.png";
|
||||
|
||||
entry->pb = gdk_pixbuf_new_from_file (entry->icon);
|
||||
|
||||
|
|
@ -127,7 +127,7 @@ capplet_dir_new (CappletDir *dir, gchar *dir_path)
|
|||
entry->icon = entry->entry->icon;
|
||||
|
||||
if (!entry->icon)
|
||||
entry->icon = PIXMAPS_DIR "/control-center.png";
|
||||
entry->icon = GNOMECC_PIXMAPS_DIR "/control-center.png";
|
||||
|
||||
entry->pb = gdk_pixbuf_new_from_file (entry->icon);
|
||||
} else {
|
||||
|
|
@ -372,10 +372,14 @@ get_root_capplet_dir (void)
|
|||
static CappletDir *root_dir = NULL;
|
||||
|
||||
if (root_dir == NULL) {
|
||||
root_dir = CAPPLET_DIR (capplet_dir_new (NULL, SETTINGS_DIR));
|
||||
CappletDirEntry *entry;
|
||||
|
||||
entry = capplet_dir_new (NULL, SETTINGS_DIR);
|
||||
|
||||
if (entry)
|
||||
root_dir = CAPPLET_DIR (entry);
|
||||
if (!root_dir)
|
||||
g_error ("Could not find directory of control panels");
|
||||
g_warning ("Could not find directory of control panels [%s]", SETTINGS_DIR);
|
||||
}
|
||||
|
||||
return root_dir;
|
||||
|
|
|
|||
|
|
@ -66,9 +66,17 @@ main (int argc, char **argv)
|
|||
#endif
|
||||
|
||||
if (capplet == NULL) {
|
||||
CappletDirEntry *entry;
|
||||
CappletDir *dir;
|
||||
|
||||
gnomecc_init ();
|
||||
capplet_dir_entry_activate
|
||||
(CAPPLET_DIR_ENTRY (get_root_capplet_dir ()), NULL);
|
||||
dir = get_root_capplet_dir ();
|
||||
if (!dir)
|
||||
return -1;
|
||||
entry = CAPPLET_DIR_ENTRY (dir);
|
||||
if (!entry)
|
||||
return -1;
|
||||
capplet_dir_entry_activate (entry, NULL);
|
||||
} else {
|
||||
if ((app = capplet_control_launch (capplet, _("Configuraiton"))) == NULL)
|
||||
return -1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue