checked warnings, removed theme orrery

diff --git a/applet/data/Makefile.am b/applet/data/Makefile.am
index 86ec66f..405bf62 100644 (file)
--- a/applet/data/Makefile.am
+++ b/applet/data/Makefile.am
@@ -37,8 +37,8 @@ fifteentheme_DATA = theme/Fifteen/*
 crazythemedir = $(datadir)/livewp/theme/CrazyChickens
 crazytheme_DATA = theme/CrazyChickens/* 
 
-orrerythemedir = $(datadir)/livewp/theme/Orrery
-orrerytheme_DATA = theme/Orrery/* 
+#orrerythemedir = $(datadir)/livewp/theme/Orrery
+#orrerytheme_DATA = theme/Orrery/* 
 
 videothemedir = $(datadir)/livewp/theme/Video
 videotheme_DATA = theme/Video/* 
@@ -89,7 +89,7 @@ EXTRA_DIST = $(berlintheme_DATA) \
             $(acceltheme_DATA) \
             $(fifteentheme_DATA) \
             $(crazytheme_DATA) \
-            $(orrerytheme_DATA) \
+            #$(orrerytheme_DATA) \
             $(videotheme_DATA) \
             $(xshowtheme_DATA) \
             $(conkytheme_DATA) \

diff --git a/applet/data/Makefile.in b/applet/data/Makefile.in
index fcf3ce1..a1791de 100644 (file)
--- a/applet/data/Makefile.in
+++ b/applet/data/Makefile.in
@@ -67,7 +67,7 @@ CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__installdirs = "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(colorfloodthemedir)" "$(DESTDIR)$(conkythemedir)" "$(DESTDIR)$(crazythemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(externalthemedir)" "$(DESTDIR)$(fifteenthemedir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(orrerythemedir)" "$(DESTDIR)$(videothemedir)" "$(DESTDIR)$(xsnowthemedir)"
+am__installdirs = "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(colorfloodthemedir)" "$(DESTDIR)$(conkythemedir)" "$(DESTDIR)$(crazythemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(externalthemedir)" "$(DESTDIR)$(fifteenthemedir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(videothemedir)" "$(DESTDIR)$(xsnowthemedir)"
 accelthemeDATA_INSTALL = $(INSTALL_DATA)
 berlinthemeDATA_INSTALL = $(INSTALL_DATA)
 colorfloodthemeDATA_INSTALL = $(INSTALL_DATA)
@@ -79,14 +79,13 @@ externalthemeDATA_INSTALL = $(INSTALL_DATA)
 fifteenthemeDATA_INSTALL = $(INSTALL_DATA)
 matrixthemeDATA_INSTALL = $(INSTALL_DATA)
 modernthemeDATA_INSTALL = $(INSTALL_DATA)
-orrerythemeDATA_INSTALL = $(INSTALL_DATA)
 videothemeDATA_INSTALL = $(INSTALL_DATA)
 xsnowthemeDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(acceltheme_DATA) $(berlintheme_DATA) $(colorfloodtheme_DATA) \
        $(conkytheme_DATA) $(crazytheme_DATA) $(dbus_service_DATA) \
        $(desktoppanel_DATA) $(externaltheme_DATA) \
        $(fifteentheme_DATA) $(matrixtheme_DATA) $(moderntheme_DATA) \
-       $(orrerytheme_DATA) $(videotheme_DATA) $(xsnowtheme_DATA)
+       $(videotheme_DATA) $(xsnowtheme_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -256,8 +255,9 @@ fifteenthemedir = $(datadir)/livewp/theme/Fifteen
 fifteentheme_DATA = theme/Fifteen/* 
 crazythemedir = $(datadir)/livewp/theme/CrazyChickens
 crazytheme_DATA = theme/CrazyChickens/* 
-orrerythemedir = $(datadir)/livewp/theme/Orrery
-orrerytheme_DATA = theme/Orrery/* 
+
+#orrerythemedir = $(datadir)/livewp/theme/Orrery
+#orrerytheme_DATA = theme/Orrery/* 
 videothemedir = $(datadir)/livewp/theme/Video
 videotheme_DATA = theme/Video/* 
 xsnowthemedir = $(datadir)/livewp/theme/Xsnow
@@ -282,7 +282,7 @@ EXTRA_DIST = $(berlintheme_DATA) \
             $(acceltheme_DATA) \
             $(fifteentheme_DATA) \
             $(crazytheme_DATA) \
-            $(orrerytheme_DATA) \
+            #$(orrerytheme_DATA) \
             $(videotheme_DATA) \
             $(xshowtheme_DATA) \
             $(conkytheme_DATA) \
@@ -519,23 +519,6 @@ uninstall-modernthemeDATA:
          echo " rm -f '$(DESTDIR)$(modernthemedir)/$$f'"; \
          rm -f "$(DESTDIR)$(modernthemedir)/$$f"; \
        done
-install-orrerythemeDATA: $(orrerytheme_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(orrerythemedir)" || $(mkdir_p) "$(DESTDIR)$(orrerythemedir)"
-       @list='$(orrerytheme_DATA)'; for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(orrerythemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(orrerythemedir)/$$f'"; \
-         $(orrerythemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(orrerythemedir)/$$f"; \
-       done
-
-uninstall-orrerythemeDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(orrerytheme_DATA)'; for p in $$list; do \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f '$(DESTDIR)$(orrerythemedir)/$$f'"; \
-         rm -f "$(DESTDIR)$(orrerythemedir)/$$f"; \
-       done
 install-videothemeDATA: $(videotheme_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(videothemedir)" || $(mkdir_p) "$(DESTDIR)$(videothemedir)"
@@ -578,7 +561,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-       $(mkdir_p) $(distdir)/external_themes $(distdir)/theme/Accel $(distdir)/theme/Berlin $(distdir)/theme/Colorflood $(distdir)/theme/Conky $(distdir)/theme/CrazyChickens $(distdir)/theme/Fifteen $(distdir)/theme/Matrix $(distdir)/theme/Modern $(distdir)/theme/Orrery $(distdir)/theme/Video
+       $(mkdir_p) $(distdir)/theme/Accel $(distdir)/theme/Berlin $(distdir)/theme/CrazyChickens $(distdir)/theme/Fifteen $(distdir)/theme/Matrix $(distdir)/theme/Modern
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \
@@ -609,7 +592,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-       for dir in "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(colorfloodthemedir)" "$(DESTDIR)$(conkythemedir)" "$(DESTDIR)$(crazythemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(externalthemedir)" "$(DESTDIR)$(fifteenthemedir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(orrerythemedir)" "$(DESTDIR)$(videothemedir)" "$(DESTDIR)$(xsnowthemedir)"; do \
+       for dir in "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(colorfloodthemedir)" "$(DESTDIR)$(conkythemedir)" "$(DESTDIR)$(crazythemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(externalthemedir)" "$(DESTDIR)$(fifteenthemedir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(videothemedir)" "$(DESTDIR)$(xsnowthemedir)"; do \
          test -z "$$dir" || $(mkdir_p) "$$dir"; \
        done
 install: install-am
@@ -660,8 +643,7 @@ install-data-am: install-accelthemeDATA install-berlinthemeDATA \
        install-dbus_serviceDATA install-desktoppanelDATA \
        install-externalthemeDATA install-fifteenthemeDATA \
        install-matrixthemeDATA install-modernthemeDATA \
-       install-orrerythemeDATA install-videothemeDATA \
-       install-xsnowthemeDATA
+       install-videothemeDATA install-xsnowthemeDATA
 
 install-exec-am:
 
@@ -693,8 +675,7 @@ uninstall-am: uninstall-accelthemeDATA uninstall-berlinthemeDATA \
        uninstall-desktoppanelDATA uninstall-externalthemeDATA \
        uninstall-fifteenthemeDATA uninstall-info-am uninstall-local \
        uninstall-matrixthemeDATA uninstall-modernthemeDATA \
-       uninstall-orrerythemeDATA uninstall-videothemeDATA \
-       uninstall-xsnowthemeDATA
+       uninstall-videothemeDATA uninstall-xsnowthemeDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
        distclean distclean-generic distclean-libtool distdir dvi \
@@ -706,19 +687,19 @@ uninstall-am: uninstall-accelthemeDATA uninstall-berlinthemeDATA \
        install-desktoppanelDATA install-exec install-exec-am \
        install-externalthemeDATA install-fifteenthemeDATA \
        install-info install-info-am install-man \
-       install-matrixthemeDATA install-modernthemeDATA \
-       install-orrerythemeDATA install-strip install-videothemeDATA \
-       install-xsnowthemeDATA installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am uninstall uninstall-accelthemeDATA uninstall-am \
+       install-matrixthemeDATA install-modernthemeDATA install-strip \
+       install-videothemeDATA install-xsnowthemeDATA installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am uninstall \
+       uninstall-accelthemeDATA uninstall-am \
        uninstall-berlinthemeDATA uninstall-colorfloodthemeDATA \
        uninstall-conkythemeDATA uninstall-crazythemeDATA \
        uninstall-dbus_serviceDATA uninstall-desktoppanelDATA \
        uninstall-externalthemeDATA uninstall-fifteenthemeDATA \
        uninstall-info-am uninstall-local uninstall-matrixthemeDATA \
-       uninstall-modernthemeDATA uninstall-orrerythemeDATA \
-       uninstall-videothemeDATA uninstall-xsnowthemeDATA
+       uninstall-modernthemeDATA uninstall-videothemeDATA \
+       uninstall-xsnowthemeDATA
 
 
 install-data-local:

diff --git a/applet/src/fifteen.c b/applet/src/fifteen.c
index 3de9265..498cc47 100644 (file)
--- a/applet/src/fifteen.c
+++ b/applet/src/fifteen.c
@@ -126,24 +126,24 @@ gboolean main_timer(AWallpaperPlugin *desktop_plugin)
             moving_actor(scene->timer_num, 10, desktop_plugin);
         else 
             moving_all(scene->timer_num, 15, desktop_plugin);
-        return;
+        return TRUE;
     } 
     char * accel_filename = "/sys/class/i2c-adapter/i2c-3/3-001d/coord";
     //char * accel_filename = "/home/tanya/coord";
 
-    gint direction = -1, bone;
+    gint bone;
     FILE *fd = NULL;
-    int rs, ax, ay, az, dx, dy;
+    int rs, ax, ay, az;
     fd = fopen(accel_filename, "r");
     if (fd == NULL){
         fprintf(stderr, "cannot open file\n");
-        return;
+        return TRUE;
     }
     rs = fscanf((FILE*)fd, "%i %i %i", &ax, &ay, &az);
     fclose(fd);
     if (rs != 3){
         fprintf(stderr, "cannot read information from file\n");
-        return;
+        return TRUE;
     }
 
     //fprintf(stderr, "change obj %i %i %i\n", ax, ay, az);
@@ -210,7 +210,7 @@ void
 view_state_changed (Animation_WallpaperPrivate *priv)
 {
     if (priv->visible && priv->long_timer == 0){
-        priv->long_timer = g_timeout_add(100, main_timer, priv->desktop_plugin);
+        priv->long_timer = g_timeout_add(100, (GtkFunction)main_timer, priv->desktop_plugin);
         //fprintf(stderr, "visible = 1 timeout_add %d\n", priv->long_timer);
     }else {
         //fprintf(stderr, "visible = 0 timer remove %d\n", priv->long_timer);
@@ -220,7 +220,10 @@ view_state_changed (Animation_WallpaperPrivate *priv)
     
 }
 gint
-read_config (Animation_WallpaperPrivate *priv){}
+read_config (Animation_WallpaperPrivate *priv)
+{
+    return 0;
+}
 void
 reload_scene(AWallpaperPlugin *desktop_plugin){}
 
@@ -230,8 +233,7 @@ int main( int   argc, char *argv[] )
     AWallpaperPlugin *desktop_plugin = g_new0 (AWallpaperPlugin, 1);
     Animation_WallpaperPrivate *priv = g_new0 (Animation_WallpaperPrivate, 1);
     scene = g_new0(Scene1, 1);
-    Actor *actor;
-    gint i, c, window_id=0, view=0;
+    gint c, window_id=0, view=0;
     gint pg[16];
 
     while ((c = getopt(argc, argv, ":v:w:")) != -1){
@@ -250,8 +252,8 @@ int main( int   argc, char *argv[] )
     g_set_application_name ("Fifteen");
     window = hildon_window_new ();
     //gtk_window_fullscreen (GTK_WINDOW(window));
-    gtk_window_set_title(window,"Fifteen");
-    gtk_window_set_wmclass(window,"Fifteen_exec","Fifteen_exec");
+    gtk_window_set_title(GTK_WINDOW(window),"Fifteen");
+    gtk_window_set_wmclass(GTK_WINDOW(window),"Fifteen_exec","Fifteen_exec");
     //window->window = window_id;
     g_signal_connect (G_OBJECT (window), "delete_event",
                         G_CALLBACK (gtk_main_quit), NULL);

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index 7d8a907..e4117a8 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -281,7 +281,6 @@ fprintf(stderr,"lw_applet_finalize\n");
             destroy_scene(desktop_plugin);
      }
 */    
-    fprintf(stderr,"sddddddddd1111111 %i\n", priv->view); 
      if (priv){
             switch (priv->view + 1){
                case 1: send_dbus_signal (priv, LIVEWP_SIGNAL_INTERFACE, 

diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c
index 1ea9f7b..79dbf59 100644 (file)
--- a/applet/src/livewp-scene.c
+++ b/applet/src/livewp-scene.c
@@ -272,7 +272,7 @@ init_scene_External(AWallpaperPlugin *desktop_plugin){
             id_xwindow = Window_With_Name(GDK_WINDOW_XDISPLAY (desktop_plugin->priv->window->window), 
                 RootWindow( GDK_WINDOW_XDISPLAY (desktop_plugin->priv->window->window), XDefaultScreen( GDK_WINDOW_XDISPLAY (desktop_plugin->priv->window->window))),
                 window_name);
-            fprintf(stderr,"name %s %i %i\n", window_name, id_xwindow, i);
+            //fprintf(stderr,"name %s %i %i\n", window_name, id_xwindow, i);
             if (id_xwindow>0){
                 if (desktop_plugin->priv->one_in_all_view)
                     set_live_bg (GDK_WINDOW_XDISPLAY (desktop_plugin->priv->window->window), 

diff --git a/applet/src/livewp-scene.h b/applet/src/livewp-scene.h
index 7ab9b16..8e30d94 100644 (file)
--- a/applet/src/livewp-scene.h
+++ b/applet/src/livewp-scene.h
@@ -48,5 +48,5 @@ void init_scene_External(AWallpaperPlugin *desktop_plugin);
 void init_scene_theme(AWallpaperPlugin *desktop_plugin);
 void create_hildon_actor_text(Actor *actor, AWallpaperPlugin *desktop_plugin); 
 void set_live_bg (Display *display, Window xwindow, int mode);
-
+void create_xwindow (Animation_WallpaperPrivate *priv);
 #endif

diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c
index 66efa32..90310ac 100644 (file)
--- a/applet/src/livewp-settings.c
+++ b/applet/src/livewp-settings.c
@@ -61,7 +61,6 @@ GtkWidget *
 create_category_selector (Animation_WallpaperPrivate *priv){
     GtkWidget *selector;
     GSList *store = priv->extheme_list;
-    GList *category_list;
     GHashTable *result_table = NULL;
 
     selector = hildon_touch_selector_new_text();
@@ -82,18 +81,6 @@ create_category_selector (Animation_WallpaperPrivate *priv){
             g_hash_table_insert(result_table, "Xscreensaver", (gint *)1);
             hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), "Xscreensaver");
     }
-#if 0
-
-    category_list = g_hash_table_get_keys (result_table);
-    selector = hildon_touch_selector_new_text();
-
-    hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), "LiveWallpaper" );
-    while (category_list){  
-        hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector),category_list->data );
-        fprintf(stderr, "create %s\n", category_list->data);
-        category_list = g_list_next(category_list);
-    }
-#endif
     return selector;
 }
 
@@ -499,7 +486,6 @@ lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){
     GtkWidget *area_hbox;
     GtkWidget *one_in_all_view_button; 
     gboolean one_in_all_view;
-    Animation_WallpaperPrivate *priv_temp = NULL;
 
     window = gtk_dialog_new();
     priv->window = window;
@@ -556,9 +542,9 @@ lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){
 
     if (hildon_check_button_get_active (HILDON_CHECK_BUTTON(one_in_all_view_button)) != one_in_all_view){
         save_one_in_all_views_to_config(hildon_check_button_get_active (HILDON_CHECK_BUTTON(one_in_all_view_button)));
-        fprintf(stderr,"CHECK!!!!!!!!!!!!!!\n");
+        //fprintf(stderr,"CHECK!!!!!!!!!!!!!!\n");
         banner = hildon_banner_show_information (window, NULL, _("Livewallpaper is reloading..."));
-        hildon_banner_set_timeout(banner, 3000);
+        hildon_banner_set_timeout(HILDON_BANNER(banner), 3000);
         stop_applet(1);
         stop_applet(2);
         stop_applet(3);
@@ -580,7 +566,7 @@ cb_timeout_settings(GtkWidget *window){
 
     if (window)
         gtk_widget_destroy(window);
-
+    return TRUE;
 }
 /*******************************************************************************/
 void

diff --git a/applet/src/livewp-settings.h b/applet/src/livewp-settings.h
index e67b689..e3ba33d 100644 (file)
--- a/applet/src/livewp-settings.h
+++ b/applet/src/livewp-settings.h
@@ -47,4 +47,5 @@ void show_problem_package (GtkWidget *widget, gchar *package_name);
 void changed_value_one_in_all_cb (GtkWidget *toggle, Animation_WallpaperPrivate *priv);
 void save_one_in_all_views_to_config(gboolean one_in_all_views);
 gboolean cb_timeout_settings(GtkWidget *window);
+void create_themes_buttons_hbox(Animation_WallpaperPrivate *priv);