← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libnautilus-private/nautilus-bookmark.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
https://launchpad.net/bugs/1272602
* 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:
libnautilus-private/nautilus-bookmark.c
171
171
        if (symbolic) {
172
172
                warning = g_themed_icon_new ("dialog-warning-symbolic");
173
173
        } else {
174
 
                warning = g_themed_icon_new (GTK_STOCK_DIALOG_WARNING);
 
174
                warning = g_themed_icon_new ("dialog-warning");
175
175
        }
176
176
 
177
177
        emblem = g_emblem_new (warning);
762
762
        return new_bookmark;
763
763
}                                
764
764
 
765
 
static GtkWidget *
766
 
create_image_widget_for_bookmark (NautilusBookmark *bookmark)
767
 
{
768
 
        GIcon *icon;
769
 
        GtkWidget *widget;
770
 
 
771
 
        icon = nautilus_bookmark_get_symbolic_icon (bookmark);
772
 
        widget = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
773
 
        g_object_unref (icon);
774
 
 
775
 
        return widget;
776
 
}
777
 
 
778
765
/**
779
766
 * nautilus_bookmark_menu_item_new:
780
767
 * 
786
773
nautilus_bookmark_menu_item_new (NautilusBookmark *bookmark)
787
774
{
788
775
        GtkWidget *menu_item;
789
 
        GtkWidget *image_widget;
790
776
        GtkLabel *label;
791
777
        const char *name;
792
778
 
793
779
        name = nautilus_bookmark_get_name (bookmark);
794
 
        menu_item = gtk_image_menu_item_new_with_label (name);
 
780
        menu_item = gtk_menu_item_new_with_label (name);
795
781
        label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (menu_item)));
796
782
        gtk_label_set_use_underline (label, FALSE);
797
783
        gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
798
784
        gtk_label_set_max_width_chars (label, ELLIPSISED_MENU_ITEM_MIN_CHARS);
799
785
 
800
 
        image_widget = create_image_widget_for_bookmark (bookmark);
801
 
        if (image_widget != NULL) {
802
 
                gtk_widget_show (image_widget);
803
 
                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
804
 
                                               image_widget);
805
 
        }
806
 
 
807
786
        return menu_item;
808
787
}
809
788