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

« back to all changes in this revision

Viewing changes to gnome-panel/launcher.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:
29
29
        gulong             destroy_handler;
30
30
} Launcher;
31
31
 
32
 
void panel_launcher_create           (PanelToplevel *toplevel,
33
 
                                      int            position,
34
 
                                      const char    *location);
35
 
void panel_launcher_create_with_id   (const char    *toplevel_id,
36
 
                                      int            position,
37
 
                                      const char    *location);
38
 
gboolean panel_launcher_create_copy      (PanelToplevel *toplevel,
39
 
                                          int            position,
40
 
                                          const char    *location);
41
 
void panel_launcher_create_from_info (PanelToplevel *toplevel,
42
 
                                      int            position,
43
 
                                      gboolean       exec_info,
44
 
                                      const char    *exec_or_uri,
45
 
                                      const char    *name,
46
 
                                      const char    *comment,
47
 
                                      const char    *icon);
 
32
void panel_launcher_create           (PanelToplevel       *toplevel,
 
33
                                      PanelObjectPackType  pack_type,
 
34
                                      int                  pack_index,
 
35
                                      const char          *location);
 
36
gboolean panel_launcher_create_copy  (PanelToplevel       *toplevel,
 
37
                                      PanelObjectPackType  pack_type,
 
38
                                      int                  pack_index,
 
39
                                      const char          *location);
 
40
void panel_launcher_create_from_info (PanelToplevel       *toplevel,
 
41
                                      PanelObjectPackType  pack_type,
 
42
                                      int                  pack_index,
 
43
                                      gboolean             exec_info,
 
44
                                      const char          *exec_or_uri,
 
45
                                      const char          *name,
 
46
                                      const char          *comment,
 
47
                                      const char          *icon);
48
48
 
49
49
void            launcher_launch                 (Launcher  *launcher,
50
50
                                                 GtkWidget *widget);
51
51
 
52
52
void            launcher_properties             (Launcher  *launcher);
53
53
 
54
 
void            launcher_load_from_gconf        (PanelWidget *panel_widget,
55
 
                                                 gboolean     locked,
56
 
                                                 gint         position,
57
 
                                                 const char  *id);
 
54
void            launcher_load                   (PanelWidget *panel_widget,
 
55
                                                 const char  *id,
 
56
                                                 GSettings   *settings);
58
57
 
59
58
void            panel_launcher_delete           (Launcher *launcher);
60
59
 
61
60
void            ask_about_launcher              (const char *file,
62
61
                                                 PanelWidget *panel,
63
 
                                                 int pos,
64
 
                                                 gboolean exactpos);
 
62
                                                 PanelObjectPackType pack_type);
65
63
 
66
64
Launcher *      find_launcher                   (const char *path);
67
65