X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstyleprovider.c;h=c1eb72ec144a99da42b027262e465f257c209a05;hb=c6fbdb67f3dc86cf49f2ac5ac8c072f4e586fd29;hp=8ed0d975ca8c611ba74a48b33e6f02e7b79fd632;hpb=07fafe7b23028f0ed127efaf9b9a1aab1ef9b4dc;p=~andy%2Fgtk

diff --git a/gtk/gtkstyleprovider.c b/gtk/gtkstyleprovider.c
index 8ed0d975c..c1eb72ec1 100644
--- a/gtk/gtkstyleprovider.c
+++ b/gtk/gtkstyleprovider.c
@@ -12,16 +12,16 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
 
-#include "gtkprivate.h"
 #include "gtkstyleprovider.h"
+
 #include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtkwidgetpath.h"
 
 /**
  * SECTION:gtkstyleprovider
@@ -29,8 +29,8 @@
  * @Title: GtkStyleProvider
  * @See_also: #GtkStyleContext, #GtkCssProvider
  *
- * GtkStyleProvider is an interface used to provide style information to a #GtkStyleContext,
- * see gtk_style_context_add_provider() and gtk_style_context_add_provider_for_screen().
+ * GtkStyleProvider is an interface used to provide style information to a #GtkStyleContext.
+ * See gtk_style_context_add_provider() and gtk_style_context_add_provider_for_screen().
  */
 
 static void gtk_style_provider_iface_init (gpointer g_iface);
@@ -62,9 +62,13 @@ gtk_style_provider_iface_init (gpointer g_iface)
  * Returns the style settings affecting a widget defined by @path, or %NULL if
  * @provider doesn't contemplate styling @path.
  *
- * Returns: a #GtkStyleProperties containing the style settings affecting @path
+ * Returns: (transfer full): a #GtkStyleProperties containing the
+ * style settings affecting @path
  *
  * Since: 3.0
+ *
+ * Deprecated: 3.8: Will always return %NULL for all GTK-provided style providers
+ *     as the interface cannot correctly work the way CSS is specified.
  **/
 GtkStyleProperties *
 gtk_style_provider_get_style (GtkStyleProvider *provider,
@@ -94,6 +98,8 @@ gtk_style_provider_get_style (GtkStyleProvider *provider,
  * the widget represented by @path.
  *
  * Returns: %TRUE if the property was found and has a value, %FALSE otherwise
+ *
+ * Since: 3.0
  **/
 gboolean
 gtk_style_provider_get_style_property (GtkStyleProvider *provider,
@@ -107,7 +113,7 @@ gtk_style_provider_get_style_property (GtkStyleProvider *provider,
   g_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), FALSE);
   g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), FALSE);
   g_return_val_if_fail (path != NULL, FALSE);
-  g_return_val_if_fail (g_type_is_a (gtk_widget_path_get_widget_type (path), pspec->owner_type), FALSE);
+  g_return_val_if_fail (g_type_is_a (gtk_widget_path_get_object_type (path), pspec->owner_type), FALSE);
   g_return_val_if_fail (value != NULL, FALSE);
 
   iface = GTK_STYLE_PROVIDER_GET_IFACE (provider);
@@ -126,9 +132,11 @@ gtk_style_provider_get_style_property (GtkStyleProvider *provider,
  * Returns the #GtkIconFactory defined to be in use for @path, or %NULL if none
  * is defined.
  *
- * Returns: The icon factory to use for @path, or %NULL
+ * Returns: (transfer none): The icon factory to use for @path, or %NULL
  *
  * Since: 3.0
+ *
+ * Deprecated: 3.8: Will always return %NULL for all GTK-provided style providers.
  **/
 GtkIconFactory *
 gtk_style_provider_get_icon_factory (GtkStyleProvider *provider,