changed some parametres

[livewp] / applet / src / livewp-main.c

diff --git a/applet/src/livewp-main.c b/applet/src/livewp-main.c
index 606de53..42e2994 100644 (file)
--- a/applet/src/livewp-main.c
+++ b/applet/src/livewp-main.c
@@ -27,10 +27,6 @@
 #include "livewp-settings.h"
 #include "livewp-home-widget.h"
 /*******************************************************************************/
-#include <X11/extensions/Xrender.h>
-#include <gdk/gdkx.h>
-
-#include <X11/Xatom.h>
 
 void 
 btn_setting_clicked(HildonButton *btn, gpointer data)
@@ -71,36 +67,59 @@ void set_live_bg (Display *display, Window xwindow, int mode)
 }
 /*******************************************************************************/
 void
+view_state_changed (Animation_WallpaperPrivate *priv)
+{
+   if (priv->visible){
+       if (priv->long_timer == 0 ){
+            priv->long_timer = g_timeout_add(LONG_TIMER, (GtkFunction)long_timeout, priv->desktop_plugin);
+            run_long_timeout(priv->desktop_plugin);
+       }
+   }else{
+        if (priv->long_timer != 0 ){
+            g_source_remove(priv->long_timer);
+            priv->long_timer = 0;
+        }
+   }
+}
+/*******************************************************************************/
+gboolean
+check_alive_event(Animation_WallpaperPrivate *priv) 
+{
+    if ( time(NULL) - priv->last_alive_event > 10*60) /* If last event later 10 minute */
+        quit_from_program(priv);
+    return TRUE;
+}
+
+/*******************************************************************************/
+void
 view_changed (GConfClient *client, guint cnxn_id,
                  GConfEntry *entry, Animation_WallpaperPrivate *priv)
 {
-    GConfValue *value;
-    value = gconf_entry_get_value (entry);
-    if (value) {
-       if (priv->view == gconf_value_get_int (value))
-           priv->visible = TRUE;
-       else
-           priv->visible = FALSE;
-       if (priv->visible){
-           if (priv->long_timer == 0 ){
-                priv->long_timer = g_timeout_add(LONG_TIMER, (GtkFunction)long_timeout, priv->desktop_plugin);
-                run_long_timeout(priv->desktop_plugin);
-           }
-       }else{
-            if (priv->long_timer != 0 ){
-                g_source_remove(priv->long_timer);
-                priv->long_timer = 0;
+   if (entry->value->type == GCONF_VALUE_INT) {
+        if (priv->view == gconf_value_get_int(entry->value)){
+            if (priv->visible != TRUE){
+                priv->visible = TRUE;
+                view_state_changed(priv);
             }
-       }
-    gconf_value_free(value);
+        }else{
+            if (priv->visible != FALSE){
+                priv->visible = FALSE;
+                view_state_changed(priv);
+            }
+        }
     }
 }
 /*******************************************************************************/
 void
 quit_from_program (Animation_WallpaperPrivate *priv)
 {
+     fprintf(stderr,"quit_from_program\n");
      if (priv){
             livewp_deinitialize_dbus(priv);
+         if (priv->view_notify != 0) { 
+            gconf_client_notify_remove (gconf_client_get_default (), priv->view_notify);
+            priv->view_notify = 0;
+         }
             if (priv->long_timer){
                    g_source_remove(priv->long_timer);
                priv->long_timer = 0;
@@ -110,8 +129,12 @@ quit_from_program (Animation_WallpaperPrivate *priv)
                    priv->short_timer = 0;
             }
             destroy_scene(priv->desktop_plugin);
-         if (priv->view_notify != 0)                                                                                                                                   
-            gconf_client_notify_remove (gconf_client_get_default (), priv->view_notify);
+         osso_deinitialize(priv->osso);
+         g_hash_table_destroy(priv->hash_scene_func);
+         g_free(priv->desktop_plugin);
+         priv->desktop_plugin = NULL;
+         g_free(priv);
+         priv = NULL;
      }
      gtk_main_quit();;
 }
@@ -120,9 +143,6 @@ int
 main(int argc, char *argv[])
 {
     GtkWidget *main_widget = NULL;
-    GtkWidget *window;
-    GtkWidget *btn_setting, *vbox, *btn_power;
-    gint result;
     HildonProgram       *app;
     int view = 1;
 
@@ -136,6 +156,7 @@ main(int argc, char *argv[])
     Animation_WallpaperPrivate *priv = g_new0 (Animation_WallpaperPrivate, 1);
     desktop_plugin->priv = priv; 
 
+    gst_init (NULL, NULL);
 
     /* Ininitializing */
     hildon_gtk_init (&argc, &argv);
@@ -157,16 +178,20 @@ main(int argc, char *argv[])
 /* Create Main GUI */
     main_widget = hildon_window_new ();
     gtk_window_set_title(GTK_WINDOW(main_widget), PACKAGE);
+    gtk_window_fullscreen(GTK_WINDOW(main_widget));
     
     gtk_widget_show_all(GTK_WIDGET(main_widget));
 
     priv->hash_scene_func = g_hash_table_new(g_str_hash, g_str_equal);
+    g_hash_table_insert(priv->hash_scene_func, g_strdup("Accel"),  (gpointer)&init_scene_Accel);
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Berlin"), (gpointer)&init_scene_Berlin);
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Modern"), (gpointer)&init_scene_Modern);
     g_hash_table_insert(priv->hash_scene_func, g_strdup("Matrix"), (gpointer)&init_scene_Matrix);
+    g_hash_table_insert(priv->hash_scene_func, g_strdup("Video"),  (gpointer)&init_scene_Video);
 
     priv->scene = NULL;
     priv->window = main_widget;
+    fprintf(stderr,"XWINDOW %i\n",GDK_WINDOW_XID (main_widget->window));
     priv->desktop_plugin = desktop_plugin;
 
     priv->view = view;
@@ -184,11 +209,13 @@ main(int argc, char *argv[])
     fprintf(stderr,"VISIBLE %i %i\n",priv->visible, current_active_view());
     gconf_client_add_dir(gconf_client_get_default (), "/apps/osso/hildon-desktop/views", GCONF_CLIENT_PRELOAD_NONE, NULL);
     priv->view_notify = gconf_client_notify_add(gconf_client_get_default (),"/apps/osso/hildon-desktop/views/current",
-                                                view_changed, priv, NULL, NULL);
+                                                (GConfClientNotifyFunc)view_changed, priv, NULL, NULL);
 
     init_scene_theme(desktop_plugin);
         
     priv->long_timer = g_timeout_add(LONG_TIMER, (GtkFunction)long_timeout, desktop_plugin);
 
+    priv->alive_timer = g_timeout_add(60000*10, (GtkFunction)check_alive_event, priv);  /* One per 10 minute */ 
     gtk_main();
+    return 0;
 }