Merge lp:~laney/do-plugins/notificationpref into lp:do-plugins

[Iain Lane]

[Iain Lane (laney)]

This branch adds an extra preference to the microblogging plugin which allows users to disable notifications for new direct messages. I prefer not to be notified of this event, and I'm sure many other users also do too. The pref defaults to true so there will be no change for anyone who is used to the current behaviour.

One obvious improvement is to not poll the service if the pref is disabled (for both of the microblogging notification preferences).

[lp:~laney/do-plugins/notificationpref]

551. By Jason Smith on 2009-02-28

Speed fix

552. By Alex Launi on 2009-02-28

Merge Fix to not show direct messages

=== modified file 'Microblogging/gtk-gui/Microblogging.GenConfig.cs'
--- Microblogging/gtk-gui/Microblogging.GenConfig.cs	2009-01-05 01:32:46 +0000
+++ Microblogging/gtk-gui/Microblogging.GenConfig.cs	2009-02-28 02:17:00 +0000
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <autogenerated>
 //      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
+//      
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if 
 //      the code is regenerated.
@@ -23,6 +23,8 @@
         
         private Gtk.CheckButton show_updates_chk;
         
+        private Gtk.CheckButton show_dms_chk;
+        
         private Gtk.Label GtkLabel1;
         
         protected virtual void Build() {
@@ -61,6 +63,19 @@
             w1.Expand = false;
             w1.Fill = false;
             w1.Padding = ((uint)(5));
+            // Container child vbox2.Gtk.Box+BoxChild
+            this.show_dms_chk = new Gtk.CheckButton();
+            this.show_dms_chk.CanFocus = true;
+            this.show_dms_chk.Name = "show_dms_chk";
+            this.show_dms_chk.Label = Mono.Unix.Catalog.GetString("Show direct messages");
+            this.show_dms_chk.Active = true;
+            this.show_dms_chk.DrawIndicator = true;
+            this.show_dms_chk.UseUnderline = true;
+            this.vbox2.Add(this.show_dms_chk);
+            Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox2[this.show_dms_chk]));
+            w2.Position = 1;
+            w2.Expand = false;
+            w2.Fill = false;
             this.GtkAlignment.Add(this.vbox2);
             this.frame1.Add(this.GtkAlignment);
             this.GtkLabel1 = new Gtk.Label();
@@ -69,14 +84,15 @@
             this.GtkLabel1.UseMarkup = true;
             this.frame1.LabelWidget = this.GtkLabel1;
             this.vbox1.Add(this.frame1);
-            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox1[this.frame1]));
-            w4.Position = 0;
+            Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.vbox1[this.frame1]));
+            w5.Position = 0;
             this.Add(this.vbox1);
             if ((this.Child != null)) {
                 this.Child.ShowAll();
             }
             this.Show();
             this.show_updates_chk.Clicked += new System.EventHandler(this.OnShowUpdatesChkClicked);
+            this.show_dms_chk.Clicked += new System.EventHandler(this.OnShowDMsChkClicked);
         }
     }
 }

=== modified file 'Microblogging/gtk-gui/generated.cs'
--- Microblogging/gtk-gui/generated.cs	2009-01-05 01:32:46 +0000
+++ Microblogging/gtk-gui/generated.cs	2009-02-28 02:17:00 +0000
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <autogenerated>
 //      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
+//      
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if 
 //      the code is regenerated.

=== modified file 'Microblogging/src/GenConfig.cs'
--- Microblogging/src/GenConfig.cs	2009-02-27 04:50:49 +0000
+++ Microblogging/src/GenConfig.cs	2009-02-28 02:17:00 +0000
@@ -32,11 +32,17 @@
 		{
 			this.Build();
 			show_updates_chk.Active = Microblog.Preferences.ShowNotifications;
+			show_dms_chk.Active = Microblog.Preferences.ShowDirectMessages;
 		}
 		
 		protected virtual void OnShowUpdatesChkClicked (object sender, EventArgs e)
 		{
 			Microblog.Preferences.ShowNotifications = show_updates_chk.Active;
 		}
+		
+		protected virtual void OnShowDMsChkClicked (object sender, EventArgs e)
+		{
+			Microblog.Preferences.ShowDirectMessages = show_dms_chk.Active;
+		}
 	}
 }

=== modified file 'Microblogging/src/Microblog.cs'
--- Microblogging/src/Microblog.cs	2009-02-27 04:50:49 +0000
+++ Microblogging/src/Microblog.cs	2009-02-28 02:17:00 +0000
@@ -92,7 +92,8 @@
 
 		static void DirectMessageFound (object sender, TimelineUpdatedEventArgs args)
 		{
-			notifications.Notify (new DirectMessageNotification (args.Screenname, args.Screenname, args.Icon));
+			if (!Preferences.ShowDirectMessages) return;
+			notifications.Notify (new DirectMessageNotification (args.Screenname, args.Status, args.Icon));
 		}
 		
 		static void ServiceChanged (object sender, EventArgs args)

=== modified file 'Microblogging/src/Preferences.cs'
--- Microblogging/src/Preferences.cs	2008-12-22 03:41:02 +0000
+++ Microblogging/src/Preferences.cs	2009-02-28 02:17:00 +0000
@@ -36,9 +36,11 @@
 		const string PasswordKey = "{0}/Password";
 		const string MicroblogServiceKey = "Service";
 		const string ShowNotificationsKey = "ShowFriendUpdates";
+		const string ShowDirectMessagesKey = "ShowFriendDirectMessages";
 		
 		const string MicroblogServiceDefault = "twitter";
 		const bool ShowNotificationsDefault = true;
+		const bool ShowDirectMessagesDefault = true;
 		
 		#endregion
 	
@@ -66,6 +68,11 @@
 			set { prefs.Set<bool> (ShowNotificationsKey, value); }
 		}
 		
+		public bool ShowDirectMessages {
+			get { return prefs.Get<bool> (ShowDirectMessagesKey, ShowDirectMessagesDefault); }
+			set { prefs.Set<bool> (ShowDirectMessagesKey, value); }
+		}
+		
 		public string MicroblogService {
 			get { return active_service; }
 			set {