Merge pull request #45 from jasmineaura/develop

[eel-background] drawable deprecations (GTK2), rendering-cleanup (GTK3)

1 files changed, 38 insertions, 33 deletions

diff --git a/eel/eel-background.h b/eel/eel-background.h
index cfccf2a1..1c2218f3 100644
--- a/eel/eel-background.h
+++ b/eel/eel-background.h
@@ -75,54 +75,59 @@ EelBackground *             eel_background_new                              (voi
 
 
 /* Calls to change a background. */
-void                        eel_background_set_use_base                     (EelBackground               *background,
-        gboolean                     use_base);
-void                        eel_background_set_color                        (EelBackground               *background,
-        const char                  *color_or_gradient);
-void                        eel_background_set_image_uri                    (EelBackground               *background,
-        const char                  *image_uri);
+void                        eel_background_set_use_base                     (EelBackground   *background,
+        								     gboolean         use_base);
+void                        eel_background_set_color                        (EelBackground   *background,
+        								     const char      *color_or_gradient);
+void                        eel_background_set_image_uri                    (EelBackground   *background,
+        								     const char      *image_uri);
 
-void                        eel_background_reset                            (EelBackground               *background);
-void                        eel_background_set_image_placement              (EelBackground               *background,
-        EelBackgroundImagePlacement  placement);
+void                        eel_background_reset                            (EelBackground   *background);
+void                        eel_background_set_image_placement              (EelBackground   *background,
+        								     EelBackgroundImagePlacement placement);
 
 /* Should be TRUE for desktop background */
-void			    eel_background_set_desktop 			    (EelBackground              *background,
-        GtkWidget *widget,
-        gboolean is_desktop);
-gboolean		    eel_background_is_desktop 			    (EelBackground              *background);
+void			    eel_background_set_desktop 			    (EelBackground   *background,
+        								     GtkWidget       *widget,
+        								     gboolean         is_desktop);
+gboolean		    eel_background_is_desktop 			    (EelBackground   *background);
 
 /* Calls to interrogate the current state of a background. */
-char *                      eel_background_get_color                        (EelBackground               *background);
-char *                      eel_background_get_image_uri                    (EelBackground               *background);
-EelBackgroundImagePlacement eel_background_get_image_placement              (EelBackground               *background);
-gboolean                    eel_background_is_dark                          (EelBackground               *background);
-gboolean                    eel_background_is_set                           (EelBackground               *background);
+char *                      eel_background_get_color                        (EelBackground   *background);
+char *                      eel_background_get_image_uri                    (EelBackground   *background);
+EelBackgroundImagePlacement eel_background_get_image_placement              (EelBackground   *background);
+gboolean                    eel_background_is_dark                          (EelBackground   *background);
+gboolean                    eel_background_is_set                           (EelBackground   *background);
 
 /* Helper function for widgets using EelBackground */
-void                        eel_background_expose                           (GtkWidget                   *widget,
-        GdkEventExpose              *event);
+#if GTK_CHECK_VERSION (3, 0, 0)
+void                        eel_background_draw                             (GtkWidget       *widget,
+        								     cairo_t   *cr)
+#else
+void                        eel_background_expose                           (GtkWidget       *widget,
+        								     GdkEventExpose  *event);
+#endif
 
 /* Handles a dragged color being dropped on a widget to change the background color. */
-void                        eel_background_receive_dropped_color            (EelBackground               *background,
-        GtkWidget                   *widget,
-        GdkDragAction                action,
-        int                          drop_location_x,
-        int                          drop_location_y,
-        const GtkSelectionData      *dropped_color);
+void                        eel_background_receive_dropped_color            (EelBackground   *background,
+        								     GtkWidget       *widget,
+        								     GdkDragAction    action,
+        								     int              drop_location_x,
+        								     int              drop_location_y,
+        								     const GtkSelectionData *dropped_color);
 
 /* Handles a special-case image name that means "reset to default background" too. */
-void                        eel_background_receive_dropped_background_image (EelBackground               *background,
-        GdkDragAction                action,
-        const char                  *image_uri);
+void                        eel_background_receive_dropped_background_image (EelBackground   *background,
+        								     GdkDragAction    action,
+        								     const char      *image_uri);
 
 /* Gets or creates a background so that it's attached to a widget. */
-EelBackground *             eel_get_widget_background                       (GtkWidget                   *widget);
-void			    eel_background_save_to_settings                    (EelBackground               *background);
+EelBackground *             eel_get_widget_background                       (GtkWidget       *widget);
+void			    eel_background_save_to_settings                 (EelBackground   *background);
 
 /* Set activity status of background. Inactive backgrounds are drawn in the theme's INSENSITIVE color. */
-void                        eel_background_set_active                       (EelBackground               *background,
-        gboolean                     is_active);
+void                        eel_background_set_active                       (EelBackground   *background,
+        								     gboolean         is_active);
 
 typedef struct EelBackgroundDetails EelBackgroundDetails;