Fix includes

[~andy/gtk] / gtk / gtkuimanager.h

diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index d07ccccbdb5415c336c1a83c56ae70905703006a..85f945affd2fbc0e48fcd56c303d2d21a4633c04 100644 (file)
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -14,9 +14,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  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/>.
  */
 
 /*
@@ -28,13 +26,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_UI_MANAGER_H__
+#define __GTK_UI_MANAGER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_UI_MANAGER_H__
-#define __GTK_UI_MANAGER_H__
-
 #include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkaction.h>
@@ -126,10 +124,10 @@ typedef enum {
 
 GType          gtk_ui_manager_get_type            (void) G_GNUC_CONST;
 GtkUIManager  *gtk_ui_manager_new                 (void);
-GDK_DEPRECATED
+GDK_DEPRECATED_IN_3_4
 void           gtk_ui_manager_set_add_tearoffs    (GtkUIManager          *manager,
                                                    gboolean               add_tearoffs);
-GDK_DEPRECATED
+GDK_DEPRECATED_IN_3_4
 gboolean       gtk_ui_manager_get_add_tearoffs    (GtkUIManager          *manager);
 
 void           gtk_ui_manager_insert_action_group (GtkUIManager          *manager,
@@ -152,6 +150,9 @@ guint          gtk_ui_manager_add_ui_from_string  (GtkUIManager          *manage
 guint          gtk_ui_manager_add_ui_from_file    (GtkUIManager          *manager,
                                                   const gchar           *filename,
                                                   GError               **error);
+guint          gtk_ui_manager_add_ui_from_resource(GtkUIManager          *manager,
+                                                  const gchar           *resource_path,
+                                                  GError               **error);
 void           gtk_ui_manager_add_ui              (GtkUIManager          *manager,
                                                   guint                  merge_id,
                                                   const gchar           *path,