~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/libpanel-applet-private/panel-applet-container.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-container.c: a container for applets.
3
 
 *
4
 
 * Copyright (C) 2010 Carlos Garcia Campos <carlosgc@gnome.org>
5
 
 *
6
 
 * This library is free software; you can redistribute it and/or
7
 
 * modify it under the terms of the GNU Library General Public
8
 
 * License as published by the Free Software Foundation; either
9
 
 * version 2 of the License, or (at your option) any later version.
10
 
 *
11
 
 * This library is distributed in the hope that it will be useful,
12
 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
 
 * Library General Public License for more details.
15
 
 *
16
 
 * You should have received a copy of the GNU Library General Public
17
 
 * License along with this library; if not, write to the
18
 
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
19
 
 * Boston, MA 02111-1307, USA.
20
 
 *
21
 
 */
22
 
 
23
 
#ifndef __PANEL_APPLET_CONTAINER_H__
24
 
#define __PANEL_APPLET_CONTAINER_H__
25
 
 
26
 
#include <glib-object.h>
27
 
#include <gtk/gtk.h>
28
 
#include "panel.h"
29
 
 
30
 
G_BEGIN_DECLS
31
 
 
32
 
#define PANEL_TYPE_APPLET_CONTAINER            (panel_applet_container_get_type ())
33
 
#define PANEL_APPLET_CONTAINER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PANEL_TYPE_APPLET_CONTAINER, PanelAppletContainer))
34
 
#define PANEL_APPLET_CONTAINER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PANEL_TYPE_APPLET_CONTAINER, PanelAppletContainerClass))
35
 
#define PANEL_IS_APPLET_CONTAINER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PANEL_TYPE_APPLET_CONTAINER))
36
 
#define PANEL_IS_APPLET_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANEL_TYPE_APPLET_CONTAINER))
37
 
#define PANEL_APPLET_CONTAINER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PANEL_TYPE_APPLET_CONTAINER, PanelAppletContainerClass))
38
 
 
39
 
#define PANEL_APPLET_CONTAINER_ERROR           (panel_applet_container_error_quark())
40
 
 
41
 
typedef enum {
42
 
        PANEL_APPLET_CONTAINER_INVALID_APPLET,
43
 
        PANEL_APPLET_CONTAINER_INVALID_CHILD_PROPERTY
44
 
} PanelAppletContainerError;
45
 
 
46
 
typedef struct _PanelAppletContainer        PanelAppletContainer;
47
 
typedef struct _PanelAppletContainerClass   PanelAppletContainerClass;
48
 
typedef struct _PanelAppletContainerPrivate PanelAppletContainerPrivate;
49
 
 
50
 
struct _PanelAppletContainer {
51
 
        GtkEventBox parent;
52
 
 
53
 
        PanelAppletContainerPrivate *priv;
54
 
};
55
 
 
56
 
struct _PanelAppletContainerClass {
57
 
        GtkEventBoxClass parent_class;
58
 
 
59
 
        /* Signals */
60
 
        void (*applet_broken)          (PanelAppletContainer *container);
61
 
        void (*applet_move)            (PanelAppletContainer *container);
62
 
        void (*applet_remove)          (PanelAppletContainer *container);
63
 
        void (*applet_lock)            (PanelAppletContainer *container,
64
 
                                        gboolean              locked);
65
 
        void (*child_property_changed) (PanelAppletContainer *container,
66
 
                                        const gchar          *property_name,
67
 
                                        GVariant             *value);
68
 
};
69
 
 
70
 
GType      panel_applet_container_get_type                (void) G_GNUC_CONST;
71
 
GQuark     panel_applet_container_error_quark             (void) G_GNUC_CONST;
72
 
GtkWidget *panel_applet_container_new                     (void);
73
 
 
74
 
 
75
 
void       panel_applet_container_add                     (PanelAppletContainer *container,
76
 
                                                           const gchar          *iid,
77
 
                                                           GCancellable        *cancellable,
78
 
                                                           GAsyncReadyCallback  callback,
79
 
                                                           gpointer             user_data,
80
 
                                                           GVariant            *properties);
81
 
gboolean   panel_applet_container_add_finish              (PanelAppletContainer *container,
82
 
                                                           GAsyncResult         *result,
83
 
                                                           GError              **error);
84
 
void       panel_applet_container_child_popup_menu        (PanelAppletContainer *container,
85
 
                                                           guint                 button,
86
 
                                                           guint32               timestamp,
87
 
                                                           GCancellable         *cancellable,
88
 
                                                           GAsyncReadyCallback   callback,
89
 
                                                           gpointer              user_data);
90
 
gboolean   panel_applet_container_child_popup_menu_finish (PanelAppletContainer *container,
91
 
                                                           GAsyncResult         *result,
92
 
                                                           GError              **error);
93
 
 
94
 
void       panel_applet_container_child_set               (PanelAppletContainer *container,
95
 
                                                           const gchar          *property_name,
96
 
                                                           const GVariant       *value,
97
 
                                                           GCancellable         *cancellable,
98
 
                                                           GAsyncReadyCallback   callback,
99
 
                                                           gpointer              user_data);
100
 
gboolean   panel_applet_container_child_set_finish        (PanelAppletContainer *container,
101
 
                                                           GAsyncResult         *result,
102
 
                                                           GError              **error);
103
 
void       panel_applet_container_child_get               (PanelAppletContainer *container,
104
 
                                                           const gchar          *property_name,
105
 
                                                           GCancellable         *cancellable,
106
 
                                                           GAsyncReadyCallback   callback,
107
 
                                                           gpointer              user_data);
108
 
GVariant  *panel_applet_container_child_get_finish        (PanelAppletContainer *container,
109
 
                                                           GAsyncResult         *result,
110
 
                                                           GError              **error);
111
 
 
112
 
G_END_DECLS
113
 
 
114
 
#endif /* __PANEL_APPLET_CONTAINER_H__ */