Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2007-07-27 09:09:09 (GMT)
committer Carlos Garcia Campos <carlosgc@src.gnome.org>2007-07-27 09:09:09 (GMT)
commitb712f364fbbc41c010613c3005befe66d6b8fe16 (patch)
treeebf56fb12b2357821094cf14481d9f7dbe083ed3 /shell
parent784128af02ea485639dd23220b1a3f5670c30fdd (diff)
Do not use display before initializing it. Remove compile warnings.
2007-07-27 Carlos Garcia Campos <carlosgc@gnome.org> * shell/ev-utils.c: (get_num_monitors): * shell/ev-window.c: (ev_window_sizing_mode_changed_cb): Do not use display before initializing it. Remove compile warnings. svn path=/trunk/; revision=2584
Diffstat (limited to 'shell')
-rw-r--r--shell/ev-utils.c19
-rw-r--r--shell/ev-window.c3
2 files changed, 12 insertions, 10 deletions
diff --git a/shell/ev-utils.c b/shell/ev-utils.c
index fabdeaa..3e5c203 100644
--- a/shell/ev-utils.c
+++ b/shell/ev-utils.c
@@ -376,27 +376,28 @@ ev_gui_menu_position_tree_selection (GtkMenu *menu,
* Returns: Number of monitors, -1 if uncertain situation (like multiple screens)
*/
gint
-get_num_monitors (GtkWindow * window)
+get_num_monitors (GtkWindow *window)
{
- GdkDisplay * display;
- GdkScreen * screen;
- gint num_screen = gdk_display_get_n_screens(display);
+ GdkDisplay *display;
+ GdkScreen *screen;
+ gint num_screen;
- display = gdk_display_get_default();
+ display = gdk_display_get_default ();
+ num_screen = gdk_display_get_n_screens (display);
if (num_screen != 1)
return -1;
if (window)
- screen = gtk_window_get_screen(window);
+ screen = gtk_window_get_screen (window);
else
- screen = gdk_display_get_screen(display, 0);
+ screen = gdk_display_get_screen (display, 0);
- return gdk_screen_get_n_monitors(screen);
+ return gdk_screen_get_n_monitors (screen);
}
gdouble
-get_screen_dpi (GtkWindow * window)
+get_screen_dpi (GtkWindow *window)
{
GdkScreen *screen;
gdouble xdpi, ydpi;
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 7e686c3..d9fc479 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -3519,7 +3519,8 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
g_signal_handlers_disconnect_by_func (ev_window->priv->view, ev_view_update_view_size, scrolled_window);
if (sizing_mode != EV_SIZING_FREE)
- ev_view_update_view_size (ev_window->priv->view, GTK_SCROLLED_WINDOW (scrolled_window));
+ ev_view_update_view_size (EV_VIEW (ev_window->priv->view),
+ GTK_SCROLLED_WINDOW (scrolled_window));
switch (sizing_mode) {
case EV_SIZING_BEST_FIT: