~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to gnome-panel/panel-background.h

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher, Sebastien Bacher, Jeremy Bicha
  • Date: 2011-05-30 11:04:49 UTC
  • mfrom: (1.13.10 upstream) (2.2.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20110530110449-hinl17kxkcefjw6x
Tags: 1:3.0.2-0ubuntu1
[ Sebastien Bacher ]
* New upstream version
* debian/control.in:
  - the new libgweather version is in oneiric, use it
  - drop the python and python-gconf depends, 
    they were added for gnome-panel-add which is still using gconf and buggy
* debian/gnome-panel-data.install:
  - don't install the apport hook, it's only getting gconf datas which 
    doesn't work since gnome-panel uses gsettings
* debian/patches/90_build_fixes.patch:
  - restore build fix from git not applied in the new serie
* debian/patches/01_panel_submenus.patch:
  - don't take that Debian diff, the .menus use the upstream naming in Ubuntu
* debian/patches/06_no_resize_grip.patch:
  - dropped, the issue is fixed in the new version
* debian/patches/50_fix-potfiles.patch:
  - dropped, the issue is fixed in the new version
* debian/watch:
  - track unstable series as well

Drop those delta, since gnome-panel is not the default Ubuntu session now we
can go back to an experience closer to the upstream one: 
* debian/control.in:
  - drop the indicators recommends, unity-2d is the ubuntu fallback session
    so we can get back to use an upstream config for gnome-panel and reduce
    the delta we carry
* debian/patches/04_default_panel_config.patch:
  - don't modify the upstream layout
* debian/patches/05_no_session_delay.patch:
  - no need to tweak the upstream session to optimize it
* debian/patches/16_compiz_workspace_switcher.patch:
  - go back to the upstream switcher behaviour    
* debian/patches/25_dynamic_fusa_detection.patch:
  - not needed since we use the upstream layout, could be ported if someone
    is wanting to do the work though
* debian/patches/30_disable-initial-animation.patch, debian/rules:
  - drop the --disable-initial-animation, that was some login optimization
    but since it's not the default desktop you should go back to the 
    upstream behaviour

[ Jeremy Bicha ]   
* New upstream version
* Merge from Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Recommends gnome-settings-daemon which has the timezone polkit service
* debian/rules:
  - Update translations template.
* debian/gnome-panel-data.install:
  - Install apport hook
  - Install the "About Ubuntu" menu item.
* debian/patches/01_layout.patch:
  - Disabled, Help & About Ubuntu don't fit as well in Gnome Panel 3
* debian/patches/01_panel_submenus.patch.
  - Dropped
* debian/patches/03_dnd_places_link.patch:
  - Disabled, when using Drag'n'Drop from Places menu, install a link launcher
    (.desktop file) instead of copying the entire directory.
* debian/patches/17_about-ubuntu-translation.patch:
  - List ubuntu-about.desktop for translation.
* debian/patches/40_unset_menuproxy.patch:
  - Make sure gnome-panel and the applets don't pick up menu proxies.
* debian/patches/50_fix-potfiles.patch
  - Fix i18n
* debian/patches/85_disable_shutdown_on_ltsp.patch:
  - Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* debian/patches/71_change_bookmark_submenu_limit_value.patch
  - Dropped, picked up by Debian
* debian/patches/18_lockdown_lock_editor.patch:
* debian/patches/90_git_wnck_show_realize.patch:
* debian/patches/90_fix_linking_DSO_link.patch:
* debian/patches/91_gir_annotations.patch
* debian/patches/92_git_calendar_day.patch
* debian/patches/92_git_fix_applets_in_multiscreen.patch:
  - Dropped, applied upstream
* debian/watch:
  - watch unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
39
39
                                 gpointer         user_data);
40
40
 
41
41
struct _PanelBackground {
 
42
        GSettings              *settings;
 
43
 
42
44
        PanelBackgroundType     type;
43
45
 
44
46
        PanelBackgroundChangedNotify notify_changed;
45
47
        gpointer                user_data;
46
48
 
47
 
        PanelColor              color;
 
49
        GdkRGBA                 color;
48
50
        char                   *image;
49
51
        GdkPixbuf              *loaded_image; 
50
52
 
51
53
        GtkOrientation          orientation;
52
54
        GdkRectangle            region;
53
 
        GdkPixbuf              *transformed_image;
54
 
        GdkPixbuf              *composited_image;
 
55
        GdkPixbuf              *transformed_image;
 
56
        cairo_pattern_t        *composited_pattern;
55
57
 
56
58
        PanelBackgroundMonitor *monitor;
57
59
        GdkPixbuf              *desktop;
58
60
        gulong                  monitor_signal;
59
61
 
60
 
        GdkPixmap              *pixmap;
61
62
        GdkWindow              *window;
62
 
        GdkColormap            *colormap;
63
 
        GdkGC                  *gc;
64
 
 
65
 
        GdkPixmap              *default_pixmap;
66
 
        GdkColor                default_color;
67
 
 
68
 
        guint                   fit_image : 1;
69
 
        guint                   stretch_image : 1;
 
63
 
 
64
        cairo_pattern_t        *default_pattern;
 
65
        GdkRGBA                 default_color;
 
66
 
 
67
        PanelBackgroundImageStyle style_image;
70
68
        guint                   rotate_image : 1;
71
69
 
72
70
        guint                   has_alpha : 1;
74
72
        guint                   loaded : 1;
75
73
        guint                   transformed : 1;
76
74
        guint                   composited : 1;
77
 
        guint                   prepared : 1;
78
75
};
79
76
 
80
77
void  panel_background_init              (PanelBackground     *background,
81
78
                                          PanelBackgroundChangedNotify notify_changed,
82
79
                                          gpointer             user_data);
 
80
void  panel_background_settings_init     (PanelBackground     *background,
 
81
                                          GSettings           *settings);
83
82
void  panel_background_free              (PanelBackground     *background);
84
 
void  panel_background_set               (PanelBackground     *background,
85
 
                                          PanelBackgroundType  type,
86
 
                                          PanelColor          *color,
87
 
                                          const char          *image,
88
 
                                          gboolean             fit_image,
89
 
                                          gboolean             stretch_image,
90
 
                                          gboolean             rotate_image); 
91
 
void  panel_background_set_type          (PanelBackground     *background,
92
 
                                          PanelBackgroundType  type);
93
 
void  panel_background_set_gdk_color     (PanelBackground     *background,
94
 
                                          GdkColor            *gdk_color);
95
 
void  panel_background_set_opacity       (PanelBackground     *background,
96
 
                                          guint16              opacity);
97
 
void  panel_background_set_color         (PanelBackground     *background,
98
 
                                          PanelColor          *color);
99
 
void  panel_background_set_image         (PanelBackground     *background,
100
 
                                          const char          *image);
101
 
void  panel_background_set_fit           (PanelBackground     *background,
102
 
                                          gboolean             fit_image);
103
 
void  panel_background_set_stretch       (PanelBackground     *background,
104
 
                                          gboolean             stretch_image);
105
 
void  panel_background_set_rotate        (PanelBackground     *background,
106
 
                                          gboolean             rotate_image);
 
83
 
107
84
void  panel_background_set_default_style (PanelBackground     *background,
108
 
                                          GdkColor            *color,
109
 
                                          GdkPixmap           *pixmap);
 
85
                                          GdkRGBA             *color,
 
86
                                          cairo_pattern_t     *pattern);
110
87
void  panel_background_realized          (PanelBackground     *background,
111
88
                                          GdkWindow           *window);
112
89
void  panel_background_unrealized        (PanelBackground     *background);
121
98
                                          int                  y);
122
99
 
123
100
PanelBackgroundType  panel_background_get_type   (PanelBackground *background);
124
 
const PanelColor    *panel_background_get_color  (PanelBackground *background);
125
 
const GdkPixmap     *panel_background_get_pixmap (PanelBackground *background);
 
101
const GdkRGBA       *panel_background_get_color  (PanelBackground *background);
126
102
 
127
103
PanelBackgroundType
128
104
      panel_background_effective_type    (PanelBackground     *background);