random, somewhat spurious cleanup.

3 files changed, 17 insertions, 29 deletions

diff --git a/src/pop-demo.c b/src/pop-demo.c
index db0c8f6..5d6efe4 100644
--- a/src/pop-demo.c
+++ b/src/pop-demo.c
@@ -149,7 +149,9 @@ draw_window_from_stack (PopWindowStack  *stack,
  
   g_assert (POP_IS_WINDOW_VIEW (view));
 
+  cairo_save (cairo_context);
   pop_window_view_render_to_context (view, cairo_context);
+  cairo_restore (cairo_context);
 }
 
 static void
@@ -348,10 +350,10 @@ main (int    argc,
   gdk_window_set_events (root_window, GDK_SUBSTRUCTURE_MASK);
   gdk_window_add_filter (NULL, (GdkFilterFunc) on_event, overlay_window);
 
-  gtk_widget_show (overlay_window);
-
   listener = pop_event_listener_get_default ();
 
+  gtk_widget_show (overlay_window);
+
   gtk_main();
 
   return 0;
diff --git a/src/pop-window-view.c b/src/pop-window-view.c
index 9b899e6..aee0cb6 100644
--- a/src/pop-window-view.c
+++ b/src/pop-window-view.c
@@ -56,10 +56,9 @@ struct _PopWindowViewPrivate
 };
 
 #if 0
-static void pop_window_view_class_install_signals (PopWindowViewClass * window_class);
+static void pop_window_view_class_install_signals (PopWindowViewClass *view_class);
 #endif
-static void pop_window_view_class_install_properties (PopWindowViewClass *
-                                                 window_class);
+static void pop_window_view_class_install_properties (PopWindowViewClass *view_class);
 
 static void pop_window_view_set_property (GObject * object,
                                      guint prop_id,
@@ -94,46 +93,46 @@ static guint pop_window_view_signals[NUMBER_OF_SIGNALS];
 G_DEFINE_TYPE (PopWindowView, pop_window_view, G_TYPE_OBJECT);
 
 static void
-pop_window_view_class_init (PopWindowViewClass *window_class)
+pop_window_view_class_init (PopWindowViewClass *view_class)
 {
   GObjectClass *object_class;
 
-  object_class = G_OBJECT_CLASS (window_class);
+  object_class = G_OBJECT_CLASS (view_class);
 
   object_class->finalize = pop_window_view_do_finalize;
 
-  pop_window_view_class_install_properties (window_class);
+  pop_window_view_class_install_properties (view_class);
 #if 0
-  pop_window_view_class_install_signals (window_class);
+  pop_window_view_class_install_signals (view_class);
 #endif
 
-  g_type_class_add_private (window_class, sizeof (PopWindowViewPrivate));
+  g_type_class_add_private (view_class, sizeof (PopWindowViewPrivate));
 }
 
 #if 0
 static void
-pop_window_view_class_install_signals (PopWindowViewClass * window_class)
+pop_window_view_class_install_signals (PopWindowViewClass * view_class)
 {
   GObjectClass *object_class;
 
-  object_class = G_OBJECT_CLASS (window_class);
+  object_class = G_OBJECT_CLASS (view_class);
 
   pop_window_view_signals[FOO] =
     g_signal_new ("foo", G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (PopWindowViewClass, foo),
                   NULL, NULL, g_cclosure_marshal_VOID__NONE; G_TYPE_NONE, 0);
-  window_class->foo = NULL;
+  view_class->foo = NULL;
 }
 #endif
 
 static void
-pop_window_view_class_install_properties (PopWindowViewClass *window_class)
+pop_window_view_class_install_properties (PopWindowViewClass *view_class)
 {
   GObjectClass *object_class;
   GParamSpec *param_spec;
 
-  object_class = G_OBJECT_CLASS (window_class);
+  object_class = G_OBJECT_CLASS (view_class);
   object_class->set_property = pop_window_view_set_property;
   object_class->get_property = pop_window_view_get_property;
 
@@ -908,7 +907,6 @@ pop_window_view_render_to_context (PopWindowView *view,
 
   pop_window_view_report_fixed_damage (view);
 
-  cairo_save (cairo_context);
   cairo_translate (cairo_context, view->priv->x, view->priv->y);
 #if 0
   char *text;
@@ -924,8 +922,6 @@ pop_window_view_render_to_context (PopWindowView *view,
   cairo_append_path (cairo_context, view->priv->clip_path);
   cairo_clip (cairo_context);
   cairo_paint (cairo_context);
- 
-  cairo_restore (cairo_context);
 }
 
 void
diff --git a/src/pop-window-view.h b/src/pop-window-view.h
index bcc3fa1..f0b0220 100644
--- a/src/pop-window-view.h
+++ b/src/pop-window-view.h
@@ -1,4 +1,4 @@
-/* pop-window-view.h - 
+/* pop-window-view.h - view of redirected offscreen windows
  *
  * Copyright (C) 2007 Ray Strode <rstrode@redhat.com>
  *
@@ -78,16 +78,6 @@ void pop_window_view_get_position (PopWindowView *view, int *x, int *y);
 void pop_window_view_queue_damage (PopWindowView *view);
 void pop_window_view_render_to_context (PopWindowView *view,  
                                         cairo_t       *cairo_context);
-
-void _pop_window_view_window_damaged (PopWindowView *view,
-                                      GdkRectangle  *rectangle);
-void _pop_window_view_window_resized (PopWindowView *view);
-void _pop_window_view_window_moved (PopWindowView *view);
-void _pop_window_view_window_shown (PopWindowView *view);
-void _pop_window_view_window_hidden (PopWindowView *view);
-void _pop_window_view_window_destroyed (PopWindowView *view);
-void _pop_window_view_window_reshaped (PopWindowView *view);
-void _pop_window_view_window_reparented (PopWindowView *view);
 #endif
 
 G_END_DECLS