From c30d29425eccafea02e95ea6e81679508c878784 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 1 May 2010 23:18:28 -0400 Subject: Coding style and whitespace cleanup. --- modules/mail/e-mail-shell-sidebar.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'modules/mail') diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c index a5ec67d4c4..491d5068d7 100644 --- a/modules/mail/e-mail-shell-sidebar.c +++ b/modules/mail/e-mail-shell-sidebar.c @@ -178,12 +178,12 @@ mail_shell_sidebar_constructed (GObject *object) shell_sidebar); } -static int +static gint guess_screen_width (EMailShellSidebar *sidebar) { GtkWidget *widget; GdkScreen *screen; - int screen_width; + gint screen_width; widget = GTK_WIDGET (sidebar); @@ -192,12 +192,13 @@ guess_screen_width (EMailShellSidebar *sidebar) screen = gtk_widget_get_screen (widget); if (screen) { GtkWidget *toplevel; - int monitor; + gint monitor; GdkRectangle rect; toplevel = gtk_widget_get_toplevel (widget); if (toplevel && gtk_widget_get_realized (toplevel)) - monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (toplevel)); + monitor = gdk_screen_get_monitor_at_window ( + screen, gtk_widget_get_window (toplevel)); else { /* We don't know in which monitor the window manager * will put us. So we will just use the geometry of the @@ -235,16 +236,17 @@ mail_shell_sidebar_size_request (GtkWidget *widget, GtkRequisition *requisition) PangoLayout *layout; PangoRectangle ink_rect; GtkStyle *style; - int border; - int sidebar_width; - int screen_width; + gint border; + gint sidebar_width; + gint screen_width; sidebar = E_MAIL_SHELL_SIDEBAR (widget); GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition); /* This string is a mockup only; it doesn't need to be translated */ - layout = gtk_widget_create_pango_layout (widget, "typical.account@mailservice.com"); + layout = gtk_widget_create_pango_layout ( + widget, "typical.account@mailservice.com"); pango_layout_get_pixel_extents (layout, &ink_rect, NULL); g_object_unref (layout); @@ -252,7 +254,9 @@ mail_shell_sidebar_size_request (GtkWidget *widget, GtkRequisition *requisition) screen_width = guess_screen_width (sidebar); - border = 2 * style->xthickness + 4; /* Thickness of frame shadow plus some slack for padding */ + /* Thickness of frame shadow plus some slack for padding. */ + border = 2 * style->xthickness + 4; + sidebar_width = ink_rect.width + border; sidebar_width = MIN (sidebar_width, screen_width / 4); requisition->width = MAX (requisition->width, sidebar_width); -- cgit v1.2.3