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

« back to all changes in this revision

Viewing changes to gnome-panel/panel-applet-frame.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:
51
51
        void     (*sync_menu_state)       (PanelAppletFrame    *frame,
52
52
                                           gboolean             movable,
53
53
                                           gboolean             removable,
54
 
                                           gboolean             lockable,
55
 
                                           gboolean             locked,
56
54
                                           gboolean             locked_down);
57
55
 
58
56
        void     (*popup_menu)            (PanelAppletFrame    *frame,
59
57
                                           guint                button,
60
58
                                           guint32              timestamp);
61
59
 
 
60
        void     (*popup_edit_menu)       (PanelAppletFrame    *frame,
 
61
                                           guint                button,
 
62
                                           guint32              timestamp);
 
63
 
62
64
        void     (*change_orientation)    (PanelAppletFrame    *frame,
63
65
                                           PanelOrientation     orientation);
64
66
 
78
80
GType panel_applet_frame_get_type           (void) G_GNUC_CONST;
79
81
 
80
82
void  panel_applet_frame_create             (PanelToplevel       *toplevel,
81
 
                                             int                  position,
 
83
                                             PanelObjectPackType  pack_type,
 
84
                                             int                  pack_index,
82
85
                                             const char          *iid);
83
86
 
84
 
void  panel_applet_frame_load_from_gconf    (PanelWidget         *panel_widget,
85
 
                                             gboolean             locked,
86
 
                                             int                  position,
87
 
                                             const char          *id);
88
 
 
89
 
void  panel_applet_frame_sync_menu_state    (PanelAppletFrame    *frame);
 
87
void  panel_applet_frame_load               (PanelWidget         *panel_widget,
 
88
                                             const char          *id,
 
89
                                             GSettings           *settings);
90
90
 
91
91
void  panel_applet_frame_change_orientation (PanelAppletFrame    *frame,
92
92
                                             PanelOrientation     orientation);
108
108
GdkScreen        *panel_applet_frame_activating_get_screen      (PanelAppletFrameActivating *frame_act);
109
109
PanelOrientation  panel_applet_frame_activating_get_orientation (PanelAppletFrameActivating *frame_act);
110
110
guint32           panel_applet_frame_activating_get_size        (PanelAppletFrameActivating *frame_act);
111
 
gboolean          panel_applet_frame_activating_get_locked      (PanelAppletFrameActivating *frame_act);
112
111
gboolean          panel_applet_frame_activating_get_locked_down (PanelAppletFrameActivating *frame_act);
 
112
gchar            *panel_applet_frame_activating_get_settings_path (PanelAppletFrameActivating *frame_act);
113
113
gchar            *panel_applet_frame_activating_get_conf_path   (PanelAppletFrameActivating *frame_act);
114
114
 
115
115
void  _panel_applet_frame_set_iid               (PanelAppletFrame           *frame,
136
136
 
137
137
void  _panel_applet_frame_applet_remove         (PanelAppletFrame *frame);
138
138
void  _panel_applet_frame_applet_move           (PanelAppletFrame *frame);
139
 
void  _panel_applet_frame_applet_lock           (PanelAppletFrame *frame,
140
 
                                                 gboolean          locked);
141
 
 
142
 
const gchar * panel_applet_frame_get_iid (PanelAppletFrame * frame);
143
139
 
144
140
G_END_DECLS
145
141