X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=hildon%2Fhildon-gtk.c;h=25836827f90dd1a366e542e0f1de2be9a608b02a;hb=e7ebb4366bbce4a0a9b7b4a04a7e7f0464a0159c;hp=448be93dc0d396da2036ec3e1a486c2917719eb2;hpb=48e16cd02ef6b08eb2430e2c176807cf86032a0c;p=hildon

diff --git a/hildon/hildon-gtk.c b/hildon/hildon-gtk.c
index 448be93..2583682 100644
--- a/hildon/hildon-gtk.c
+++ b/hildon/hildon-gtk.c
@@ -1,7 +1,7 @@
 /*
  * This file is a part of hildon
  *
- * Copyright (C) 2008 Nokia Corporation, all rights reserved.
+ * Copyright (C) 2008, 2009 Nokia Corporation, all rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser Public License as published by
@@ -28,6 +28,10 @@
 #include <gdk/gdkx.h>
 
 #include "hildon-gtk.h"
+#include "hildon-window.h"
+#include "hildon-window-private.h"
+#include "hildon-edit-toolbar.h"
+#include "hildon-edit-toolbar-private.h"
 
 typedef void (*HildonFlagFunc) (GtkWindow *window, gpointer userdata);
 
@@ -110,8 +114,8 @@ hildon_gtk_menu_new                             (void)
  * This is a convenience function to create a #GtkButton setting its
  * size to one of the pre-defined Hildon sizes.
  *
- * Buttons created with this function also override the
- * "gtk-button-images" setting. Images set using
+ * Buttons created with this function also override
+ * #GtkSettings:gtk-button-images. Images set using
  * gtk_button_set_image() are always shown.
  *
  * Buttons created using this function have #GtkButton:focus-on-click
@@ -136,8 +140,8 @@ hildon_gtk_button_new                           (HildonSizeType size)
  * This is a convenience function to create a #GtkToggleButton setting
  * its size to one of the pre-defined Hildon sizes.
  *
- * Buttons created with this function also override the
- * "gtk-button-images" setting. Images set using
+ * Buttons created with this function also override
+ * #GtkSettings:gtk-button-images. Images set using
  * gtk_button_set_image() are always shown.
  *
  * Buttons created using this function have #GtkButton:focus-on-click
@@ -164,8 +168,8 @@ hildon_gtk_toggle_button_new                    (HildonSizeType size)
  * This is a convenience function to create a #GtkRadioButton setting
  * its size to one of the pre-defined Hildon sizes.
  *
- * Buttons created with this function also override the
- * "gtk-button-images" setting. Images set using
+ * Buttons created with this function also override
+ * #GtkSettings:gtk-button-images. Images set using
  * gtk_button_set_image() are always shown.
  *
  * Buttons created using this function have #GtkButton:focus-on-click
@@ -192,8 +196,8 @@ hildon_gtk_radio_button_new                     (HildonSizeType  size,
  * This is a convenience function to create a #GtkRadioButton setting
  * its size to one of the pre-defined Hildon sizes.
  *
- * Buttons created with this function also override the
- * "gtk-button-images" setting. Images set using
+ * Buttons created with this function also override
+ * #GtkSettings:gtk-button-images. Images set using
  * gtk_button_set_image() are always shown.
  *
  * Buttons created using this function have #GtkButton:focus-on-click
@@ -406,6 +410,13 @@ hildon_gtk_window_set_progress_indicator        (GtkWindow *window,
                                                  guint      state)
 {
     set_flag (window, (HildonFlagFunc) do_set_progress_indicator, GUINT_TO_POINTER (state));
+    if (HILDON_IS_WINDOW (window)) {
+        HildonWindowPrivate *priv = HILDON_WINDOW_GET_PRIVATE (window);
+        if (priv->edit_toolbar) {
+            HildonEditToolbar *tb = HILDON_EDIT_TOOLBAR (priv->edit_toolbar);
+            hildon_edit_toolbar_set_progress_indicator (tb, state);
+        }
+    }
 }
 
 /**
@@ -468,7 +479,6 @@ hildon_gtk_window_take_screenshot               (GtkWindow *window,
     ev->data_format = 32;
     ev->data.l[0] = take ? 1 : 0;
     ev->data.l[1] = GDK_WINDOW_XID (GTK_WIDGET (window)->window);
-    ev->data.l[2] = 0;
 
     gdk_event_send_client_message ((GdkEvent *) ev, GDK_WINDOW_XWINDOW (rootwin));