Commit dd473425 authored by Sebastian Geiger's avatar Sebastian Geiger Committed by Alberts Muktupāvels
Browse files

input-sources: change GfCandidatePopup parent class to GfPopupWindow

parent b190c04e
......@@ -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,
......
......@@ -18,14 +18,14 @@
#ifndef GF_CANDIDATE_POPUP_H
#define GF_CANDIDATE_POPUP_H
#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);
......
......@@ -384,7 +384,12 @@ gf_ibus_manager_dispose (GObject *object)
manager = GF_IBUS_MANAGER (object);
g_clear_object (&manager->candidate_popup);
if (manager->candidate_popup != NULL)
{
gtk_widget_destroy (GTK_WIDGET (manager->candidate_popup));
manager->candidate_popup = NULL;
}
g_clear_object (&manager->subprocess);
if (manager->engines != NULL)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment