← Back to branch summary

~ubuntu-branches/ubuntu/utopic/gxine/utopic-proposed

« back to all changes in this revision

Viewing changes to src/preferences.c

  • Committer: Package Import Robot
  • Author(s): Steve Langasek
  • Date: 2014-05-07 21:34:55 UTC
  • mfrom: (2.1.17 sid)
  • Revision ID: package-import@ubuntu.com-20140507213455-qnu5diwyyj8bkaap
Tags: 0.5.907-3ubuntu1
* Merge from Debian unstable, remaining changes:
  - debian/rules, debian/control: use dh-autoreconf at build time.
  - debian/control: Add Xb-Npp-xxx, Xb-Npp-Description and Xb-Npp-File
    fields.
  - src/script_engine.c: fix a remaining memory leak issue associated with
    using JS_EncodeString(), which somehow didn't get fixed upstream
  - debian/gxineplugin.links: Add a link to xulrunner-addons/plugins
    directory.
  - mime.default: Add dvd, vcd, svcd tags.
* Dropped changes, no longer needed:
  - debian/gxine.install: no need to diverge from Debian since we no longer
    ship a wrapper
* All other changes dropped, as they have been included upstream or in
  Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/preferences.c
25
25
#include "globals.h"
26
26
 
27
27
#include <assert.h>
28
 
#include <X11/Xlib.h>
29
28
#include <gtk/gtk.h>
30
29
#include <gdk/gdk.h>
31
30
#include <gdk/gdkkeysyms.h>
475
474
 
476
475
  return get_hal_property (buf, "block.device", "storage.model")
477
476
         ? : get_hal_property (buf, "block.device", "info.product")
 
477
#ifdef HAL_DEVICE_FILE_PROPERTY
478
478
         ? : get_hal_property (buf_unprefixed, HAL_DEVICE_FILE_PROPERTY, "info.product")
 
479
#else
479
480
         /* FIXME - BSD etc. */
 
481
         ? : NULL
 
482
#endif
480
483
         ;
481
484
}
482
485
#endif /* WITH_HAL */