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

« back to all changes in this revision

Viewing changes to src/nautilus-floating-bar.c

  • 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:
407
407
 
408
408
void
409
409
nautilus_floating_bar_add_action (NautilusFloatingBar *self,
410
 
                                  const gchar *stock_id,
 
410
                                  const gchar *icon_name,
411
411
                                  gint action_id)
412
412
{
413
413
        GtkWidget *w, *button;
414
414
 
415
 
        w = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU);
 
415
        w = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
416
416
        gtk_widget_show (w);
417
417
 
418
418
        button = gtk_button_new ();