tryed to fix problem with updating of package

[livewp] / applet / src / livewp-home-widget.h

diff --git a/applet/src/livewp-home-widget.h b/applet/src/livewp-home-widget.h
index 8aa868c..49b5215 100644 (file)
--- a/applet/src/livewp-home-widget.h
+++ b/applet/src/livewp-home-widget.h
@@ -25,21 +25,19 @@
 #define Animation_Wallpaper_PLUGIN_H
 
 #include <glib-object.h>
-
-#include <libhildondesktop/libhildondesktop.h>
+#include "livewp-actor.h"
+#include "livewp-scene.h"
 
 G_BEGIN_DECLS
 
-typedef struct _AWallpaperPlugin AWallpaperPlugin;
-typedef struct _AWallpaperPluginClass AWallpaperPluginClass;
 
-#define Animation_Wallpaper_TYPE_HOME_PLUGIN (animation_wallpaper_home_plugin_get_type ())
+#define Animation_Wallpaper_TYPE_HOME_PLUGIN (animation_wallpaper_plugin_get_type ())
 
 #define Animation_Wallpaper_HOME_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-                        Animation_Wallpaper_TYPE_HOME_PLUGIN, AWallpaperHomePlugin))
+                        Animation_Wallpaper_TYPE_HOME_PLUGIN, AWallpaperPlugin))
 
 #define Animation_Wallpaper_HOME_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
-                        Animation_Wallpaper_TYPE_HOME_PLUGIN, AWallpaperHomePluginClass))
+                        Animation_Wallpaper_TYPE_HOME_PLUGIN, AWallpaperPluginClass))
 
 #define Animation_Wallpaper_IS_HOME_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
                         Animation_Wallpaper_TYPE_HOME_PLUGIN))
@@ -48,57 +46,34 @@ typedef struct _AWallpaperPluginClass AWallpaperPluginClass;
                         Animation_Wallpaper_TYPE_HOME_PLUGIN))
 
 #define Animation_Wallpaper_HOME_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-                        Animation_Wallpaper_TYPE_HOME_PLUGIN, AWallpaperHomePluginClass))
-
-typedef struct _Animation_WallpaperPrivate Animation_WallpaperPrivate;
-
-struct _AWallpaperPlugin
-{
-    HDHomePluginItem hitem;
-    GObject *parent;
-    gint timer;
-    Animation_WallpaperPrivate *priv;
-};
+                        Animation_Wallpaper_TYPE_HOME_PLUGIN, AWallpaperPluginClass))
 
-struct _AWallpaperPluginClass
-{
-    HDHomePluginItemClass parent_class;
-
-};
-
-typedef struct {
-    GtkWidget * window;
-    GSList * static_actors;
-    GSList * dynamic_actors;
-    gint daytime;
-} Scene;
 
+/*
 typedef struct {
-    GtkWidget * widget;
-    gchar * name;
-    GtkWidget * image;
-    gint x;
-    gint y;
-    gint z;
-    double scale;
-    gboolean visible;
-
-} Actor;
+    time_t timestart;
+    gint timeall;
+    gint count;
+    GtkWidget *actor;
+    void (*func_change)(GtkWidget *, double);
+    gint (*func_time)(gint);
+} Animation;
+*/
 
-GType animation_wallpaper_home_plugin_get_type(void);
+GType animation_wallpaper_plugin_get_type(void);
 
+Animation_WallpaperPrivate* animation_wallpaper_plugin_new (void);
 G_END_DECLS
-
-struct _Animation_WallpaperPrivate
-{
-      gpointer data;
-};
-void live_wallpaper_settings(GtkWidget *widget, gpointer user_data);
-MultiActor *multiactor_init(gchar * name, GSList * child, gint x, gint y, gint z, double scale, gboolean visible);
-void multiactor_set_visible(MultiActor *ma, gboolean visible);
-void multiactor_set_scale(MultiActor *ma, double scale);
-void multiactor_set_position(MultiActor *ma, gint dx, gint dy, gint dz);
-void actor_set_position_full(GtkWidget *actor, gint x, gint y, gint z);
-
-
+void lw_settings(gpointer user_data, gpointer data);
+//void actor_set_position_full(GtkWidget *actor, gint x, gint y, gint z);
+gint read_config(Animation_WallpaperPrivate *priv);
+void save_config(Animation_WallpaperPrivate *priv);
+void run_long_timeout(AWallpaperPlugin *desktop_plugin);
+//void set_actor_visible(Actor *actor, gboolean visible);
+//void set_actor_scale(Actor *actor, double scalex, double scaley);
+void create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin);
+void get_sun_screen_pos(double alt, double azm, gint * x, gint * y);
+void show_settings(GtkWidget *widget, Animation_WallpaperPrivate *priv);
+void livewp_initialize_dbus(Animation_WallpaperPrivate *priv);
+void livewp_deinitialize_dbus(Animation_WallpaperPrivate *priv);
 #endif