aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-12-06 15:36:19 +0000
committerConor Curran <conor.curran@canonical.com>2010-12-06 15:36:19 +0000
commit1d73614b6c2789d11c7e63efcd22634015aff737 (patch)
tree45b2bb0453287bf51733cd55e866b5dbfefa7427 /src
parentaef17a4810d3480b64b20dd6aebd8b12e104778a (diff)
downloadayatana-indicator-sound-1d73614b6c2789d11c7e63efcd22634015aff737.tar.gz
ayatana-indicator-sound-1d73614b6c2789d11c7e63efcd22634015aff737.tar.bz2
ayatana-indicator-sound-1d73614b6c2789d11c7e63efcd22634015aff737.zip
tidy up for merge
Diffstat (limited to 'src')
-rw-r--r--src/mpris2-controller.vala7
-rw-r--r--src/sound-service.c5
2 files changed, 3 insertions, 9 deletions
diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala
index ff19598..3adaad6 100644
--- a/src/mpris2-controller.vala
+++ b/src/mpris2-controller.vala
@@ -16,7 +16,6 @@ PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-//using DBus;
using Dbusmenu;
@@ -106,7 +105,6 @@ public class Mpris2Controller : GLib.Object
changed_updates.replace("mpris:length", duration/1000000);
}
return changed_updates;
- //return null;
}
private TransportMenuitem.state determine_play_state(string? status){
@@ -156,7 +154,4 @@ public class Mpris2Controller : GLib.Object
this.mpris2_root.Raise.begin();
}
}
-}
-
-
-
+} \ No newline at end of file
diff --git a/src/sound-service.c b/src/sound-service.c
index 51f5f37..98f1881 100644
--- a/src/sound-service.c
+++ b/src/sound-service.c
@@ -40,9 +40,8 @@ service_shutdown (IndicatorService *service, gpointer user_data)
{
if (mainloop != NULL) {
g_debug("Service shutdown !");
- //TODO: uncomment for release !!
- //close_pulse_activites();
- //g_main_loop_quit(mainloop);
+ close_pulse_activites();
+ g_main_loop_quit(mainloop);
}
return;
}