| OLD | NEW |
| 1 /* ibus - The Input Bus | 1 /* ibus - The Input Bus |
| 2 * Copyright (c) 2010, Google Inc. All rights reserved. | 2 * Copyright (c) 2010, Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Lesser General Public | 5 * modify it under the terms of the GNU Lesser General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 12 * Lesser General Public License for more details. | 12 * Lesser General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU Lesser General Public | 14 * You should have received a copy of the GNU Lesser General Public |
| 15 * License along with this library; if not, write to the | 15 * License along with this library; if not, write to the |
| 16 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 16 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
| 17 * Boston, MA 02111-1307, USA. | 17 * Boston, MA 02111-1307, USA. |
| 18 */ | 18 */ |
| 19 | 19 |
| 20 #ifndef MEMCONF_CONFIG_H_ | 20 #ifndef MEMCONF_CONFIG_H_ |
| 21 #define MEMCONF_CONFIG_H_ | 21 #define MEMCONF_CONFIG_H_ |
| 22 | 22 |
| 23 #include <map> | 23 #include <map> |
| 24 #include <set> |
| 24 #include <string> | 25 #include <string> |
| 25 | 26 |
| 26 #include <ibus.h> | 27 #include <ibus.h> |
| 27 | 28 |
| 28 struct IBusConfigMemConf { | 29 struct IBusConfigMemConf { |
| 29 IBusConfigService parent; | 30 IBusConfigService parent; |
| 30 // We have to use pointer type here for |entries| since g_object_new() uses | 31 // We have to use pointer type here for |entries| since g_object_new() uses |
| 31 // malloc rather than new to create IBusConfigMemConf object. | 32 // malloc rather than new to create IBusConfigMemConf object. |
| 32 std::map<std::string, GValue*>* entries; | 33 std::map<std::string, GValue*>* entries; |
| 34 std::set<std::string>* unread; |
| 35 std::set<std::string>* unwritten; |
| 33 }; | 36 }; |
| 34 | 37 |
| 35 IBusConfigMemConf* ibus_config_memconf_new(IBusConnection* connection); | 38 IBusConfigMemConf* ibus_config_memconf_new(IBusConnection* connection); |
| 36 | 39 |
| 37 // These tiny hacks are necessary since memconf/main.cc which is copied | 40 // These tiny hacks are necessary since memconf/main.cc which is copied |
| 38 // from gconf/main.c on compile-time uses "gconf" rather than "memconf." | 41 // from gconf/main.c on compile-time uses "gconf" rather than "memconf." |
| 39 typedef IBusConfigMemConf IBusConfigGConf; | 42 typedef IBusConfigMemConf IBusConfigGConf; |
| 40 #define ibus_config_gconf_new ibus_config_memconf_new | 43 #define ibus_config_gconf_new ibus_config_memconf_new |
| 41 | 44 |
| 42 #endif // MEMCONF_CONFIG_H_ | 45 #endif // MEMCONF_CONFIG_H_ |
| OLD | NEW |