Lukasz Busko fixes merged into design3 branch
authorMateusz Żakowski <m.zakowski@samsung.com>
Fri, 9 Jan 2015 12:19:48 +0000 (13:19 +0100)
committerMateusz Żakowski <m.zakowski@samsung.com>
Fri, 9 Jan 2015 12:19:48 +0000 (13:19 +0100)
Conflicts:
include/screen_reader_spi.h
include/screen_reader_tts.h
include/screen_reader_vconf.h
include/screen_reader_xml.h
include/xml_parser.h
org.tizen.smart-navigator.manifest
packaging/org.tizen.smart-navigator.spec
src/navigator.c
src/object_cache.c
src/screen_reader.c
src/screen_reader_spi.c
src/screen_reader_tts.c
src/screen_reader_vconf.c
src/screen_reader_xml.c
src/xml_parser.c

1  2 
include/xml_parser.h
src/navigator.c

@@@ -7,7 -7,7 +7,7 @@@ typedef struc
  {
        char *tag_type;
        Eina_Simple_XML_Attribute **pairs;
--} Tag;  //TODO: Zamienić na standard ??
++} Tag;
  
  void test_fun();
  
diff --cc src/navigator.c
@@@ -486,9 -487,9 +487,6 @@@ static void _activate_widget(void
              {
                  atspi_action_do_action(action, 0, &err);
                  GERROR_CHECK(err)
--                #ifdef DEBUG_MODE
--                    test_debug(current_widget);
--                #endif
              }
          }