Attachment #228813 for bug #316119

Lines 396-402 Link Here

(-)epiphany-extensions-2.26.1.old/extensions/adblock/ephy-adblock-extension.c (+4 lines)
396	EphyWindow *window)	396	EphyWindow *window)
397	{	397	{
398	/* FIXME: this shouldn't happen anymore with gtk 2.10 ! Test & remove */	398	/* FIXME: this shouldn't happen anymore with gtk 2.10 ! Test & remove */
		399	#if GTK_CHECK_VERSION (2, 19, 7)
		400	if (gtk_widget_get_realized (window) == FALSE) return; /* on startup */
		401	#else
399	if (GTK_WIDGET_REALIZED (window) == FALSE) return; /* on startup */	402	if (GTK_WIDGET_REALIZED (window) == FALSE) return; /* on startup */
		403	#endif
400		404
401	update_statusbar (window);	405	update_statusbar (window);
402	}	406	}

Lines 162-168 Link Here

(-)epiphany-extensions-2.26.1.old/extensions/certificates/ephy-certificates-extension.c (+8 lines)
162	g_return_if_fail (manager != NULL);	162	g_return_if_fail (manager != NULL);
163		163
164	window = gtk_widget_get_toplevel (manager);	164	window = gtk_widget_get_toplevel (manager);
		165	#if GTK_CHECK_VERSION (2, 19, 7)
		166	g_return_if_fail (gtk_widget_is_toplevel (window));
		167	#else
165	g_return_if_fail (GTK_WIDGET_TOPLEVEL (window));	168	g_return_if_fail (GTK_WIDGET_TOPLEVEL (window));
		169	#endif
166		170
167	gtk_window_set_role (GTK_WINDOW (window), "epiphany-certificate-manager");	171	gtk_window_set_role (GTK_WINDOW (window), "epiphany-certificate-manager");
168	gtk_window_set_title (GTK_WINDOW (window), _("Certificates"));	172	gtk_window_set_title (GTK_WINDOW (window), _("Certificates"));
Lines 193-199 Link Here
193	g_return_if_fail (manager != NULL);	197	g_return_if_fail (manager != NULL);
194		198
195	window = gtk_widget_get_toplevel (manager);	199	window = gtk_widget_get_toplevel (manager);
		200	#if GTK_CHECK_VERSION (2, 19, 7)
		201	g_return_if_fail (gtk_widget_is_toplevel (window));
		202	#else
196	g_return_if_fail (GTK_WIDGET_TOPLEVEL (window));	203	g_return_if_fail (GTK_WIDGET_TOPLEVEL (window));
		204	#endif
197		205
198	gtk_window_set_role (GTK_WINDOW (window), "epiphany-security-device-manager");	206	gtk_window_set_role (GTK_WINDOW (window), "epiphany-security-device-manager");
199	gtk_window_set_title (GTK_WINDOW (window), _("Security Devices"));	207	gtk_window_set_title (GTK_WINDOW (window), _("Security Devices"));

Lines 324-330 Link Here

(-)epiphany-extensions-2.26.1.old/extensions/error-viewer/ephy-error-viewer-extension.c (+4 lines)
324	EphyWindow *window)	324	EphyWindow *window)
325	{	325	{
326	g_return_if_fail (EPHY_IS_WINDOW (window));	326	g_return_if_fail (EPHY_IS_WINDOW (window));
		327	#if GTK_CHECK_VERSION (2, 19, 7)
		328	if (gtk_widget_get_realized (window) == FALSE) return; /* on startup */
		329	#else
327	if (GTK_WIDGET_REALIZED (window) == FALSE) return; /* on startup */	330	if (GTK_WIDGET_REALIZED (window) == FALSE) return; /* on startup */
		331	#endif
328		332
329	update_actions (window);	333	update_actions (window);
330	}	334	}

Lines 227-233 Link Here

(-)epiphany-extensions-2.26.1.old/extensions/page-info/ephy-page-info-extension.c (+4 lines)
227	{	227	{
228	EphyEmbed *embed;	228	EphyEmbed *embed;
229		229
		230	#if GTK_CHECK_VERSION (2, 19, 7)
		231	if (gtk_widget_get_realized (window) == FALSE) return; /* on startup */
		232	#else
230	if (GTK_WIDGET_REALIZED (window) == FALSE) return; /* on startup */	233	if (GTK_WIDGET_REALIZED (window) == FALSE) return; /* on startup */
		234	#endif
231		235
232	embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));	236	embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
233	update_action (window, embed);	237	update_action (window, embed);

Lines 290-296 Link Here

(-)epiphany-extensions-2.26.1.old/extensions/rss/ephy-rss-extension.c (+4 lines)
290	GParamSpec *pspec,	290	GParamSpec *pspec,
291	gpointer data)	291	gpointer data)
292	{	292	{
		293	#if GTK_CHECK_VERSION (2, 19, 7)
		294	if (gtk_widget_get_realized (window) == FALSE) return; /* on startup */
		295	#else
293	if (GTK_WIDGET_REALIZED (window) == FALSE) return; /* on startup */	296	if (GTK_WIDGET_REALIZED (window) == FALSE) return; /* on startup */
		297	#endif
294		298
295	ephy_rss_update_action (window);	299	ephy_rss_update_action (window);
296	}	300	}

Lines 360-366 Link Here

(-)epiphany-extensions-2.26.1.old/extensions/select-stylesheet/ephy-css-menu.c (+4 lines)
360	g_signal_connect (window, "notify::active-child",	360	g_signal_connect (window, "notify::active-child",
361	G_CALLBACK (sync_active_tab_cb), menu);	361	G_CALLBACK (sync_active_tab_cb), menu);
362		362
		363	#if GTK_CHECK_VERSION (2, 19, 7)
		364	if (gtk_widget_get_realized (window))
		365	#else
363	if (GTK_WIDGET_REALIZED (window))	366	if (GTK_WIDGET_REALIZED (window))
		367	#endif
364	{	368	{
365	embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));	369	embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
366	ephy_css_menu_set_embed (menu, embed);	370	ephy_css_menu_set_embed (menu, embed);

Lines 220-226 Link Here

(-)epiphany-extensions-2.26.1.old/extensions/sidebar/ephy-sidebar.c (+4 lines)
220	sidebar->priv->pages = g_list_append (sidebar->priv->pages,	220	sidebar->priv->pages = g_list_append (sidebar->priv->pages,
221	(gpointer)page);	221	(gpointer)page);
222		222
		223	#if GTK_CHECK_VERSION (2, 19, 7)
		224	if (gtk_widget_get_visible (sidebar) && sidebar->priv->current == NULL)
		225	#else
223	if (GTK_WIDGET_VISIBLE (sidebar) && sidebar->priv->current == NULL)	226	if (GTK_WIDGET_VISIBLE (sidebar) && sidebar->priv->current == NULL)
		227	#endif
224	{	228	{
225	select_page (sidebar, page);	229	select_page (sidebar, page);
226	}	230	}

Lines 484-490 Link Here

(-)epiphany-extensions-2.26.1.old/extensions/sidebar/ephy-sidebar-embed.c (+4 lines)
484	widget->allocation = *allocation;	484	widget->allocation = *allocation;
485	child = GTK_BIN (widget)->child;	485	child = GTK_BIN (widget)->child;
486		486
		487	#if GTK_CHECK_VERSION (2, 19, 7)
		488	if (child && gtk_widget_get_visible (child))
		489	#else
487	if (child && GTK_WIDGET_VISIBLE (child))	490	if (child && GTK_WIDGET_VISIBLE (child))
		491	#endif
488	{	492	{
489	gtk_widget_size_allocate (child, allocation);	493	gtk_widget_size_allocate (child, allocation);
490	}	494	}

Return to bug 316119