diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2014-04-29 18:25:09 +0200 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2014-04-30 11:08:26 +0200 |
| commit | 39b4fc320b2a4ef6cfd36f7e2f74cc2cfcf60e9d (patch) | |
| tree | dfb95b067d44ff965872ed28caef2843624e1eac /data | |
| parent | a66b363c0b1993a7594f6d19f63ddf895a481bcc (diff) | |
| download | nautilus-39b4fc320b2a4ef6cfd36f7e2f74cc2cfcf60e9d.tar.gz | |
search-provider: don't own a separate bus name
This is not needed anymore, now what we're fully dbus activatable.
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 6 | ||||
| -rw-r--r-- | data/nautilus-search-provider.ini | 2 | ||||
| -rw-r--r-- | data/org.gnome.Nautilus.SearchProvider.service.in | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index cf71ffa85..d1e1f22e1 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -31,8 +31,7 @@ servicedir = $(datadir)/dbus-1/services service_DATA = $(service_in_files:.service.in=.service) service_in_files = \ org.freedesktop.FileManager1.service.in \ - org.gnome.Nautilus.service.in \ - org.gnome.Nautilus.SearchProvider.service.in + org.gnome.Nautilus.service.in org.gnome.Nautilus.service: org.gnome.Nautilus.service.in Makefile $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@ @@ -40,9 +39,6 @@ org.gnome.Nautilus.service: org.gnome.Nautilus.service.in Makefile org.freedesktop.FileManager1.service: org.freedesktop.FileManager1.service.in Makefile $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@ -org.gnome.Nautilus.SearchProvider.service: org.gnome.Nautilus.SearchProvider.service.in Makefile - $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@ - searchproviderdir = $(datadir)/gnome-shell/search-providers searchprovider_DATA = nautilus-search-provider.ini diff --git a/data/nautilus-search-provider.ini b/data/nautilus-search-provider.ini index 2ff7e3a92..20b6d1240 100644 --- a/data/nautilus-search-provider.ini +++ b/data/nautilus-search-provider.ini @@ -1,5 +1,5 @@ [Shell Search Provider] DesktopId=org.gnome.Nautilus.desktop -BusName=org.gnome.Nautilus.SearchProvider +BusName=org.gnome.Nautilus ObjectPath=/org/gnome/Nautilus/SearchProvider Version=2 diff --git a/data/org.gnome.Nautilus.SearchProvider.service.in b/data/org.gnome.Nautilus.SearchProvider.service.in index 1d10ad2ce..48fe6fce2 100644 --- a/data/org.gnome.Nautilus.SearchProvider.service.in +++ b/data/org.gnome.Nautilus.SearchProvider.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.gnome.Nautilus.SearchProvider +Name=org.gnome.Nautilus Exec=@bindir@/nautilus --gapplication-service |