Remove everything libpurple-related

diff --git a/lib/App/XMMS2/Notifier.pm b/lib/App/XMMS2/Notifier.pm
index b0a2f4458ee8a249b82599b5d3b6bab83dc21d52..d04b638abc192b126291b5df501a1bffae6a7395 100644 (file)
--- a/lib/App/XMMS2/Notifier.pm
+++ b/lib/App/XMMS2/Notifier.pm
@@ -13,13 +13,9 @@ use constant CONVERSION_SPECIFIERS => qw/bitrate date sample_format url id chann
 
 ##################################################
 
 
 ##################################################
 

-my $use_libnotify = 1;
-my $use_libpurple;

 my $format = '$artist - $title';
 
 GetOptions (
 my $format = '$artist - $title';
 
 GetOptions (

-       "libnotify!" => \$use_libnotify,
-       "libpurple!" => \$use_libpurple,

        "format=s" => \$format,
 );
 
        "format=s" => \$format,
 );
 


@@ -43,8 +39,7 @@ sub notify{
        my $str=$format;
        $str =~ s/\$$_/$metadata{$_}/g for keys %metadata;
 
        my $str=$format;
        $str =~ s/\$$_/$metadata{$_}/g for keys %metadata;
 

-       notify_libnotify $str if $use_libnotify;
-       # notify_libpurple $str if $use_libpurple;
+       notify_libnotify $str

 }
 
 sub on_playback_current_id {
 }
 
 sub on_playback_current_id {

diff --git a/t/test.t b/t/test.t
index 5f945bc75353e5b90883dd6962bfd7220f02f2fa..4d39474cea54a1091b8353b5ee5870451ea86216 100644 (file)
--- a/t/test.t
+++ b/t/test.t
@@ -1,14 +1,10 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl

 use v5.14;
 use v5.14;

+use warnings;

 
 

-use Test::More tests => 3;
+use Test::More tests => 2;

 BEGIN { use_ok('App::XMMS2::Notifier') };
 
 #########################
 
 can_ok('App::XMMS2::Notifier', qw/run notify_libnotify/);
 BEGIN { use_ok('App::XMMS2::Notifier') };
 
 #########################
 
 can_ok('App::XMMS2::Notifier', qw/run notify_libnotify/);

-
-TODO: {
-       local $TODO = 'libpurple notify not written yet';
-       can_ok('App::XMMS2::Notifier', 'notify_libpurple');
-}

diff --git a/xmms2-notifier b/xmms2-notifier
index 437b68167217465efde2aef794a518c6dc5eaf73..262d6b5adb38d9d1c357bb9c12714e0e107e6ce6 100755 (executable)
--- a/xmms2-notifier
+++ b/xmms2-notifier
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl

 use v5.14;
 use warnings;
 
 use v5.14;
 use warnings;