summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun McCance <shaunm@gnome.org>2011-01-04 17:33:59 -0500
committerShaun McCance <shaunm@gnome.org>2011-01-04 17:33:59 -0500
commit9696dc6d909bdefc2d9f7406ac58cdbf8715a9ae (patch)
tree6311be9dbd33a47c0733aca9c6473d7acdbb7e02
parent1f9af450bcc5bfcaa2a0f1e92ce3431c8f158b07 (diff)
downloadyelp-9696dc6d909bdefc2d9f7406ac58cdbf8715a9ae.tar.gz
[yelp-window] Fix some critical warnings
-rw-r--r--src/yelp-window.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/yelp-window.c b/src/yelp-window.c
index 4aab8a28..7605d11c 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -1492,9 +1492,10 @@ view_uri_selected (YelpView *view,
return;
gdkwin = gtk_widget_get_window (GTK_WIDGET (window));
- gdk_window_set_cursor (gdkwin,
- gdk_cursor_new_for_display (gdk_window_get_display (gdkwin),
- GDK_WATCH));
+ if (gdkwin != NULL)
+ gdk_window_set_cursor (gdkwin,
+ gdk_cursor_new_for_display (gdk_window_get_display (gdkwin),
+ GDK_WATCH));
doc_uri = yelp_uri_get_document_uri (uri);
if (priv->doc_uri == NULL || !g_str_equal (priv->doc_uri, doc_uri)) {
@@ -1552,11 +1553,13 @@ hidden_entry_hide (YelpWindow *window)
{
YelpWindowPrivate *priv = GET_PRIV (window);
- gtk_container_remove (GTK_CONTAINER (priv->hbox),
- priv->align_hidden);
- gtk_box_pack_start (GTK_BOX (priv->hbox),
- priv->align_location,
- TRUE, TRUE, 0);
+ if (gtk_widget_get_parent (priv->align_hidden) != NULL) {
+ gtk_container_remove (GTK_CONTAINER (priv->hbox),
+ priv->align_hidden);
+ gtk_box_pack_start (GTK_BOX (priv->hbox),
+ priv->align_location,
+ TRUE, TRUE, 0);
+ }
}
static gboolean