~ubuntu-branches/ubuntu/trusty/nautilus/trusty-proposed

« back to all changes in this revision

Viewing changes to libnautilus-private/nautilus-ui-utilities.h

  • Committer: Package Import Robot
  • Author(s): Tim Lunn
  • Date: 2014-01-02 16:50:06 UTC
  • mfrom: (1.17.43)
  • Revision ID: package-import@ubuntu.com-20140102165006-1ghk9ropzitdc8pp
Tags: 1:3.10.1-0ubuntu1
* New upstream release
* debian/control.in: bump depend on gtk+ 3.9.11
* debian/patches:
  - Dropped git patches, that are included in new version
  - 06_never_exec_nonexec_launchers.patch, refreshed
  - disconnect-extra-location-widgets.patch, dropped included in new version
  - 16_unity_new_documents.patch, refreshed
  - ubuntu_show_titlebar.patch, disable CSD titlebar on non-GNOME sessions
  - ubuntu_titlebar_css.patch, theme fixes (LP: #1272602)

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
                                                    const char        *name,
35
35
                                                    guint             *merge_id,
36
36
                                                    GtkActionGroup   **action_group);
37
 
GtkAction * nautilus_action_from_menu_item         (NautilusMenuItem  *item);
 
37
GtkAction * nautilus_action_from_menu_item         (NautilusMenuItem  *item,
 
38
                                                    GtkWidget         *parent_widget);
38
39
 
39
 
GdkPixbuf * nautilus_ui_get_menu_icon              (const char        *icon_name);
 
40
GdkPixbuf * nautilus_ui_get_menu_icon              (const char        *icon_name,
 
41
                                                    GtkWidget         *parent_widget);
40
42
 
41
43
char * nautilus_escape_action_name                 (const char        *action_name,
42
44
                                                    const char        *prefix);