Commit ba61d583 authored by Philippe Rouquier's avatar Philippe Rouquier

Update icons to use hicolor

parent 76242561
2006-09-18 Philippe Rouquier <bonfire-app@wanadoo.fr>
* configure.in:
* data/Makefile.am:
* src/main.c: (brasero_app_create_app):
* src/utils.c: (brasero_utils_init):
Update icons to use hicolor
2006-09-18 Philippe Rouquier <bonfire-app@wanadoo.fr>
* data/Makefile.am:
......
......@@ -220,6 +220,10 @@ AC_OUTPUT([
Makefile
docs/Makefile
data/Makefile
data/icons/Makefile
data/icons/16x16/Makefile
data/icons/24x24/Makefile
data/icons/scalable/Makefile
po/Makefile.in
src/Makefile
])
......
SUBDIRS = icons
@INTLTOOL_SCHEMAS_RULE@
schemasdir = @GCONF_SCHEMA_FILE_DIR@
......@@ -19,9 +21,7 @@ mime_DATA = brasero.xml
IMAGES= logo.png \
icon-final-128x128.png \
icon-final-256x256.png \
icon-final-48x48.png \
brasero.png \
disc-00.png \
disc-05.png \
disc-100.png \
......@@ -54,16 +54,6 @@ EXTRA_DIST = $(desktop_in_files)\
braserodistpixdir = $(datadir)/brasero/
braserodistpix_DATA = $(IMAGES)
distpixmapdir = $(datadir)/pixmaps
distpixmap_DATA = brasero.png
mimeicondir = $(datadir)/icons/hicolor/48x48/mimetypes
mimeicon_DATA = gnome-mime-application-x-brasero.png
## Update mime only when system wide installation takes place (taken from anjuta)
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
UPDATE_MIME = \
if [ -f $(DESTDIR)$(datadir)/mime/packages/freedesktop.org.xml ] ; then \
if which update-mime-database>/dev/null 2>&1; then \
......@@ -76,15 +66,6 @@ UPDATE_DESKTOP = \
update-desktop-database; \
fi
UPDATE_ICONS = \
if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
$(gtk_update_icon_cache); \
else \
echo "*** Icon cache not updated. After install, run this:"; \
echo "*** $(gtk_update_icon_cache)"; \
fi
if GCONF_SCHEMAS_INSTALL
# don't do this if we are building in eg. rpm
install-data-local: $(schemas_DATA)
......@@ -101,7 +82,6 @@ install-data-hook:
if UPDATE_CACHES
$(UPDATE_MIME)
$(UPDATE_DESKTOP)
$(UPDATE_ICON)
else
@true
endif
......@@ -110,7 +90,6 @@ uninstall-hook:
if UPDATE_CACHES
$(UPDATE_MIME)
$(UPDATE_DESKTOP)
$(UPDATE_ICON)
else
@true
endif
......@@ -327,10 +327,10 @@ brasero_app_create_app (void)
app = g_new0 (BraseroApp, 1);
app->mainwin = gnome_app_new ("Brasero", NULL);
gtk_window_set_default_icon_from_file (BRASERO_DATADIR G_DIR_SEPARATOR_S "icon-final-48x48.png",
gtk_window_set_default_icon_from_file (BRASERO_DATADIR G_DIR_SEPARATOR_S "brasero.png",
NULL);
gtk_window_set_icon_from_file (GTK_WINDOW (app->mainwin),
BRASERO_DATADIR G_DIR_SEPARATOR_S "icon-final-48x48.png",
BRASERO_DATADIR G_DIR_SEPARATOR_S "brasero.png",
NULL);
g_signal_connect (G_OBJECT (app->mainwin), "delete-event",
......
......@@ -129,7 +129,7 @@ brasero_utils_init (void)
brasero_utils_register_icon (factory,
BRASERO_STOCK_ICON,
BRASERO_DATADIR G_DIR_SEPARATOR_S "icon-final-48x48.png",
BRASERO_DATADIR G_DIR_SEPARATOR_S "brasero.png",
FROM_FILE,
0);
brasero_utils_register_icon (factory,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment