[gnome-builder] terminal: a few IdeApplication fixes

[Christian Hergert <chergert src gnome org>]

commit 6302378b5ca08faf64fff8eb08b216b97d573e61
Author: Christian Hergert <chergert redhat com>
Date:   Sat Nov 28 11:54:47 2015 -0800

    terminal: a few IdeApplication fixes

 plugins/terminal/gb-terminal-application-addin.c |   18 +++++++++---------
 plugins/terminal/gb-terminal-application-addin.h |    2 +-
 plugins/terminal/gb-terminal-plugin.c            |    7 +++----
 3 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/plugins/terminal/gb-terminal-application-addin.c 
b/plugins/terminal/gb-terminal-application-addin.c
index d86ac04..2a3304a 100644
--- a/plugins/terminal/gb-terminal-application-addin.c
+++ b/plugins/terminal/gb-terminal-application-addin.c
@@ -23,34 +23,34 @@ struct _GbTerminalApplicationAddin
   GObject parent_instance;
 };
 
-static void application_addin_iface_init (GbApplicationAddinInterface *iface);
+static void application_addin_iface_init (IdeApplicationAddinInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (GbTerminalApplicationAddin,
                                 gb_terminal_application_addin,
                                 G_TYPE_OBJECT,
                                 0,
-                                G_IMPLEMENT_INTERFACE (GB_TYPE_APPLICATION_ADDIN,
+                                G_IMPLEMENT_INTERFACE (IDE_TYPE_APPLICATION_ADDIN,
                                                        application_addin_iface_init))
 
 static void
-gb_terminal_application_addin_load (GbApplicationAddin *addin,
-                                    GbApplication      *application)
+gb_terminal_application_addin_load (IdeApplicationAddin *addin,
+                                    IdeApplication      *application)
 {
   const gchar *new_terminal_accels[] = { "<ctrl><shift>t", NULL };
 
   g_assert (GB_IS_TERMINAL_APPLICATION_ADDIN (addin));
-  g_assert (GB_IS_APPLICATION (application));
+  g_assert (IDE_IS_APPLICATION (application));
 
   gtk_application_set_accels_for_action (GTK_APPLICATION (application), "win.new-terminal",
                                          new_terminal_accels);
 }
 
 static void
-gb_terminal_application_addin_unload (GbApplicationAddin *addin,
-                                      GbApplication      *application)
+gb_terminal_application_addin_unload (IdeApplicationAddin *addin,
+                                      IdeApplication      *application)
 {
   g_assert (GB_IS_TERMINAL_APPLICATION_ADDIN (addin));
-  g_assert (GB_IS_APPLICATION (application));
+  g_assert (IDE_IS_APPLICATION (application));
 
   gtk_application_set_accels_for_action (GTK_APPLICATION (application), "win.new-terminal", NULL);
 }
@@ -71,7 +71,7 @@ gb_terminal_application_addin_init (GbTerminalApplicationAddin *self)
 }
 
 static void
-application_addin_iface_init (GbApplicationAddinInterface *iface)
+application_addin_iface_init (IdeApplicationAddinInterface *iface)
 {
   iface->load = gb_terminal_application_addin_load;
   iface->unload = gb_terminal_application_addin_unload;
diff --git a/plugins/terminal/gb-terminal-application-addin.h 
b/plugins/terminal/gb-terminal-application-addin.h
index a2de62f..88b3027 100644
--- a/plugins/terminal/gb-terminal-application-addin.h
+++ b/plugins/terminal/gb-terminal-application-addin.h
@@ -19,7 +19,7 @@
 #ifndef GB_TERMINAL_APPLICATION_ADDIN_H
 #define GB_TERMINAL_APPLICATION_ADDIN_H
 
-#include "gb-application-addin.h"
+#include <ide.h>
 
 G_BEGIN_DECLS
 
diff --git a/plugins/terminal/gb-terminal-plugin.c b/plugins/terminal/gb-terminal-plugin.c
index 2eeb437..275bf41 100644
--- a/plugins/terminal/gb-terminal-plugin.c
+++ b/plugins/terminal/gb-terminal-plugin.c
@@ -17,13 +17,12 @@
  */
 
 #include <libpeas/peas.h>
+#include <ide.h>
 
-#include "gb-application-addin.h"
 #include "gb-terminal-application-addin.h"
 #include "gb-terminal-private.h"
 #include "gb-terminal-resources.h"
 #include "gb-terminal-workbench-addin.h"
-#include "gb-workbench-addin.h"
 
 void
 peas_register_types (PeasObjectModule *module)
@@ -32,9 +31,9 @@ peas_register_types (PeasObjectModule *module)
   _gb_terminal_workbench_addin_register_type (G_TYPE_MODULE (module));
 
   peas_object_module_register_extension_type (module,
-                                              GB_TYPE_APPLICATION_ADDIN,
+                                              IDE_TYPE_APPLICATION_ADDIN,
                                               GB_TYPE_TERMINAL_APPLICATION_ADDIN);
   peas_object_module_register_extension_type (module,
-                                              GB_TYPE_WORKBENCH_ADDIN,
+                                              IDE_TYPE_WORKBENCH_ADDIN,
                                               GB_TYPE_TERMINAL_WORKBENCH_ADDIN);
 }