diff options
| author | Danny Kukawka <danny.kukawka@web.de> | 2009-07-24 09:50:12 +0200 |
|---|---|---|
| committer | Danny Kukawka <danny.kukawka@web.de> | 2009-07-24 09:50:12 +0200 |
| commit | a5bb489c0b91242cda4e6d691600023b5e0d1838 (patch) | |
| tree | 4c63459a4aca279c3132d2d93627208da23b4365 | |
| parent | ebde6620515a64af75a05b280ceedf943e235917 (diff) | |
replace another deprecated g_basename() with g_path_get_basename()
Replaced deprecated g_basename() with g_path_get_basename().
| -rw-r--r-- | hald/hald_dbus.c | 7 | ||||
| -rw-r--r-- | tools/hal-disable-polling.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c index 268b3cc7..17009307 100644 --- a/hald/hald_dbus.c +++ b/hald/hald_dbus.c @@ -4269,9 +4269,12 @@ hald_exec_method (HalDevice *d, CICallerInfo *ci, DBusConnection *connection, db /* caller may, or may not, be in a session.. if he is, export the session he belongs to... */ ck_session_path = ci_tracker_caller_get_ck_session_path (ci); if (ck_session_path != NULL) { - sprintf (ck_session_path_export, "HAL_METHOD_INVOKED_BY_SESSION=%s", - g_basename (ck_session_path)); + char * basename; + + basename = g_path_get_basename (ck_session_path); + sprintf (ck_session_path_export, "HAL_METHOD_INVOKED_BY_SESSION=%s", basename); extra_env[n++] = ck_session_path_export; + g_free (basename); } #endif /* HAVE_CONKIT */ } diff --git a/tools/hal-disable-polling.c b/tools/hal-disable-polling.c index 83c770aa..4aea90cd 100644 --- a/tools/hal-disable-polling.c +++ b/tools/hal-disable-polling.c @@ -86,6 +86,7 @@ main (int argc, char *argv[]) LibHalContext *hal_ctx; FILE *f; char *filename; + char *basename; if (argc <= 1) { usage (argc, argv); @@ -234,8 +235,11 @@ main (int argc, char *argv[]) return 1; } + + basename = g_path_get_basename (udi); filename = g_strdup_printf (PACKAGE_SYSCONF_DIR "/hal/fdi/information/media-check-disable-%s.fdi", - g_basename (udi)); + basename); + g_free (basename); if (enable_polling) { if (libhal_device_get_property_bool (hal_ctx, udi, "storage.media_check_enabled", NULL)) { |