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

« back to all changes in this revision

Viewing changes to bonobo/libpanel-applet/panel-applet-shell.c

  • 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-shell.c: the panel's interface to the applet.
3
 
 *
4
 
 * Copyright (C) 2001 Sun Microsystems, Inc.
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
 
 * Authors:
22
 
 *     Mark McLoughlin <mark@skynet.ie>
23
 
 */
24
 
 
25
 
#include <config.h>
26
 
 
27
 
#include "panel-applet-shell.h"
28
 
#include "panel-applet.h"
29
 
#include "panel-applet-private.h"
30
 
 
31
 
struct _PanelAppletShellPrivate {
32
 
        PanelApplet *applet;
33
 
};
34
 
 
35
 
static GObjectClass *parent_class = NULL;
36
 
 
37
 
static void
38
 
impl_PanelAppletShell_popup_menu (PortableServer_Servant  servant,
39
 
                                  CORBA_long   button,
40
 
                                  CORBA_long   time,
41
 
                                  CORBA_Environment      *ev)
42
 
{
43
 
        PanelAppletShell *applet_shell;
44
 
 
45
 
        applet_shell = PANEL_APPLET_SHELL (bonobo_object (servant));
46
 
 
47
 
        _panel_applet_popup_menu (applet_shell->priv->applet, button, time);
48
 
}
49
 
 
50
 
static void
51
 
panel_applet_shell_finalize (GObject *object)
52
 
{
53
 
        PanelAppletShell *shell = PANEL_APPLET_SHELL (object);
54
 
 
55
 
        if (shell->priv) {
56
 
                g_free (shell->priv);
57
 
                shell->priv = NULL;
58
 
        }
59
 
 
60
 
        parent_class->finalize (object);
61
 
}
62
 
 
63
 
static void
64
 
panel_applet_shell_class_init (PanelAppletShellClass *klass)
65
 
{
66
 
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
67
 
 
68
 
        klass->epv.popup_menu = impl_PanelAppletShell_popup_menu;
69
 
 
70
 
        object_class->finalize = panel_applet_shell_finalize;
71
 
 
72
 
        parent_class = g_type_class_peek_parent (klass);
73
 
}
74
 
 
75
 
static void
76
 
panel_applet_shell_init (PanelAppletShell *shell)
77
 
{
78
 
        shell->priv = g_new0 (PanelAppletShellPrivate, 1);
79
 
 
80
 
        shell->priv->applet = NULL;
81
 
}
82
 
 
83
 
BONOBO_TYPE_FUNC_FULL (PanelAppletShell,
84
 
                       GNOME_Vertigo_PanelAppletShell,
85
 
                       BONOBO_OBJECT_TYPE,
86
 
                       panel_applet_shell)
87
 
 
88
 
void
89
 
panel_applet_shell_construct (PanelAppletShell *shell,
90
 
                              PanelApplet      *applet)
91
 
{
92
 
        shell->priv->applet = applet;
93
 
}
94
 
 
95
 
PanelAppletShell *
96
 
panel_applet_shell_new (PanelApplet *applet)
97
 
{
98
 
        PanelAppletShell *shell;
99
 
 
100
 
        shell = g_object_new (PANEL_APPLET_SHELL_TYPE, NULL);
101
 
 
102
 
        panel_applet_shell_construct (shell, applet);
103
 
 
104
 
        return shell;
105
 
}