aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-06-04 19:05:46 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-06-04 20:34:15 +0800
commit970662db34ff0a718cd5e39c1fa268beb51e1f64 (patch)
tree73c987b95c107ae7e3014abdca4c95de12dc853d /shell
parent3ee48d9bf66fbc76b7b06e77aafa015c341cd419 (diff)
downloadgsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.tar.gz
gsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.tar.zst
gsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.zip
More GTK3 preparation.
This uses the new gtk_assistant_commit() I had added to GTK+ for our EImportAssistant progress page.
Diffstat (limited to 'shell')
-rw-r--r--shell/e-shell.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 2345d70654..f82931cec0 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1926,20 +1926,22 @@ e_shell_cancel_quit (EShell *shell)
* a given screen.
**/
void
-e_shell_adapt_window_size (EShell *shell,
- GtkWindow *window)
+e_shell_adapt_window_size (EShell *shell,
+ GtkWindow *window)
{
- gint monitor;
- GdkScreen *scr;
+ GdkScreen *screen;
GdkRectangle rect;
+ GdkWindow *gdk_window;
+ gint monitor;
if (!e_shell_get_meego_mode (shell) ||
!e_shell_get_small_screen_mode (shell))
return;
- scr = gdk_screen_get_default ();
- monitor = gdk_screen_get_monitor_at_window (scr, GTK_WIDGET (window)->window);
- gdk_screen_get_monitor_geometry (scr, monitor, &rect);
+ 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);