← Back to branch summary

~ubuntu-branches/ubuntu/wily/epiphany-browser/wily

« back to all changes in this revision

Viewing changes to lib/widgets/ephy-location-entry.c

Tags: upstream-3.10.1
Import upstream version 3.10.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/widgets/ephy-location-entry.c
579
579
                         EphyLocationEntry *lentry)
580
580
{
581
581
        EphyLocationEntryPrivate *priv = lentry->priv;
582
 
        GtkWidget *image;
583
582
        GtkWidget *clear_menuitem, *undo_menuitem, *redo_menuitem, *separator;
584
583
        GList *children, *item;
585
584
        int pos = 0, sep = 0;
586
585
        gboolean is_editable;
587
586
 
588
 
        /* Clear and Copy mnemonics conflict, make custom menuitem */
589
 
        image = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU);
590
 
        gtk_widget_show (image);
591
 
 
592
587
        /* Translators: the mnemonic shouldn't conflict with any of the
593
588
         * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
594
589
         * Select All, Input Methods and Insert Unicode control character.)
595
590
         */
596
 
        clear_menuitem = gtk_image_menu_item_new_with_mnemonic (_("Cl_ear"));
597
 
        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear_menuitem), image);
 
591
        clear_menuitem = gtk_menu_item_new_with_mnemonic (_("Cl_ear"));
598
592
        g_signal_connect (clear_menuitem , "activate",
599
593
                          G_CALLBACK (entry_clear_activate_cb), lentry);
600
594
        is_editable = gtk_editable_get_editable (GTK_EDITABLE (entry));
613
607
 
614
608
        gtk_menu_shell_insert (GTK_MENU_SHELL (menu), clear_menuitem, pos - 1);
615
609
        
616
 
        undo_menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_UNDO, NULL);
 
610
        undo_menuitem = gtk_menu_item_new_with_mnemonic (_("_Undo"));
617
611
        gtk_widget_set_sensitive (undo_menuitem, priv->user_changed);
618
612
        g_signal_connect (undo_menuitem, "activate",
619
613
                          G_CALLBACK (entry_undo_activate_cb), lentry);
620
614
        gtk_widget_show (undo_menuitem);
621
615
        gtk_menu_shell_insert (GTK_MENU_SHELL (menu), undo_menuitem, 0);
622
616
        
623
 
        redo_menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_REDO, NULL);
 
617
        redo_menuitem = gtk_menu_item_new_with_mnemonic (_("_Redo"));
624
618
        gtk_widget_set_sensitive (redo_menuitem, priv->can_redo);
625
619
        g_signal_connect (redo_menuitem, "activate",
626
620
                          G_CALLBACK (entry_redo_activate_cb), lentry);