removed comments

diff --git a/applet/debian/changelog b/applet/debian/changelog
index a88804f..0ec9f71 100644 (file)
--- a/applet/debian/changelog
+++ b/applet/debian/changelog
@@ -2,8 +2,12 @@ live-wallpaper (0.5) unstable; urgency=low
 
   * Removed unusable menu icon again
   * Added icon to package
+  * Added icon in the control panel applet
+  * Added start/stop applet button in the control panel
+  * Added billboard in Modern theme with information about missing calls, sms, emails and chats
+  * Updated Russian, Spanish, Finnish translation
 
- -- Vlad Vasiliev <vlad@gas.by>  Sun, 02 May 2010 21:29:10 +0200
+ -- Vlad Vasiliev <vlad@gas.by>  Fri, 11 Jun 2010 21:29:10 +0200
 
 live-wallpaper (0.4.2) unstable; urgency=low
 

diff --git a/applet/src/livewp-actor.c b/applet/src/livewp-actor.c
index f169e0b..8e4e0a3 100644 (file)
--- a/applet/src/livewp-actor.c
+++ b/applet/src/livewp-actor.c
@@ -117,7 +117,7 @@ set_actor_position(Actor *actor, gint x, gint y, gint z, AWallpaperPlugin *deskt
 int get_notify_count(gchar *notify_type)
 {
     sqlite3 *db = NULL;
-    sqlite3 *res = NULL;
+    sqlite3_stmt *res = NULL;
     gint rc = 0, result = 0;
     gchar sql[1024];
 
@@ -182,13 +182,10 @@ gchar * read_notification()
 void 
 change_billboard(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
-    GtkWidget *label;
-    gchar *mes = NULL, *message = NULL;
-    PangoFontDescription *pfd = NULL;
     gint count = 0;
     Actor *a = NULL;
      
-    fprintf(stderr, "change_billboard\n");   
+    //fprintf(stderr, "change_billboard\n");   
     
     if (desktop_plugin->priv->scene->notification < time(NULL)){
         count = get_notify_count("general_missed");
@@ -220,22 +217,12 @@ change_billboard(Actor * actor, AWallpaperPlugin *desktop_plugin)
             set_actor_visible(a, FALSE);
         }
 
-        #if 0
-        message = read_notification();
-        label = actor->image;
-        mes = g_markup_printf_escaped("<span bgcolor=\"%s\" foreground=\"%s\">%s</span>", "#FFFFFF", "#000000", message);
-        gtk_label_set_markup(GTK_LABEL(label), mes);
-        pfd = pango_font_description_from_string("Sans 16");
-        gtk_widget_modify_font(GTK_WIDGET(label), NULL);
-        gtk_widget_modify_font(GTK_WIDGET(label), pfd);
-        pango_font_description_free(pfd);
-#endif
         desktop_plugin->priv->scene->notification = FALSE;
     }
     actor->time_start_animation = time(NULL) + 20;    
 }
 
-
+#if 0
 void 
 change_billboard1(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
@@ -253,7 +240,7 @@ change_billboard1(Actor * actor, AWallpaperPlugin *desktop_plugin)
         fprintf(stderr, "error open db %d %s\n", rc, sqlite3_errmsg(db));
     }else {
         snprintf(sql, sizeof(sql)-1, "select count(id) from Events where event_type_id=%d", 3);
-//#if 0
+
         rc = sqlite3_prepare(db, sql, sizeof(sql)-1, &res, NULL);
         if (rc != SQLITE_OK){
             fprintf(stderr, "error prepare %d %s\n", rc, sql);
@@ -277,7 +264,7 @@ change_billboard1(Actor * actor, AWallpaperPlugin *desktop_plugin)
         //fprintf(stderr, "count sms = %d\n", sms_count);
         sqlite3_finalize(res);
 
-//#endif
+
         sqlite3_close(db);
     }
     label = actor->image;
@@ -290,7 +277,7 @@ change_billboard1(Actor * actor, AWallpaperPlugin *desktop_plugin)
     pango_font_description_free(pfd);
     actor->time_start_animation = time(NULL) + 20;    
 }
-
+#endif
 
 void 
 change_moon(Actor * actor, AWallpaperPlugin *desktop_plugin)

diff --git a/applet/src/livewp-dbus.c b/applet/src/livewp-dbus.c
index 7dadc5b..4ccddb7 100644 (file)
--- a/applet/src/livewp-dbus.c
+++ b/applet/src/livewp-dbus.c
@@ -124,9 +124,11 @@ send_dbus_signal (Animation_WallpaperPrivate *priv,
   success = dbus_connection_send (priv->dbus_conn_session, message, NULL);
   dbus_message_unref (message);
   
+#if 0
   fprintf (stderr, "%s '%s' message.\n",
                                  success ? "Sent" : "Failed to send",
                                  member);
+#endif
 
 }
 
@@ -139,7 +141,7 @@ get_livewp_signal_cb(DBusConnection *conn, DBusMessage *msg, Animation_Wallpaper
     START_FUNCTION;
 #endif
 
-    fprintf (stderr, "PATH11111111111111111111 %s %s %s\n",   dbus_message_get_path(msg),   dbus_message_get_interface (msg), dbus_message_get_member (msg));
+    //fprintf (stderr, "PATH11111111111111111111 %s %s %s\n",   dbus_message_get_path(msg),   dbus_message_get_interface (msg), dbus_message_get_member (msg));
     if (dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_RELOAD_CONFIG)){
         if(read_config(priv)){
                 fprintf(stderr, "\nCan not read config file.\n");
@@ -150,14 +152,14 @@ get_livewp_signal_cb(DBusConnection *conn, DBusMessage *msg, Animation_Wallpaper
 #endif
         }
     }
-    fprintf(stderr, "Type %i\n", dbus_message_get_type (msg));
+    //fprintf(stderr, "Type %i\n", dbus_message_get_type (msg));
     if (dbus_message_is_method_call(msg, NOTIFY_SIGNAL_INTERFACE, NOTIFY_MEMBER)){
-        fprintf(stderr,"read notifications.db notify\n");    
+        //fprintf(stderr,"read notifications.db notify\n");    
         //read_notification(priv->desktop_plugin);
         priv->scene->notification = time(NULL) + 10;
     }
     if (dbus_message_is_signal(msg, NOTIFY_SIGNAL_INTERFACE, CLOSENOTIFY_MEMBER)){
-        fprintf(stderr,"read notifications.db close notify\n");    
+        //fprintf(stderr,"read notifications.db close notify\n");    
         //read_notification(priv->desktop_plugin);
         priv->scene->notification = time(NULL) + 10;
     }

diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c
index 8c2733a..b0178b1 100644 (file)
--- a/applet/src/livewp-home-widget.c
+++ b/applet/src/livewp-home-widget.c
@@ -480,9 +480,9 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
     init_applet_position(&(priv->xapplet), &(priv->yapplet));
 
     
-    fprintf(stderr, "!!!theme = %s\n", priv->theme);
+    //fprintf(stderr, "!!!theme = %s\n", priv->theme);
     snprintf(str, sizeof(str) - 1, "%s", "init_scene2");
-    fprintf(stderr, " str = %s\n", str);
+    //fprintf(stderr, " str = %s\n", str);
     priv->scene = NULL;
 #if 0
     if (!strcmp(priv->theme,"Modern"))

diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c
index d59acea..32502ba 100644 (file)
--- a/applet/src/livewp-scene.c
+++ b/applet/src/livewp-scene.c
@@ -76,7 +76,7 @@ init_scene_Matrix(AWallpaperPlugin *desktop_plugin)
       y2 = -480;
   }
 
-  fprintf(stderr, "init scene2 \n");
+  //fprintf(stderr, "init scene2 \n");
   scene = g_new0(Scene, 1);
   //scene.daytime = get_daytime();
   scene->actors = NULL;