← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Tim Lunn
  • Date: 2013-05-28 09:10:46 UTC
  • mfrom: (1.6.1) (21.1.10 experimental)
  • Revision ID: package-import@ubuntu.com-20130528091046-b0oc28za9l97fgq1
Tags: 3.8.2-0ubuntu1
https://launchpad.net/bugs/1184812
* New upstream release
* Sync with Debian (LP: #1184812) 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/control.in:
    + Don't break gnome-shell << 3.7.90
    + Use source:Version for gnome-desktop3-data Depend
    + Add epoch to gnome-desktop3-data's Breaks/Replaces, as our old
      gnome-desktop source package introduced an epoch. This needs to be
      kept until after 14.04 LTS.
 - Install helper tools into a versioned directory (by overriding
   libexecdir). They could alternatively be installed in a separate package
* Dropped changes:
  - 02_refuse_to_break_GL_compositors.patch:
    + Doesn't appear to be needed any more
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
libgnome-desktop/gnome-wall-clock.h
17
17
 
18
18
   You should have received a copy of the GNU Library General Public
19
19
   License along with the Gnome Library; see the file COPYING.LIB.  If not,
20
 
   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
21
 
   Boston, MA 02111-1307, USA.
 
20
   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 
21
   Boston, MA 02110-1301, USA.
22
22
 
23
23
   Author: Colin Walters <walters@verbum.org>
24
24
*/
59
59
 
60
60
GType             gnome_wall_clock_get_type      (void);
61
61
 
 
62
GnomeWallClock *  gnome_wall_clock_new           (void);
 
63
 
62
64
const char *      gnome_wall_clock_get_clock     (GnomeWallClock *clock);
63
65
 
 
66
GTimeZone *       gnome_wall_clock_get_timezone  (GnomeWallClock *clock);
 
67
 
64
68
G_END_DECLS
65
69
 
66
70
#endif