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

« back to all changes in this revision

Viewing changes to .pc/92_git_fix_applets_in_multiscreen.patch/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:
1
 
/*
2
 
 * panel-applet-frame.h: panel side container for applets
3
 
 *
4
 
 * Copyright (C) 2001 - 2003 Sun Microsystems, Inc.
5
 
 *
6
 
 * This program is free software; you can redistribute it and/or
7
 
 * modify it under the terms of the GNU General Public License as
8
 
 * published by the Free Software Foundation; either version 2 of the
9
 
 * License, or (at your option) any later version.
10
 
 *
11
 
 * This program is distributed in the hope that it will be useful, but
12
 
 * WITHOUT ANY WARRANTY; without even the implied warranty of
13
 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
 
 * General Public License for more details.
15
 
 *
16
 
 * You should have received a copy of the GNU General Public License
17
 
 * along with this program; if not, write to the Free Software
18
 
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
19
 
 * 02111-1307, USA.
20
 
 *
21
 
 * Authors:
22
 
 *      Mark McLoughlin <mark@skynet.ie>
23
 
 */
24
 
 
25
 
#ifndef __PANEL_APPLET_FRAME_H__
26
 
#define __PANEL_APPLET_FRAME_H__
27
 
 
28
 
#include <gtk/gtk.h>
29
 
 
30
 
#include "panel-widget.h"
31
 
#include "applet.h"
32
 
 
33
 
G_BEGIN_DECLS
34
 
 
35
 
#define PANEL_TYPE_APPLET_FRAME         (panel_applet_frame_get_type ())
36
 
#define PANEL_APPLET_FRAME(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_TYPE_APPLET_FRAME, PanelAppletFrame))
37
 
#define PANEL_APPLET_FRAME_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), PANEL_TYPE_APPLET_FRAME, PanelAppletFrameClass))
38
 
#define PANEL_IS_APPLET_FRAME(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), PANEL_TYPE_APPLET_FRAME))
39
 
#define PANEL_IS_APPLET_FRAME_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), PANEL_TYPE_APPLET_FRAME))
40
 
#define PANEL_APPLET_FRAME_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PANEL_TYPE_APPLET_FRAME, PanelAppletFrameClass))
41
 
 
42
 
typedef struct _PanelAppletFrame        PanelAppletFrame;
43
 
typedef struct _PanelAppletFrameClass   PanelAppletFrameClass;
44
 
typedef struct _PanelAppletFramePrivate PanelAppletFramePrivate;
45
 
 
46
 
struct _PanelAppletFrameClass {
47
 
        GtkEventBoxClass parent_class;
48
 
 
49
 
        void     (*init_properties)       (PanelAppletFrame    *frame);
50
 
 
51
 
        void     (*sync_menu_state)       (PanelAppletFrame    *frame,
52
 
                                           gboolean             movable,
53
 
                                           gboolean             removable,
54
 
                                           gboolean             lockable,
55
 
                                           gboolean             locked,
56
 
                                           gboolean             locked_down);
57
 
 
58
 
        void     (*popup_menu)            (PanelAppletFrame    *frame,
59
 
                                           guint                button,
60
 
                                           guint32              timestamp);
61
 
 
62
 
        void     (*change_orientation)    (PanelAppletFrame    *frame,
63
 
                                           PanelOrientation     orientation);
64
 
 
65
 
        void     (*change_size)           (PanelAppletFrame    *frame,
66
 
                                           guint                size);
67
 
 
68
 
        void     (*change_background)     (PanelAppletFrame    *frame,
69
 
                                           PanelBackgroundType  type);
70
 
};
71
 
 
72
 
struct _PanelAppletFrame {
73
 
        GtkEventBox parent;
74
 
 
75
 
        PanelAppletFramePrivate  *priv;
76
 
};
77
 
 
78
 
GType panel_applet_frame_get_type           (void) G_GNUC_CONST;
79
 
 
80
 
void  panel_applet_frame_create             (PanelToplevel       *toplevel,
81
 
                                             int                  position,
82
 
                                             const char          *iid);
83
 
 
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);
90
 
 
91
 
void  panel_applet_frame_change_orientation (PanelAppletFrame    *frame,
92
 
                                             PanelOrientation     orientation);
93
 
 
94
 
void  panel_applet_frame_change_size        (PanelAppletFrame    *frame,
95
 
                                             guint                size);
96
 
 
97
 
void  panel_applet_frame_change_background  (PanelAppletFrame    *frame,
98
 
                                             PanelBackgroundType  type);
99
 
 
100
 
void  panel_applet_frame_set_panel          (PanelAppletFrame    *frame,
101
 
                                             PanelWidget         *panel);
102
 
 
103
 
 
104
 
/* For module implementations only */
105
 
 
106
 
typedef struct _PanelAppletFrameActivating        PanelAppletFrameActivating;
107
 
 
108
 
PanelOrientation  panel_applet_frame_activating_get_orientation (PanelAppletFrameActivating *frame_act);
109
 
guint32           panel_applet_frame_activating_get_size        (PanelAppletFrameActivating *frame_act);
110
 
gboolean          panel_applet_frame_activating_get_locked      (PanelAppletFrameActivating *frame_act);
111
 
gboolean          panel_applet_frame_activating_get_locked_down (PanelAppletFrameActivating *frame_act);
112
 
gchar            *panel_applet_frame_activating_get_conf_path   (PanelAppletFrameActivating *frame_act);
113
 
 
114
 
void  _panel_applet_frame_set_iid               (PanelAppletFrame           *frame,
115
 
                                                 const gchar                *iid);
116
 
 
117
 
void  _panel_applet_frame_activated             (PanelAppletFrame           *frame,
118
 
                                                 PanelAppletFrameActivating *frame_act,
119
 
                                                 GError                     *error);
120
 
 
121
 
void  _panel_applet_frame_update_flags          (PanelAppletFrame *frame,
122
 
                                                 gboolean          major,
123
 
                                                 gboolean          minor,
124
 
                                                 gboolean          has_handle);
125
 
 
126
 
void  _panel_applet_frame_update_size_hints     (PanelAppletFrame *frame,
127
 
                                                 gint             *size_hints,
128
 
                                                 guint             n_elements);
129
 
 
130
 
char *_panel_applet_frame_get_background_string (PanelAppletFrame    *frame,
131
 
                                                 PanelWidget         *panel,
132
 
                                                 PanelBackgroundType  type);
133
 
 
134
 
void  _panel_applet_frame_applet_broken         (PanelAppletFrame *frame);
135
 
 
136
 
void  _panel_applet_frame_applet_remove         (PanelAppletFrame *frame);
137
 
void  _panel_applet_frame_applet_move           (PanelAppletFrame *frame);
138
 
void  _panel_applet_frame_applet_lock           (PanelAppletFrame *frame,
139
 
                                                 gboolean          locked);
140
 
 
141
 
const gchar * panel_applet_frame_get_iid (PanelAppletFrame * frame);
142
 
 
143
 
G_END_DECLS
144
 
 
145
 
#endif /* __PANEL_APPLET_FRAME_H__ */