From: spx <spx268@gmail.com>
Date: Wed, 5 Mar 2014 18:26:27 +0000 (+0900)
Subject: Ad関連の残り物を掃除
X-Git-Tag: OpenTween_v1.1.9~23
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=29b0a43;p=opentween%2Fopen-tween.git

Ad関連の残り物を掃除
---

diff --git a/OpenTween/Setting/SettingCommon.cs b/OpenTween/Setting/SettingCommon.cs
index f090a1dc..2aed4ef9 100644
--- a/OpenTween/Setting/SettingCommon.cs
+++ b/OpenTween/Setting/SettingCommon.cs
@@ -209,8 +209,6 @@ namespace OpenTween
         public int MapThumbnailZoom = 15;
         public MapProvider MapThumbnailProvider = MapProvider.OpenStreetMap;
         public bool IsListsIncludeRts = false;
-        public long GAFirst = 0;
-        public long GALast = 0;
         public bool TabMouseLock = false;
         public bool IsRemoveSameEvent = false;
         public bool IsUseNotifyGrowl = false;
@@ -220,8 +218,6 @@ namespace OpenTween
     {
         public string Username = "";
         public long UserId = 0;
-        public long GAFirst = 0;
-        public long GALast = 0;
         public string Token = "";
         [XmlIgnore]
         public string TokenSecret = "";
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 8da19633..e18cbdd4 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -2320,7 +2320,6 @@ namespace OpenTween
             }
             else
             {
-                //Google.GASender.GetInstance().TrackEventWithCategory("post", "end", tw.UserId);
                 _hookGlobalHotkey.UnregisterAllOriginalHotkey();
                 _ignoreConfigSave = true;
                 MyCommon._endingFlag = true;
@@ -3880,11 +3879,7 @@ namespace OpenTween
                                                         SettingDialog.ProxyUser,
                                                         SettingDialog.ProxyPassword);
                     this.CreatePictureServices();
-    #if UA
-                    this.SplitContainer4.Panel2.Controls.RemoveAt(0);
-                    this.ab = new AdsBrowser();
-                    this.SplitContainer4.Panel2.Controls.Add(ab);
-    #endif
+
                     try
                     {
                         if (SettingDialog.TabIconDisp)
diff --git a/OpenTween/WebBrowserController.cs b/OpenTween/WebBrowserController.cs
index 6196054c..6b2d523a 100644
--- a/OpenTween/WebBrowserController.cs
+++ b/OpenTween/WebBrowserController.cs
@@ -416,7 +416,7 @@ namespace OpenTween
                 {
                     pPolicy = WebBrowserAPI.URLPOLICY_DISALLOW;
                 }
-                if (Regex.IsMatch(pwszUrl, @"^https?://((api\.)?twitter\.com/|([a-zA-Z0-9]+\.)?twimg\.com/|ssl\.google-analytics\.com/)")) pPolicy = WebBrowserAPI.URLPOLICY_ALLOW;
+                if (Regex.IsMatch(pwszUrl, @"^https?://((api\.)?twitter\.com/|([a-zA-Z0-9]+\.)?twimg\.com/)")) pPolicy = WebBrowserAPI.URLPOLICY_ALLOW;
                 return HRESULT.S_OK;
             }
             // ActiveX実行状態かを検査しポリシー設定