← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gnome-desktop3/vivid

« back to all changes in this revision

Viewing changes to libgnome-desktop/gnome-wall-clock.h

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2014-10-31 07:46:09 UTC
  • mfrom: (1.6.5) (32.1.1 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20141031074609-gb280wdsxsgldc91
Tags: 3.14.1-1ubuntu1
* Merge with Debian, Remaining changes:
  - debian/patches:
    + 04_compute_average_color.patch: Compute the avergage color in
      gnome-desktop itself, not in unity to fix some races (LP #963140)
    + tweak_color_computation.patch, Patch from Gord, no patch header,
      no bug link.
    + git_revert_draw_background.patch
    + ubuntu_language.patch, Ported relevant bits from g-c-c 
      52_region_language.patch, as required for gnome 3.8 region panel
    + ubuntu_language_list_from_SUPPORTED.patch,
      adds api to get list of available languages from SUPPORTED file.
      To be used by gnome 3.8 region panel language installation.
  - debian/libgnome-desktop-3-10.symbols:
    + Add symbols included in Ubuntu patches
  - debian/control.in:
    + Mark gnome-desktop3-data Multi-Arch: foreign

Show diffs side-by-side

added added

removed removed

Lines of Context:
libgnome-desktop/gnome-wall-clock.h
31
31
#endif
32
32
 
33
33
#include <gio/gio.h>
 
34
#include <gdesktop-enums.h>
34
35
 
35
36
G_BEGIN_DECLS
36
37
 
65
66
 
66
67
GTimeZone *       gnome_wall_clock_get_timezone  (GnomeWallClock *clock);
67
68
 
 
69
char *            gnome_wall_clock_string_for_datetime (GnomeWallClock      *self,
 
70
                                                        GDateTime           *now,
 
71
                                                        GDesktopClockFormat  clock_format,
 
72
                                                        gboolean             show_weekday,
 
73
                                                        gboolean             show_full_date,
 
74
                                                        gboolean             show_seconds);
 
75
 
68
76
G_END_DECLS
69
77
 
70
78
#endif