← Back to branch summary

~ubuntu-branches/ubuntu/trusty/epiphany-browser/trusty

« back to all changes in this revision

Viewing changes to src/ephy-notebook.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2011-11-21 17:15:18 UTC
  • mfrom: (1.6.3) (98.2.3 sid)
  • Revision ID: package-import@ubuntu.com-20111121171518-0f07y0i5rvb2wrix
Tags: 3.2.1-2ubuntu1
* Resynchronize on Debian, remaining diffs:
* debian/branding.conf.in: set the branding to Ubuntu.
* debian/epiphany-browser-data.gsettings-override:
  - set startpage and search to Ubuntu
* debian/patches/80_ubuntu_search_url.patch: use Ubuntu search
* debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
  - update the bookmarks menu every time the internal structure
    is changed (needed for the indicator application menu to work correctly).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ephy-notebook.c
25
25
#include "ephy-notebook.h"
26
26
#include "ephy-prefs.h"
27
27
#include "ephy-settings.h"
28
 
#include "ephy-marshal.h"
29
28
#include "ephy-file-helpers.h"
30
29
#include "ephy-dnd.h"
31
30
#include "ephy-embed.h"
582
581
{
583
582
        GtkWidget *hbox, *label, *close_button, *image, *spinner, *icon;
584
583
        EphyWebView *view;
585
 
        GtkCssProvider *provider;
586
584
 
587
585
        /* set hbox spacing and label padding (see below) so that there's an
588
586
         * equal amount of space around the label */
589
 
        hbox = gtk_hbox_new (FALSE, 4);
 
587
        hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
590
588
        gtk_widget_show (hbox);
591
589
 
592
590
        /* setup load feedback */
616
614
 
617
615
        gtk_widget_set_name (close_button, "ephy-tab-close-button");
618
616
 
619
 
        provider = gtk_css_provider_new ();
620
 
        gtk_css_provider_load_from_data (provider,
621
 
                                         "#ephy-tab-close-button {"
622
 
                                         " -GtkWidget-focus-padding: 0;"
623
 
                                         " -GtkWidget-focus-line-width: 0;"
624
 
                                         " margin: 0; }",
625
 
                                         -1, NULL);
626
 
 
627
 
        gtk_style_context_add_provider (gtk_widget_get_style_context (close_button),
628
 
                                        GTK_STYLE_PROVIDER (provider),
629
 
                                        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
630
 
        g_object_unref (provider);
631
 
 
632
617
        image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
633
618
        gtk_widget_set_tooltip_text (close_button, _("Close tab"));
634
619
        g_signal_connect (close_button, "clicked",