[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#596094: unblock: epiphany-browser/2.30.5-1



Le dimanche 12 septembre 2010 à 14:52 +0200, Josselin Mouette a écrit : 
> Le dimanche 12 septembre 2010 à 12:36 +0200, Julien Cristau a écrit : 
> > > We could by shipping two desktop files, with one of them having
> > > NoDisplay=true added. Do you want me to add this change? I’m afraid it’s
> > > the kind of thing we will have to keep forever if we do.
> > > 
> > How is the upgrade from lenny supposed to work?  AFAICT lenny has a
> > epiphany-gecko.desktop file instead?
> 
> The one without NoDisplay=true (which is the one people dragged from the
> menus to the panel or desktop) was epiphany.desktop.
> 
> Anyway I just noticed that the panel’s default setup still references
> epiphany.desktop, so this breaks new installations too. 
> 
> I think I’m going to revert this change for now

I’ve uploaded the fixed version, along with a (very light) new upstream
release. 

epiphany-browser (2.30.6-1) unstable; urgency=low

  * debian/rules: revert the desktop name change from 2.30.2-4. It 
    breaks gnome-panel, and it is arguably a bug in gnome-shell not to 
    take into account the previous fix (g_set_prgname).
  * New upstream translation and bugfix release.
  * 99_autoreconf.patch: refreshed.

Here are the upstream news:

===============
Epiphany 2.30.6
===============

Changes:
  - Do not use deprecated gdk_display
  - Do not enable maintainer mode for tarballs

The code change is: 
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -641,7 +641,7 @@ main (int argc,
 	/* Get a timestamp manually if need be */
 	if (user_time == 0)
 	{
-		user_time = slowly_and_stupidly_obtain_timestamp (gdk_display);
+		user_time = slowly_and_stupidly_obtain_timestamp (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
 	}
 
 	/* sets the name to appear in the window list applet when grouping windows */

Please unblock if you still agree with these changes.

Thanks,
-- 
 .''`.      Josselin Mouette
: :' :
`. `'  “If you behave this way because you are blackmailed by someone,
  `-    […] I will see what I can do for you.”  -- Jörg Schilling

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: