← Back to branch summary

~ubuntu-branches/ubuntu/precise/mutter/precise

« back to all changes in this revision

Viewing changes to src/ui/theme-parser.c

  • Committer: Bazaar Package Importer
  • Author(s): Laurent Bigonville
  • Date: 2011-08-24 14:53:37 UTC
  • mfrom: (0.9.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110824145337-ciqrupsuyrbyfg3l
Tags: 3.1.4-0ubuntu1
https://launchpad.net/bugs/828543
* New upstream release
  - Fix Adwaita window decoration (LP: #828543)
* debian/control.in: Bump libclutter-1.0-dev build-dependency to 1.7.5
* debian/patches/03_link_gles2.patch: Refreshed
* debian/libmutter0.symbols: Adjust .symbols file

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ui/theme-parser.c
38
38
 * look out for.
39
39
 */
40
40
#define THEME_MAJOR_VERSION 3
41
 
#define THEME_MINOR_VERSION 3
 
41
#define THEME_MINOR_VERSION 4
42
42
#define THEME_VERSION (1000 * THEME_MAJOR_VERSION + THEME_MINOR_VERSION)
43
43
 
44
44
#define METACITY_THEME_FILENAME_FORMAT "metacity-theme-%d.xml"
2320
2320
      const char *height;
2321
2321
      const char *filled;
2322
2322
      gboolean filled_val;
2323
 
      GtkStateType state_val;
 
2323
      GtkStateFlags state_val;
2324
2324
      GtkShadowType shadow_val;
2325
2325
      GtkArrowType arrow_val;
2326
2326
      
2410
2410
      const char *y;
2411
2411
      const char *width;
2412
2412
      const char *height;
2413
 
      GtkStateType state_val;
 
2413
      GtkStateFlags state_val;
2414
2414
      GtkShadowType shadow_val;
2415
2415
      
2416
2416
      if (!locate_attributes (context, element_name, attribute_names, attribute_values,
2478
2478
      const char *x;
2479
2479
      const char *y1;
2480
2480
      const char *y2;
2481
 
      GtkStateType state_val;
 
2481
      GtkStateFlags state_val;
2482
2482
      
2483
2483
      if (!locate_attributes (context, element_name, attribute_names, attribute_values,
2484
2484
                              error,