diff options
Diffstat (limited to 'src/service-discovery-applet.in')
| -rwxr-xr-x | src/service-discovery-applet.in | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in index 7bf7eb0..449a328 100755 --- a/src/service-discovery-applet.in +++ b/src/service-discovery-applet.in @@ -57,28 +57,6 @@ except ImportError, e: ############################################################################### # -# SERVICES THAT WILL BE ADDED TO GCONF ON THE FIRST RUN -# -# default browsing value -try: - first_run_services = {} - for (stype, desc) in avahi.ServiceTypeDatabase.ServiceTypeDatabase().items(): - first_run_services[stype] = False - - first_run_services["_http._tcp"] = True - first_run_services["_https._tcp"] = True - first_run_services["_ssh._tcp"] = True - first_run_services["_sftp-ssh._tcp"] = True - first_run_services["_ftp._tcp"] = True - first_run_services["_webdav._tcp"] = True - first_run_services["_webdavs._tcp"] = True -except: - error_msg(_("You need at least avahi 0.6.9")) - sys.exit() - - -############################################################################### -# # ServiceTypeDatabase # class ServiceTypeDatabase: @@ -113,12 +91,19 @@ class SDAGconf: self.gc_client.notify_add (self.gc_services, self.gc_services_cb) self.gc_client.notify_add (self.gc_options, self.gc_options_cb) + self.plugin = sdapplet.pluginloader.PluginLoader("@pluginsdir@") - # init first run browsing services - if self.gc_client.get_bool ("%s/%s" % (self.gc_options,"first_run")): - self.gc_client.set_bool("%s/%s" % (self.gc_options, "first_run"), False) - for service_type, enabled in first_run_services.iteritems(): - self.gc_client.set_bool("%s/%s" % (self.gc_services, service_type), enabled) + try: + for (stype, desc) in avahi.ServiceTypeDatabase.ServiceTypeDatabase().items(): + if not self.gc_client.get("%s/%s" % (self.gc_services, stype)): + if self.plugin.plugins.has_key(stype): + enabled = True + else: + enabled = False + self.gc_client.set_bool("%s/%s" % (self.gc_services, stype), enabled) + except: + error_msg(_("You need at least avahi 0.6.9")) + sys.exit() def get_services(self): services = [] |