Commit 0485887c authored by Vincent Untz's avatar Vincent Untz Committed by Vincent Untz
Browse files

remove panel-default-setup.entries from here kill add back, without

2006-01-22  Vincent Untz  <vuntz@gnome.org>

	* .cvsignore: remove panel-default-setup.entries from here
	* panel-default-setup.entries.in: kill
	* panel-default-setup.entries: add back, without DATADIR
	* Makefile.am: remove all the stuff related to the generation of
	panel-default-setup.entries
	* launcher.c: (create_launcher): look in the XDG data dirs if the
	.desktop file exists, so we can use epiphany.desktop without telling
	the panel the whole path.
parent b8a007ad
......@@ -20,7 +20,6 @@ panel-typebuiltins.h
gnome-panel-preferences.desktop
gnome-panel-screenshot.desktop
stamp-panel-marshal.h
panel-default-setup.entries
panel-marshal.c
panel-marshal.h
*.schemas
......
2006-01-22 Vincent Untz <vuntz@gnome.org>
* .cvsignore: remove panel-default-setup.entries from here
* panel-default-setup.entries.in: kill
* panel-default-setup.entries: add back, without DATADIR
* Makefile.am: remove all the stuff related to the generation of
panel-default-setup.entries
* launcher.c: (create_launcher): look in the XDG data dirs if the
.desktop file exists, so we can use epiphany.desktop without telling
the panel the whole path.
2006-01-22 Vincent Untz <vuntz@gnome.org>
 
* panel-menu-items.c: (panel_desktop_menu_item_append_menu): don't add
......
......@@ -211,7 +211,7 @@ EXTRA_DIST = \
panel-marshal.list \
update-from-egg.sh \
gnome-panelrc \
panel-default-setup.entries.in
panel-default-setup.entries
@INTLTOOL_DESKTOP_RULE@
......@@ -266,11 +266,7 @@ rc_DATA = gnome-panelrc
@INTLTOOL_SERVER_RULE@
entriesdir = $(GCONF_SCHEMA_FILE_DIR)
entries_in_files = panel-default-setup.entries.in
entries_DATA = $(entries_in_files:.entries.in=.entries)
%.entries: %.entries.in
sed -e "s|\@DATADIR\@|$(datadir)|" $< > $@
entries_DATA = panel-default-setup.entries
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = \
......@@ -284,7 +280,7 @@ schemas_DATA = panel-compatibility.schemas $(schemas_in_files:.schemas.in=.s
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
install-data-local: $(entries_in_files:.entries.in=.entries)
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schemas_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnome-panel/$$p ; \
......
......@@ -479,12 +479,29 @@ create_launcher (const char *location)
return NULL;
}
ditem = NULL;
if (!strchr (location, G_DIR_SEPARATOR)) {
/* try to first load a file in our config directory, and if it
* doesn't exist there, try to find it in the xdg data dirs */
char *path;
path = panel_make_full_path (NULL, location);
ditem = gnome_desktop_item_new_from_file (path, 0, &error);
g_free (path);
if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
char *buffer;
g_free (path);
buffer = g_strconcat ("applications/", location, NULL);
path = panel_lookup_in_data_dirs (buffer);
g_free (buffer);
}
if (path) {
ditem = gnome_desktop_item_new_from_file (path, 0,
&error);
g_free (path);
}
} else
ditem = gnome_desktop_item_new_from_uri (location, 0, &error);
......
......@@ -252,7 +252,7 @@
<key>objects/browser_launcher/launcher_location</key>
<schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
<value>
<string>@DATADIR@/applications/epiphany.desktop</string>
<string>epiphany.desktop</string>
</value>
</entry>
......@@ -306,7 +306,7 @@
<key>objects/email_launcher/launcher_location</key>
<schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
<value>
<string>@DATADIR@/applications/evolution.desktop</string>
<string>evolution.desktop</string>
</value>
</entry>
......
Supports Markdown
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