← Back to branch summary

~ubuntu-branches/ubuntu/trusty/sensors-applet/trusty

« back to all changes in this revision

Viewing changes to sensors-applet/sensors-applet-plugins.c

  • Committer: Bazaar Package Importer
  • Author(s): Nanley Chery
  • Date: 2010-05-22 22:25:13 UTC
  • mfrom: (1.1.13 upstream) (3.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100522222513-1cg5k0n5hv337u4u
Tags: 2.2.5-4ubuntu1
https://launchpad.net/bugs/380669
https://launchpad.net/bugs/249955
* Merge from debian testing (LP: #380669, #249955). Remaining changes:
  - debian/rules:
    + Enable nvidia compilation flag.
  - debian/control:
    + Build-depend on nvidia-settings and update description accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sensors-applet/sensors-applet-plugins.c
44
44
                                SensorsAppletPluginName name_fn;
45
45
                                SensorsAppletPluginInit init_fn;
46
46
                                SensorsAppletPluginGetSensorValue get_value_fn;
47
 
                                
48
 
                                
 
47
 
49
48
                                plugin_file = g_strdup_printf("%s/%s", path, file);
 
49
                                g_debug("found %s in plugin directory", plugin_file);
50
50
                                if ((handle = dlopen(plugin_file, RTLD_NOW)) != NULL) {
51
51
                                        
52
52
                                        if ((name_fn = dlsym(handle, "sensors_applet_plugin_name")) != NULL &&
103
103
                                                        g_debug("error closing plugin file %s", plugin_file);
104
104
                                                }
105
105
                                        }
 
106
                                } else {
 
107
                                        g_debug("Could not dlopen: %s: %s", plugin_file, dlerror());
106
108
                                }
107
109
                                g_free(plugin_file);
108
110
                        }