From: Vlad Date: Mon, 6 Sep 2010 12:14:16 +0000 (+0300) Subject: fixed problem with hildonmessage window. fixed problem with Makefile.am X-Git-Url: http://vcs.maemo.org/git/?p=livewp;a=commitdiff_plain;h=4df722cbbe2b4395248c1c703d1fae7d2ff35eb9 fixed problem with hildonmessage window. fixed problem with Makefile.am file --- diff --git a/applet/data/Makefile b/applet/data/Makefile index 64c22f5..35b5e26 100644 --- a/applet/data/Makefile +++ b/applet/data/Makefile @@ -55,7 +55,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_triplet = arm-unknown-linux-gnueabi +host_triplet = i486-pc-linux-gnu subdir = data DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -93,22 +93,22 @@ ALL_LINGUAS = ru_RU fi_FI es_ES es_MX AMDEP_FALSE = # AMDEP_TRUE = AMTAR = ${SHELL} /home/vlad/livewp/applet/missing --run tar -AR = arm-linux-gnueabi-ar +AR = i486-linux-gnu-ar AUTOCONF = ${SHELL} /home/vlad/livewp/applet/missing --run autoconf AUTOHEADER = ${SHELL} /home/vlad/livewp/applet/missing --run autoheader AUTOMAKE = ${SHELL} /home/vlad/livewp/applet/missing --run automake-1.8 AWK = gawk CATALOGS = ru_RU.gmo fi_FI.gmo es_ES.gmo es_MX.gmo CATOBJEXT = .gmo -CC = arm-linux-gnueabi-gcc +CC = i486-linux-gnu-gcc CCDEPMODE = depmode=gcc3 CFLAGS = -Wall -g -O2 CONTROLPANEL_CFLAGS = -DMAEMO_CHANGES -DMAEMO_GTK -I/usr/include/hildon-1 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 CONTROLPANEL_LIBS = -lhildon-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -CPP = arm-linux-gnueabi-gcc -E +CPP = i486-linux-gnu-gcc -E CPPFLAGS = -CXX = arm-linux-gnueabi-g++ -CXXCPP = arm-linux-gnueabi-g++ -E +CXX = i486-linux-gnu-g++ +CXXCPP = i486-linux-gnu-g++ -E CXXDEPMODE = depmode=gcc3 CXXFLAGS = -g -O2 CYGPATH_W = echo @@ -189,13 +189,13 @@ POFILES = ru_RU.po fi_FI.po es_ES.po es_MX.po POSUB = po PO_IN_DATADIR_FALSE = PO_IN_DATADIR_TRUE = -RANLIB = arm-linux-gnueabi-ranlib +RANLIB = i486-linux-gnu-ranlib SED = /scratchbox/tools/bin/sed SET_MAKE = SHELL = /bin/sh SQLITE_CFLAGS = SQLITE_LIBS = -lsqlite3 -STRIP = arm-linux-gnueabi-strip +STRIP = i486-linux-gnu-strip USE_NLS = yes VERSION = 0.9 XGETTEXT = /scratchbox/tools/bin/xgettext @@ -210,21 +210,21 @@ am__include = include am__leading_dot = . am__quote = bindir = ${exec_prefix}/bin -build = arm-unknown-linux-gnueabi -build_alias = arm-linux-gnueabi -build_cpu = arm -build_os = linux-gnueabi -build_vendor = unknown +build = i486-pc-linux-gnu +build_alias = i486-linux-gnu +build_cpu = i486 +build_os = linux-gnu +build_vendor = pc datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = arm-unknown-linux-gnueabi -host_alias = arm-linux-gnueabi -host_cpu = arm -host_os = linux-gnueabi -host_vendor = unknown +host = i486-pc-linux-gnu +host_alias = i486-linux-gnu +host_cpu = i486 +host_os = linux-gnu +host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${prefix}/share/info diff --git a/applet/src/Makefile.am b/applet/src/Makefile.am index dccafe4..2bf589c 100644 --- a/applet/src/Makefile.am +++ b/applet/src/Makefile.am @@ -1,27 +1,24 @@ -/*vim: set sw=4 ts=4 et: */ -/* - * This file is part of Live Wallpaper (livewp) - * - * Copyright (C) 2010 Vlad Vasiliev - * Copyright (C) 2010 Tanya Makova - * for the code - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA -*/ -/*******************************************************************************/ + # This file is part of Live Wallpaper (livewp) + # + # Copyright (C) 2010 Vlad Vasiliev + # Copyright (C) 2010 Tanya Makova + # for the code + # + # This software is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License + # as published by the Free Software Foundation; either version 2 of + # the License, or (at your option) any later version. + # + # This software is distributed in the hope that it will be useful, but + # WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + # Lesser General Public License for more details. + # + # You should have received a copy of the GNU Lesser General Public + # License along with this software; if not, write to the Free Software + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + # 02110-1301 USA + SOURCE_FILES = livewp-main.c \ livewp-home-widget.c livewp-home-widget.h \ livewp-astro.c livewp-astro.h \ diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c index 01e9303..7d8a907 100644 --- a/applet/src/livewp-home-widget.c +++ b/applet/src/livewp-home-widget.c @@ -298,16 +298,12 @@ fprintf(stderr,"lw_applet_finalize\n"); break; } } - fprintf(stderr,"sddddddddd222222222222\n"); if(priv->alive_timer > 0) g_source_remove(priv->alive_timer); - fprintf(stderr,"sddddddddd222333333222222222\n"); livewp_deinitialize_dbus(priv); - fprintf(stderr,"sddddddddd222334333222222222\n"); if (priv->pid >0){ - fprintf(stderr,"sddddddddd22233433333333333333333333322222233222222222\n"); while (TRUE){ wpid = wait(&status); if (wpid == priv->pid) diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c index b81e107..66efa32 100644 --- a/applet/src/livewp-settings.c +++ b/applet/src/livewp-settings.c @@ -559,26 +559,28 @@ lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){ fprintf(stderr,"CHECK!!!!!!!!!!!!!!\n"); banner = hildon_banner_show_information (window, NULL, _("Livewallpaper is reloading...")); hildon_banner_set_timeout(banner, 3000); - gtk_widget_show(banner); - gtk_main_iteration_do(FALSE); stop_applet(1); stop_applet(2); stop_applet(3); stop_applet(4); - sleep(1); - gtk_main_iteration_do(FALSE); - sleep(1); - gtk_main_iteration_do(FALSE); - sleep(1); - gtk_main_iteration_do(FALSE); - start_applet(1); - start_applet(2); - start_applet(3); - start_applet(4); - + g_timeout_add(3000, (GSourceFunc)cb_timeout_settings, window); + }else{ + if (window) + gtk_widget_destroy(window); } +} +/*******************************************************************************/ +gboolean +cb_timeout_settings(GtkWidget *window){ + + start_applet(1); + start_applet(2); + start_applet(3); + start_applet(4); + if (window) gtk_widget_destroy(window); + } /*******************************************************************************/ void diff --git a/applet/src/livewp-settings.h b/applet/src/livewp-settings.h index 1bf1a3e..e67b689 100644 --- a/applet/src/livewp-settings.h +++ b/applet/src/livewp-settings.h @@ -46,3 +46,5 @@ GSList * get_list_exthemes(void); 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); +