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

update the desktop file database on install, since we install a new mime

Browse source 
2004-12-10  James Henstridge  <james@jamesh.id.au>

    * Makefile.am (install-desktop-database): update the desktop file
    database on install, since we install a new mime action.

    * font-view.c (get_font): don't free the pattern when creating the
    font object, since XftFontOpenPattern takes ownership of the
    pattern.

    * gnome-font-viewer.desktop.in.in (Exec): use %u instead of %U,
    since we only support openning one file.
This commit is contained in:
James Henstridge 2004-12-10 09:51:25 +00:00 • committed by James Henstridge
parent a76902382e
commit 2a7bec1ecb
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
vfs-methods/fontilus/ChangeLog
View file

@ -1,3 +1,15 @@
2004-12-10 James Henstridge <james@jamesh.id.au>
* Makefile.am (install-desktop-database): update the desktop file
database on install, since we install a new mime action.
* font-view.c (get_font): don't free the pattern when creating the
font object, since XftFontOpenPattern takes ownership of the
pattern.
* gnome-font-viewer.desktop.in.in (Exec): use %u instead of %U,
since we only support openning one file.
2004-11-28 James Henstridge <james@jamesh.id.au> 2004-11-28 James Henstridge <james@jamesh.id.au>
* thumbnailer.c (main): use gnome_vfs_make_uri_from_shell_arg() to * thumbnailer.c (main): use gnome_vfs_make_uri_from_shell_arg() to

9
vfs-methods/fontilus/Makefile.am
View file

@ -38,15 +38,20 @@ desktopdir = $(datadir)/applications
desktop_in_files = gnome-font-viewer.desktop.in desktop_in_files = gnome-font-viewer.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
install-data-local: install-gconf-schemas install-desktop-database
if GCONF_SCHEMAS_INSTALL if GCONF_SCHEMAS_INSTALL
install-data-local: install-gconf-schemas:
if test -z "$(DESTDIR)"; then \ if test -z "$(DESTDIR)"; then \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule fontilus.schemas; \ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule fontilus.schemas; \
fi fi
else else
install-data-local: install-gconf-schemas:
endif endif
install-desktop-database:
update-desktop-database $(DESTDIR)$(desktopdir)
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
@INTLTOOL_DIRECTORY_RULE@ @INTLTOOL_DIRECTORY_RULE@
@INTLTOOL_SCHEMAS_RULE@ @INTLTOOL_SCHEMAS_RULE@

1
vfs-methods/fontilus/font-view.c
View file

@ -74,7 +74,6 @@ get_font(Display *xdisplay, FT_Face face, gint size, FcCharSet *charset)
XftDefaultSubstitute (xdisplay, screen, pattern); XftDefaultSubstitute (xdisplay, screen, pattern);
font = XftFontOpenPattern(xdisplay, pattern); font = XftFontOpenPattern(xdisplay, pattern);
FcPatternDestroy(pattern);
return font; return font;
} }

2
vfs-methods/fontilus/gnome-font-viewer.desktop.in.in
View file

@ -3,7 +3,7 @@ Encoding=UTF-8
_Name=GNOME Font Viewer _Name=GNOME Font Viewer
_Comment=The GNOME configuration tool _Comment=The GNOME configuration tool
Icon=gnome-settings-font Icon=gnome-settings-font
Exec=gnome-font-viewer %U Exec=gnome-font-viewer %u
Terminal=false Terminal=false
Type=Application Type=Application
StartupNotify=true StartupNotify=true