[gnome-flashback/wip/segeiger/gnome-3-18-inputmethods: 4/5] input-sources: change GfCandidatePopup parent class to GfPopupWindow
- From: Sebastian Geiger <segeiger src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback/wip/segeiger/gnome-3-18-inputmethods: 4/5] input-sources: change GfCandidatePopup parent class to GfPopupWindow
- Date: Mon, 18 Jan 2016 12:29:57 +0000 (UTC)
commit c71394ffd087e350ea735dc91a6e450c5a7e94dd
Author: Sebastian Geiger <sbastig gmx net>
Date: Mon Jan 18 13:26:52 2016 +0100
input-sources: change GfCandidatePopup parent class to GfPopupWindow
.../libinput-sources/gf-candidate-popup.c | 4 ++--
.../libinput-sources/gf-candidate-popup.h | 4 +++-
gnome-flashback/libinput-sources/gf-ibus-manager.c | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/gnome-flashback/libinput-sources/gf-candidate-popup.c
b/gnome-flashback/libinput-sources/gf-candidate-popup.c
index 32d6a63..a0c1a5c 100644
--- a/gnome-flashback/libinput-sources/gf-candidate-popup.c
+++ b/gnome-flashback/libinput-sources/gf-candidate-popup.c
@@ -21,12 +21,12 @@
struct _GfCandidatePopup
{
- GObject parent;
+ GfPopupWindow parent;
IBusPanelService *service;
};
-G_DEFINE_TYPE (GfCandidatePopup, gf_candidate_popup, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GfCandidatePopup, gf_candidate_popup, GF_TYPE_POPUP_WINDOW)
static void
set_cursor_location_cb (IBusPanelService *service,
diff --git a/gnome-flashback/libinput-sources/gf-candidate-popup.h
b/gnome-flashback/libinput-sources/gf-candidate-popup.h
index 8a79979..d35aeee 100644
--- a/gnome-flashback/libinput-sources/gf-candidate-popup.h
+++ b/gnome-flashback/libinput-sources/gf-candidate-popup.h
@@ -21,11 +21,13 @@
#include <glib-object.h>
#include <ibus-1.0/ibus.h>
+#include <libcommon/gf-popup-window.h>
+
G_BEGIN_DECLS
#define GF_TYPE_CANDIDATE_POPUP gf_candidate_popup_get_type ()
G_DECLARE_FINAL_TYPE (GfCandidatePopup, gf_candidate_popup,
- GF, CANDIDATE_POPUP, GObject)
+ GF, CANDIDATE_POPUP, GfPopupWindow)
GfCandidatePopup *gf_candidate_popup_new (void);
diff --git a/gnome-flashback/libinput-sources/gf-ibus-manager.c
b/gnome-flashback/libinput-sources/gf-ibus-manager.c
index 99b5aac..0531f40 100644
--- a/gnome-flashback/libinput-sources/gf-ibus-manager.c
+++ b/gnome-flashback/libinput-sources/gf-ibus-manager.c
@@ -387,7 +387,7 @@ gf_ibus_manager_dispose (GObject *object)
manager = GF_IBUS_MANAGER (object);
- g_clear_object (&manager->candidate_popup);
+ gtk_widget_destroy (GTK_WIDGET (manager->candidate_popup));
g_clear_object (&manager->subprocess);
if (manager->engines != NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]