[prev in list] [next in list] [prev in thread] [next in thread] 

List:       enlightenment-devel
Subject:    Re: [E-devel] E SVN: raster trunk/e/src/bin
From:       Carsten Haitzler (The Rasterman) <raster () rasterman ! com>
Date:       2012-07-31 9:54:37
Message-ID: 20120731185437.c84fadde.raster () rasterman ! com
[Download RAW message or body]

On Tue, 31 Jul 2012 10:08:46 +0100 Michael Blumenkrantz
<michael.blumenkrantz@gmail.com> said:

> On Tue, Jul 31, 2012 at 10:05 AM, Enlightenment SVN <
> no-reply@enlightenment.org> wrote:
> 
> > Log:
> > revert stringshare changes by zmike - they break xsettings support. it
> >   works again now i revert these.
> >
> >
> >
> > Author:       raster
> > Date:         2012-07-31 02:05:39 -0700 (Tue, 31 Jul 2012)
> > New Revision: 74625
> > Trac:         http://trac.enlightenment.org/e/changeset/74625
> >
> > Modified:
> >   trunk/e/src/bin/e_xsettings.c
> >
> > Modified: trunk/e/src/bin/e_xsettings.c
> > ===================================================================
> > --- trunk/e/src/bin/e_xsettings.c       2012-07-31 08:41:32 UTC (rev 74624)
> > +++ trunk/e/src/bin/e_xsettings.c       2012-07-31 09:05:39 UTC (rev 74625)
> > @@ -52,10 +52,10 @@
> >  static Eina_Bool setting = EINA_FALSE;
> >  static Eina_Bool reset = EINA_FALSE;
> >  static Ecore_Idle_Enterer *xsettings_idler = NULL;
> > -static const char *_setting_icon_theme_name = NULL;
> > -static const char *_setting_theme_name = NULL;
> > -static const char *_setting_font_name = NULL;
> > -static const char *_setting_xft_dpi = NULL;
> > +static const char _setting_icon_theme_name[] = "Net/IconThemeName";
> > +static const char _setting_theme_name[]      = "Net/ThemeName";
> > +static const char _setting_font_name[]       = "Gtk/FontName";
> > +static const char _setting_xft_dpi[]         = "Xft/DPI";
> >  static char *_setting_theme = NULL;
> >  static void _e_xsettings_done_cb(void *data, Eio_File *handler, const
> > Eina_Stat *stat);
> >
> > @@ -166,6 +166,9 @@
> >     Eina_List *l;
> >
> >     if (!name) return;
> > +   if (name == _setting_theme_name)
> > +     e_config->xsettings.net_theme_name_detected = value;
> > +   name = eina_stringshare_add(name);
> >
> 
> looks like either you did more than just revert my changes or I deleted a
> line accidentally. either way this is most likely the problem and not the
> stringshare use.

i was just narrowing it back to a commit i ended up having to revert all
changes since. i reversed just that patch and it fixed it for restarts, not
theme setting on login was still broken until i reverted even more commits
later on. :)

> >     EINA_LIST_FOREACH(settings, l, s)
> >       {
> > @@ -175,27 +178,29 @@
> >     if (!value)
> >       {
> >          if (!s) return;
> > -        DBG("remove %s", name);
> > +        DBG("remove %s\n", name);
> > +        eina_stringshare_del(name);
> > +        eina_stringshare_del(s->name);
> >          eina_stringshare_del(s->s.value);
> >          settings = eina_list_remove(settings, s);
> >          E_FREE(s);
> > -        if (name == _setting_theme_name)
> > -          e_config->xsettings.net_theme_name_detected = value;
> >          return;
> >       }
> > -   if (!s)
> > +   if (s)
> >       {
> > -        DBG("add %s %s", name, value);
> > +        DBG("update %s %s\n", name, value);
> > +        eina_stringshare_del(name);
> > +        eina_stringshare_replace(&s->s.value, value);
> > +     }
> > +   else
> > +     {
> > +        DBG("add %s %s\n", name, value);
> >          s = E_NEW(Setting, 1);
> >          s->type = SETTING_TYPE_STRING;
> >          s->name = name;
> > +        s->s.value = eina_stringshare_add(value);
> >          settings = eina_list_append(settings, s);
> >       }
> > -   else
> > -     DBG("update %s %s", name, value);
> > -   eina_stringshare_replace(&s->s.value, value);
> > -   if (name == _setting_theme_name)
> > -     e_config->xsettings.net_theme_name_detected = s->s.value;
> >
> >     /* type + pad + name-len + last-change-serial + str_len */
> >     s->length = 12;
> > @@ -212,6 +217,7 @@
> >     Eina_List *l;
> >
> >     if (!name) return;
> > +   name = eina_stringshare_add(name);
> >
> >     EINA_LIST_FOREACH(settings, l, s)
> >       {
> > @@ -222,6 +228,8 @@
> >       {
> >          if (!s) return;
> >          DBG("remove %s\n", name);
> > +        eina_stringshare_del(name);
> > +        eina_stringshare_del(s->name);
> >          settings = eina_list_remove(settings, s);
> >          E_FREE(s);
> >          return;
> > @@ -229,6 +237,7 @@
> >     if (s)
> >       {
> >          DBG("update %s %d\n", name, value);
> > +        eina_stringshare_del(name);
> >          s->i.value = value;
> >       }
> >     else
> > @@ -603,6 +612,7 @@
> >
> >     EINA_LIST_FREE(settings, s)
> >       {
> > +        if (s->name) eina_stringshare_del(s->name);
> >          if (s->s.value) eina_stringshare_del(s->s.value);
> >          E_FREE(s);
> >       }
> > @@ -623,11 +633,6 @@
> >     if (e_config->xsettings.enabled)
> >       _e_xsettings_start();
> >
> > -   _setting_icon_theme_name = eina_stringshare_add("Net/IconThemeName");
> > -   _setting_theme_name = eina_stringshare_add("Net/ThemeName");
> > -   _setting_font_name = eina_stringshare_add("Gtk/FontName");
> > -   _setting_xft_dpi = eina_stringshare_add("Xft/DPI");
> > -
> >     return 1;
> >  }
> >
> > @@ -641,11 +646,6 @@
> >     xsettings_idler = NULL;
> >     reset = setting = EINA_FALSE;
> >
> > -   eina_stringshare_replace(&_setting_icon_theme_name, NULL);
> > -   eina_stringshare_replace(&_setting_theme_name, NULL);
> > -   eina_stringshare_replace(&_setting_font_name, NULL);
> > -   eina_stringshare_replace(&_setting_xft_dpi, NULL);
> > -
> >     return 1;
> >  }
> >
> >
> >
> >
> > ------------------------------------------------------------------------------
> > Live Security Virtual Conference
> > Exclusive live event will cover all the ways today's security and
> > threat landscape has changed and how IT managers can respond. Discussions
> > will include endpoint security, mobile security and the latest in malware
> > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> > _______________________________________________
> > enlightenment-svn mailing list
> > enlightenment-svn@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
> >
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and 
> threat landscape has changed and how IT managers can respond. Discussions 
> will include endpoint security, mobile security and the latest in malware 
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
> 


-- 
------------- Codito, ergo sum - "I code, therefore I am" --------------
The Rasterman (Carsten Haitzler)    raster@rasterman.com


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[prev in list] [next in list] [prev in thread] [next in thread]