View | Details | Raw Unified
Collapse All | Expand All

(-) ephy-adblock-extension.c (-14 / +12 lines)
 Lines 270-280    Link Here  
	statusbar = EPHY_STATUSBAR (ephy_window_get_statusbar (window));
	statusbar = EPHY_STATUSBAR (ephy_window_get_statusbar (window));
	g_return_if_fail (statusbar != NULL);
	g_return_if_fail (statusbar != NULL);

            

              
	frame = g_object_get_data (G_OBJECT (statusbar), STATUSBAR_FRAME_KEY);

              
	frame = g_object_steal_data (G_OBJECT (statusbar), STATUSBAR_FRAME_KEY);

            

            

              
	evbox = g_object_get_data (G_OBJECT (statusbar), STATUSBAR_EVBOX_KEY);

              
	evbox = g_object_steal_data (G_OBJECT (statusbar), STATUSBAR_EVBOX_KEY);

            

            

              

              

            

            

              
	g_object_set_data (G_OBJECT (statusbar), STATUSBAR_FRAME_KEY, NULL);

              

            

            

              
	g_object_set_data (G_OBJECT (statusbar), STATUSBAR_EVBOX_KEY, NULL);

              

            

        

        
	g_return_if_fail (frame != NULL);
	g_return_if_fail (frame != NULL);

        
	g_return_if_fail (evbox != NULL);
	g_return_if_fail (evbox != NULL);

  

    

    

       Lines 365-371
       
    
  Link Here 
    

  

        
}
}

        

        
static AdBlocker *
static AdBlocker *

            

              
ensure_adblocker (EphyWindow *window, EphyEmbed *embed)

              
ensure_adblocker (EphyWindow *window,

            

            

              

              
		  EphyEmbed *embed)

            

        
{
{

        
	AdBlocker *blocker;
	AdBlocker *blocker;

        

  

    

    

       Lines 382-400
       
    
  Link Here 
    

  

        
		blocker = ad_blocker_new (ext->priv->tester);
		blocker = ad_blocker_new (ext->priv->tester);

        
		g_return_val_if_fail (blocker != NULL, NULL);
		g_return_val_if_fail (blocker != NULL, NULL);

        

            

              
		g_object_set_data (G_OBJECT (embed), AD_BLOCKER_KEY, blocker);

              
		g_object_set_data_full (G_OBJECT (embed), AD_BLOCKER_KEY,

            

            

              

              
					blocker, (GDestroyNotify) g_object_unref);

            

        

        
		g_signal_connect (embed, "ge-location",
		g_signal_connect (embed, "ge-location",

            

              
				G_CALLBACK (location_changed_cb), blocker);

              
				  G_CALLBACK (location_changed_cb), blocker);

            

        

        
		g_signal_connect (embed, "content-blocked",
		g_signal_connect (embed, "content-blocked",

            

              
				G_CALLBACK (content_blocked_cb), blocker);

              
				  G_CALLBACK (content_blocked_cb), blocker);

            

        
	}
	}

        

        
	return blocker;
	return blocker;

        
}
}

        

            

              

              
            

        
static void
static void

        
impl_attach_tab (EphyExtension *ext,
impl_attach_tab (EphyExtension *ext,

        
		 EphyWindow *window,
		 EphyWindow *window,

  

    

    

       Lines 422-436
       
    
  Link Here 
    

  

        
	
	

        
	embed = ephy_tab_get_embed (tab);
	embed = ephy_tab_get_embed (tab);

        

            

              
	blocker = g_object_get_data (G_OBJECT (embed), AD_BLOCKER_KEY);

              
	blocker = g_object_steal_data (G_OBJECT (embed), AD_BLOCKER_KEY);

            

        
	g_return_if_fail (blocker != NULL);
	g_return_if_fail (blocker != NULL);

        

        
	g_signal_handlers_disconnect_by_func
	g_signal_handlers_disconnect_by_func

            

              
		(G_OBJECT (embed), G_CALLBACK (content_blocked_cb), blocker);

              
		(embed, G_CALLBACK (content_blocked_cb), blocker);

            

        
	g_signal_handlers_disconnect_by_func
	g_signal_handlers_disconnect_by_func

            

              
		(G_OBJECT (embed), G_CALLBACK (location_changed_cb), blocker);

              
		(embed, G_CALLBACK (location_changed_cb), blocker);

            

        
	g_signal_handlers_disconnect_by_func
	g_signal_handlers_disconnect_by_func

            

              
		(G_OBJECT (blocker), G_CALLBACK (num_blocked_cb), blocker);

              
		(blocker, G_CALLBACK (num_blocked_cb), embed);

            

        

        
	g_object_unref (blocker);
	g_object_unref (blocker);

        
}
}