fixed some warnings

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index 8ab9f6f..baec818 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -367,9 +367,9 @@ change_tram(Actor * actor, AWallpaperPlugin *desktop_plugin)
 void
 change_plane1(Actor *actor, AWallpaperPlugin *desktop_plugin)
 {
-    gint x0 = 620, y0 = 233, scale0 = 100,
-         x1 = 79, y1 = -146, scale1 = 100, 
-         x, y, scale;
+    gint x0 = 620, y0 = 233,
+         x1 = 79, y1 = -146, 
+         x, y;
     struct timeval tvb;     
     suseconds_t ms;
     long sec;
@@ -413,9 +413,9 @@ change_plane1(Actor *actor, AWallpaperPlugin *desktop_plugin)
 void
 change_plane2(Actor *actor, AWallpaperPlugin *desktop_plugin)
 {
-    gint x0 = -actor->width, y0 = 45, scale0 = 100,
-         x1 = 800, y1 = 20, scale1 = 100, 
-         x, y, scale;
+    gint x0 = -actor->width, y0 = 45,
+         x1 = 800, y1 = 20, 
+         x, y;
     struct timeval tvb;     
     suseconds_t ms;
     long sec;
@@ -701,8 +701,7 @@ change_static_actor(Actor * actor, AWallpaperPlugin *desktop_plugin)
 void 
 change_static_actor_with_corner(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
-    gchar *newfile;
-    gchar           buffer[2048];
+    gchar buffer[2048];
 
     if (desktop_plugin->priv->right_corner)
         gtk_widget_destroy(desktop_plugin->priv->right_corner);
@@ -921,7 +920,7 @@ init_scene(AWallpaperPlugin *desktop_plugin)
   actor = init_object(desktop_plugin, "sun", "sun.png", 
                       0, 0, 6, 88, 88, 
                       TRUE, TRUE, 100, 255, 
-                      (gpointer)&change_sun, &probability_sun, NULL);
+                      (gpointer)&change_sun, (gpointer)&probability_sun, NULL);
   actor->time_start_animation = now;
   actor->duration_animation = G_MAXINT;
   change_sun(actor, desktop_plugin);
@@ -1229,7 +1228,7 @@ init_scene1(AWallpaperPlugin *desktop_plugin)
   
   actor = init_object(desktop_plugin, "sun", "sun.png", 0, 0, 6, 88, 88, 
                       TRUE, TRUE, 100, 255, 
-                      (gpointer)&change_sun, &probability_sun, NULL);
+                      (gpointer)&change_sun, (gpointer)&probability_sun, NULL);
   actor->time_start_animation = time(NULL);
   actor->duration_animation = G_MAXINT;
   change_sun(actor, desktop_plugin);
@@ -1455,7 +1454,7 @@ change_actor(GtkWidget * actor)
 static gboolean
 short_timeout (AWallpaperPlugin *desktop_plugin)
 {
-    gint daytime = get_daytime();
+    //gint daytime = get_daytime();
     GSList * tmp;
     void (*pfunc)(gpointer, gpointer);
     time_t now;
@@ -1585,6 +1584,7 @@ gboolean
 rich_animation_press(GtkWidget *widget, GdkEvent *event,
                                             gpointer user_data){
     fprintf(stderr,"gggggggggggggggggggg2222\n");
+    return FALSE;
 }    
 static void
 animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)

diff --git a/applet/src/livewp-home-widget.h b/applet/src/livewp-home-widget.h
index cbe14a5..62bad32 100644 (file)
--- a/applet/src/livewp-home-widget.h
+++ b/applet/src/livewp-home-widget.h
@@ -74,6 +74,7 @@ void lw_settings(GtkWidget *widget, gpointer user_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);
 static void init_scene(AWallpaperPlugin *desktop_plugin);
 static void init_scene1(AWallpaperPlugin *desktop_plugin);
 static void init_scene2(AWallpaperPlugin *desktop_plugin);

diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c
index 388aa2b..275006a 100644 (file)
--- a/applet/src/livewp-settings.c
+++ b/applet/src/livewp-settings.c
@@ -164,64 +164,3 @@ lw_settings(GtkWidget *widget, Animation_WallpaperPrivate *priv){
         gtk_widget_destroy(window);
 }
 
-GtkWidget* 
-create_settings(void){
-    gint result;
-    GtkWidget *window = NULL;
-    GtkWidget *save_button;
-    GtkWidget *theme_button;
-    GtkWidget *rich_animation_button;
-
-    window = gtk_dialog_new();
-    gtk_window_set_title(GTK_WINDOW(window), _("Live Wallpaper Settings"));
-    gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-    gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-    /* Create Theme button */
-    theme_button = create_themes_button("Modern");
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
-                                   theme_button, TRUE, TRUE, 5);
-    /* Create rich animation button */  
-    rich_animation_button = create_rich_animation_button(TRUE);
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
-                                   rich_animation_button, TRUE, TRUE, 5);
-    gtk_widget_show (theme_button);
-    gtk_widget_show (rich_animation_button);
-    gtk_widget_show (window);
-    gtk_dialog_add_button(GTK_DIALOG(window), _("About"), GTK_RESPONSE_NO);
-    save_button = gtk_dialog_add_button(GTK_DIALOG(window), _("Save"), GTK_RESPONSE_YES);
-#if 0
-    result = gtk_dialog_run(GTK_DIALOG(window));
-
-    switch(result){
-        case GTK_RESPONSE_YES:
-            if (hildon_button_get_value(HILDON_BUTTON (theme_button))){
-                if (priv->theme)
-                    g_free(priv->theme);
-                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Berlin")))
-                    priv->theme = g_strdup("Berlin");
-                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Modern")))
-                    priv->theme = g_strdup("Modern");
-                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Matrix")))
-                    priv->theme = g_strdup("Matrix");
-                if (hildon_check_button_get_active (rich_animation_button))
-                    priv->rich_animation = TRUE;
-                else
-                    priv->rich_animation = FALSE;
-            }
-            save_config(priv);
-            reload_scene(priv->desktop_plugin);
-        break;
-        default:
-        case GTK_RESPONSE_OK:
-        break;
-        case GTK_RESPONSE_NO:
-            gtk_widget_destroy(window);
-            window = NULL;
-            lw_about();
-        break;
-    }
-    if (window)
-        gtk_widget_destroy(window);
-#endif
-    return window;
-}