Changeset 10

Timestamp:

10/28/07 03:27:07

Author:

pvanhoof

Message:

• • • • Added TMutRingtonePlayer
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/src/Makefile.am (modified) (1 diff)
• trunk/src/tmut-folder-view.c (modified) (7 diffs)
• trunk/src/tmut-ringtone-player.c (added)
• trunk/src/tmut-ringtone-player.h (added)

trunk/ChangeLog

@@ -8 +8 @@
-        * Implemented a first TMutFolderView
-        * Implemented a first TMutMsgView
+        * Added TMutRingtonePlayer
-
-2007-03-28  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/src/Makefile.am

@@ -11 +11 @@
-        tmut-folder-view.h \
-        tmut-msg-view.c \
-
+
+
+
-         
-

trunk/src/tmut-folder-view.c

@@ -20 +20 @@
-#include "tmut-folder-view.h"
-#include "tmut-msg-view.h"
+#include "tmut-ringtone-player.h"
-
-#include <tny-folder-monitor.h>
@@ -34 +35 @@
-        TnyFolderMonitor *monitor;
-        TnyFolder *folder;
+        TnyFolderObserver *ringtone_player;
-};
-
@@ -59 +61 @@
-}
-
+static void
+tmut_folder_view_deactivate_folder (TMutFolderViewPriv *priv)
+{
+        if (priv->folder) {
+                if (priv->ringtone_player)
+                        tny_folder_remove_observer (priv->folder, priv->ringtone_player);
+
+                if (priv->monitor) {
+                        tny_folder_monitor_stop (priv->monitor);
+                        g_object_unref (priv->monitor);
+                }
+
+                g_object_unref (priv->folder);
+        }
+}
+
-void 
-tmut_folder_view_set_active_folder (TMutFolderView *self, TnyFolder *folder)
@@ -65 +83 @@
-        GtkTreeModel *model = NULL;
-
-if (priv->folder)
-
+tmut_folder_view_deactivate_folder (priv);
+
-        priv->folder = TNY_FOLDER (g_object_ref (folder));
+
+        if (!priv->ringtone_player)
+                priv->ringtone_player = tmut_ringtone_player_new ();
+        tny_folder_add_observer (priv->folder, priv->ringtone_player);
-
-        model = tny_gtk_header_list_model_new ();
@@ -74 +96 @@
-                folder, FALSE, NULL, status_update, self);
-
-
-
-
-
-
+
+
-        priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (folder));
-        tny_folder_monitor_add_list (priv->monitor, TNY_LIST (model));
@@ -150 +169 @@
-        priv->progress = NULL;
-        priv->monitor = NULL;
+        priv->ringtone_player = NULL;
-
-        sw = gtk_scrolled_window_new (NULL, NULL);
@@ -186 +206 @@
-        TMutFolderViewPriv *priv = TMUT_FOLDER_VIEW_GET_PRIVATE (object);
-
-if (priv->monitor) {
-
-       g_object_unref (priv->monitor);
-}
+tmut_folder_view_deactivate_folder (priv);
+
+if (priv->ringtone_player)
+       g_object_unref (priv->ringtone_player);
-
-        if (priv->progress)