← Back to branch summary

~noskcaj/ubuntu/trusty/xfdesktop4/git-patches

« back to all changes in this revision

Viewing changes to src/xfce-desktop-enum-types.c

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2014-01-14 11:47:53 UTC
  • mfrom: (1.5.6)
  • Revision ID: package-import@ubuntu.com-20140114114753-9mbtxyyd2jrvmkin
Tags: 4.11.2-0ubuntu1
* Merged from debian unreleased SVN. Remaining changes:
  - debian/patches/xubuntu_improve-nautilus-interactions.patch: added,
    should prevent nautilus from taking over the desktop if xfdesktop is
    running (and vice-versa).
  - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the
    user background property of Accountsservice on backdrop change.
* Drop debian/patches/xubuntu_fix-duplicate-volumes.patch, no longer needed

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xfce-desktop-enum-types.c
14
14
        static GType type = 0;
15
15
        if (type == 0) {
16
16
        static const GEnumValue values[] = {
17
 
        { XFCE_BACKDROP_IMAGE_AUTO, "XFCE_BACKDROP_IMAGE_AUTO", "auto" },
 
17
        { XFCE_BACKDROP_IMAGE_INVALID, "XFCE_BACKDROP_IMAGE_INVALID", "invalid" },
 
18
        { XFCE_BACKDROP_IMAGE_NONE, "XFCE_BACKDROP_IMAGE_NONE", "none" },
18
19
        { XFCE_BACKDROP_IMAGE_CENTERED, "XFCE_BACKDROP_IMAGE_CENTERED", "centered" },
19
20
        { XFCE_BACKDROP_IMAGE_TILED, "XFCE_BACKDROP_IMAGE_TILED", "tiled" },
20
21
        { XFCE_BACKDROP_IMAGE_STRETCHED, "XFCE_BACKDROP_IMAGE_STRETCHED", "stretched" },
21
22
        { XFCE_BACKDROP_IMAGE_SCALED, "XFCE_BACKDROP_IMAGE_SCALED", "scaled" },
22
23
        { XFCE_BACKDROP_IMAGE_ZOOMED, "XFCE_BACKDROP_IMAGE_ZOOMED", "zoomed" },
 
24
        { XFCE_BACKDROP_IMAGE_SPANNING_SCREENS, "XFCE_BACKDROP_IMAGE_SPANNING_SCREENS", "spanning-screens" },
23
25
        { 0, NULL, NULL }
24
26
        };
25
27
        type = g_enum_register_static ("XfceBackdropImageStyle", values);
32
34
        static GType type = 0;
33
35
        if (type == 0) {
34
36
        static const GEnumValue values[] = {
 
37
        { XFCE_BACKDROP_COLOR_INVALID, "XFCE_BACKDROP_COLOR_INVALID", "invalid" },
35
38
        { XFCE_BACKDROP_COLOR_SOLID, "XFCE_BACKDROP_COLOR_SOLID", "solid" },
36
39
        { XFCE_BACKDROP_COLOR_HORIZ_GRADIENT, "XFCE_BACKDROP_COLOR_HORIZ_GRADIENT", "horiz-gradient" },
37
40
        { XFCE_BACKDROP_COLOR_VERT_GRADIENT, "XFCE_BACKDROP_COLOR_VERT_GRADIENT", "vert-gradient" },
42
45
  }
43
46
        return type;
44
47
}
 
48
GType
 
49
xfce_backdrop_cycle_period_get_type (void)
 
50
{
 
51
        static GType type = 0;
 
52
        if (type == 0) {
 
53
        static const GEnumValue values[] = {
 
54
        { XFCE_BACKDROP_PERIOD_INVALID, "XFCE_BACKDROP_PERIOD_INVALID", "invalid" },
 
55
        { XFCE_BACKDROP_PERIOD_SECONDS, "XFCE_BACKDROP_PERIOD_SECONDS", "seconds" },
 
56
        { XFCE_BACKDROP_PERIOD_MINUES, "XFCE_BACKDROP_PERIOD_MINUES", "minues" },
 
57
        { XFCE_BACKDROP_PERIOD_HOURS, "XFCE_BACKDROP_PERIOD_HOURS", "hours" },
 
58
        { XFCE_BACKDROP_PERIOD_STARTUP, "XFCE_BACKDROP_PERIOD_STARTUP", "startup" },
 
59
        { XFCE_BACKDROP_PERIOD_HOURLY, "XFCE_BACKDROP_PERIOD_HOURLY", "hourly" },
 
60
        { XFCE_BACKDROP_PERIOD_DAILY, "XFCE_BACKDROP_PERIOD_DAILY", "daily" },
 
61
        { XFCE_BACKDROP_PERIOD_CHRONOLOGICAL, "XFCE_BACKDROP_PERIOD_CHRONOLOGICAL", "chronological" },
 
62
        { 0, NULL, NULL }
 
63
        };
 
64
        type = g_enum_register_static ("XfceBackdropCyclePeriod", values);
 
65
  }
 
66
        return type;
 
67
}
45
68
 
46
69
/* enumerations from "xfce-desktop.h" */
47
70
GType