From f8f89b0bfd8ef857dceed2a96df16a008290d53b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 31 Mar 2013 09:16:10 -0400 Subject: Remove e_shell_adapt_window_size(). Its preconditions are never TRUE, and is therefore a no-op function. --- shell/e-shell-window.c | 18 ------------------ shell/e-shell.c | 34 ---------------------------------- shell/e-shell.h | 2 -- 3 files changed, 54 deletions(-) (limited to 'shell') diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index f2cfdc7fc9..acf31a5eca 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -725,20 +725,6 @@ shell_window_create_shell_view (EShellWindow *shell_window, return shell_view; } -static void -shell_window_realize (GtkWidget *widget) -{ - EShellWindow *shell_window; - - shell_window = E_SHELL_WINDOW (widget); - e_shell_adapt_window_size ( - shell_window->priv->shell, - GTK_WINDOW (widget)); - - /* Chain up to parent's dispose() method. */ - GTK_WIDGET_CLASS (e_shell_window_parent_class)->realize (widget); -} - static void shell_window_submit_alert (EAlertSink *alert_sink, EAlert *alert) @@ -771,7 +757,6 @@ static void e_shell_window_class_init (EShellWindowClass *class) { GObjectClass *object_class; - GtkWidgetClass *widget_class; g_type_class_add_private (class, sizeof (EShellWindowPrivate)); @@ -782,9 +767,6 @@ e_shell_window_class_init (EShellWindowClass *class) object_class->finalize = shell_window_finalize; object_class->constructed = shell_window_constructed; - widget_class = GTK_WIDGET_CLASS (class); - widget_class->realize = shell_window_realize; - class->construct_menubar = shell_window_construct_menubar; class->construct_toolbar = shell_window_construct_toolbar; class->construct_sidebar = shell_window_construct_sidebar; diff --git a/shell/e-shell.c b/shell/e-shell.c index 2e32929dcd..922fb4f213 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -1836,40 +1836,6 @@ e_shell_cancel_quit (EShell *shell) g_signal_stop_emission (shell, signals[QUIT_REQUESTED], 0); } -/** - * e_shell_adapt_window_size: - * @shell: an #EShell - * @window: a #GtkWindow to adapt to full-screen - * - * This is used to adapt to window's size to be optimal for - * the platform. The shell settings are used to determine if - * a window should be set to full screen etc. - * - * This method is best called when the widget is realized on - * a given screen. - **/ -void -e_shell_adapt_window_size (EShell *shell, - GtkWindow *window) -{ - GdkScreen *screen; - GdkRectangle rect; - GdkWindow *gdk_window; - gint monitor; - - if (!e_shell_get_meego_mode (shell) || TRUE) - return; - - screen = gdk_screen_get_default (); - gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); - monitor = gdk_screen_get_monitor_at_window (screen, gdk_window); - gdk_screen_get_monitor_geometry (screen, monitor, &rect); - - gtk_window_set_default_size (window, rect.width, rect.height); - gtk_window_set_decorated (window, FALSE); - gtk_window_maximize (window); -} - void e_shell_set_startup_view (EShell *shell, const gchar *view) diff --git a/shell/e-shell.h b/shell/e-shell.h index 7829b8cf69..214dd49988 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -144,8 +144,6 @@ gboolean e_shell_quit (EShell *shell, EShellQuitReason reason); void e_shell_cancel_quit (EShell *shell); -void e_shell_adapt_window_size (EShell *shell, - GtkWindow *window); void e_shell_set_startup_view (EShell *shell, const gchar *view); const gchar * e_shell_get_startup_view (EShell *shell); -- cgit v1.2.3