stylecontext: Do invalidation on first resize container

[~andy/gtk] / gtk / gtkaccelmap.c

diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index 2f33b92c660c849f771442d1cd2c26a8091642e1..7154b404f86e6e60ebdda2322a5eb8feb05e4afc 100644 (file)
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -209,6 +207,9 @@ _gtk_accel_path_is_valid (const gchar *accel_path)
  * To change the accelerator during runtime programatically, use
  * gtk_accel_map_change_entry().
  * 
+ * Set @accel_key and @accel_mods to 0 to request a removal of
+ * the accelerator.
+ *
  * Note that @accel_path string will be stored in a #GQuark. Therefore, if you
  * pass a static string, you can save some memory by interning it first with 
  * g_intern_static_string().
@@ -954,7 +955,7 @@ _gtk_accel_map_remove_group (const gchar   *accel_path,
  *
  * Note that locking of individual accelerator paths is independent from 
  * locking the #GtkAccelGroup containing them. For runtime accelerator
- * changes to be possible both the accelerator path and its #GtkAccelGroup
+ * changes to be possible, both the accelerator path and its #GtkAccelGroup
  * have to be unlocked. 
  *
  * Since: 2.4
@@ -1073,7 +1074,7 @@ _gtk_accel_path_for_action (const gchar *action_name,
 {
   GString *s;
 
-  s = g_string_new ("<Actions>/");
+  s = g_string_new ("<GAction>/");
   g_string_append (s, action_name);
   if (parameter)
     {