2008-04-15 13:21:13 <timj@imendio.com>

[hildon] / src / hildon-window.h

diff --git a/src/hildon-window.h b/src/hildon-window.h
index cbc2cd2..36e58f9 100644 (file)
--- a/src/hildon-window.h
+++ b/src/hildon-window.h
@@ -8,7 +8,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
  * as published by the Free Software Foundation; version 2.1 of
- * the License.
+ * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -36,7 +36,7 @@
 
 G_BEGIN_DECLS
 
-#define                                         HILDON_WINDOW_LONG_PRESS_TIME 1500 /* in ms */
+#define                                         HILDON_WINDOW_LONG_PRESS_TIME 800 /* in ms */
 
 #define                                         HILDON_TYPE_WINDOW \
                                                 (hildon_window_get_type())
@@ -98,9 +98,15 @@ hildon_window_add_with_scrollbar                (HildonWindow *self,
 GtkMenu*    
 hildon_window_get_menu                          (HildonWindow *self);
 
+void
+hildon_window_set_main_menu                     (HildonWindow *self,
+                                                GtkMenu      *menu);
+
+#ifndef HILDON_DISABLE_DEPRECATED
 void        
 hildon_window_set_menu                          (HildonWindow *self,
                                                  GtkMenu      *menu);
+#endif
 
 void    
 hildon_window_add_toolbar                       (HildonWindow *self,