forked from ibus/ibus
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Fix deprecated gtk_misc_set_padding(), gtk_widget_set_margin_left(), gtk_widget_set_margin_right() in emojilang.py, enginedialog.py, setup.ui, candidatearea.vala, candidatepanel.vala, switcher.vala since GTK 3.12 - Fix g_new0() argument 1 range [18446744071562067968, 18446744073709551615] exceeds maximum object size 9223372036854775807 [-Walloc-size-larger-than=] by adding g_assert() in ibuscomposetable.c - Fix gdk_keymap_get_default() with gdk_keymap_get_for_display() in bindingcommon.vala - Fix string.utf8_offset() with string.next_char() in emojier.vala - Fix Posix.SIGUSR1 with Posix.Signal.USR1 in panel.vala
- Loading branch information
Showing
12 changed files
with
60 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| # | ||
| # ibus - The Input Bus | ||
| # | ||
| # Copyright (c) 2017 Takao Fujiwara <[email protected]> | ||
| # Copyright (c) 2017-2019 Takao Fujiwara <[email protected]> | ||
| # Copyright (c) 2017 Red Hat, Inc. | ||
| # | ||
| # This program is free software; you can redistribute it and/or | ||
|
|
@@ -83,8 +83,8 @@ def __init__(self, id = None, transient_for = None): | |
| hscrollbar_policy = Gtk.PolicyType.NEVER, | ||
| vscrollbar_policy = Gtk.PolicyType.NEVER, | ||
| shadow_type = Gtk.ShadowType.IN, | ||
| margin_left = 6, | ||
| margin_right = 6, | ||
| margin_start = 6, | ||
| margin_end = 6, | ||
| margin_top = 6, | ||
| margin_bottom = 6) | ||
| self.vbox.add(self.__scrolled) | ||
|
|
@@ -192,8 +192,8 @@ def __padded_label_new(self, text, icon, alignment, direction): | |
| label = Gtk.Label(label = text) | ||
| label.set_halign(alignment) | ||
| label.set_valign(Gtk.Align.CENTER) | ||
| label.set_margin_left(20) | ||
| label.set_margin_right(20) | ||
| label.set_margin_start(20) | ||
| label.set_margin_end(20) | ||
| label.set_margin_top(6) | ||
| label.set_margin_bottom(6) | ||
| hbox.pack_start(label, True, True, 0) | ||
|
|
@@ -235,8 +235,8 @@ def __more_row_new(self): | |
| row.set_tooltip_text(_("More…")) | ||
| arrow = Gtk.Image.new_from_icon_name('view-more-symbolic', | ||
| Gtk.IconSize.MENU) | ||
| arrow.set_margin_left(20) | ||
| arrow.set_margin_right(20) | ||
| arrow.set_margin_start(20) | ||
| arrow.set_margin_end(20) | ||
| arrow.set_margin_top(6) | ||
| arrow.set_margin_bottom(6) | ||
| arrow.set_halign(Gtk.Align.CENTER) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ | |
| # ibus - The Input Bus | ||
| # | ||
| # Copyright (c) 2015 Peng Huang <[email protected]> | ||
| # Copyright (c) 2015 Takao Fujiwara <[email protected]> | ||
| # Copyright (c) 2015-2019 Takao Fujiwara <[email protected]> | ||
| # Copyright (c) 2013-2015 Red Hat, Inc. | ||
| # | ||
| # This program is free software; you can redistribute it and/or | ||
|
|
@@ -70,8 +70,8 @@ def __init__(self, transient_for = None): | |
| hscrollbar_policy = Gtk.PolicyType.NEVER, | ||
| vscrollbar_policy = Gtk.PolicyType.NEVER, | ||
| shadow_type = Gtk.ShadowType.IN, | ||
| margin_left = 6, | ||
| margin_right = 6, | ||
| margin_start = 6, | ||
| margin_end = 6, | ||
| margin_top = 6, | ||
| margin_bottom = 6) | ||
| self.vbox.add(self.__scrolled) | ||
|
|
@@ -94,8 +94,8 @@ def __init__(self, transient_for = None): | |
| self.__filter_timeout_id = 0 | ||
| self.__filter_word = None | ||
| self.__filter_entry = Gtk.SearchEntry(hexpand = True, | ||
| margin_left = 6, | ||
| margin_right = 6, | ||
| margin_start = 6, | ||
| margin_end = 6, | ||
| margin_top = 6, | ||
| margin_bottom = 6) | ||
| self.__filter_entry.set_no_show_all(True) | ||
|
|
@@ -164,8 +164,8 @@ def __padded_label_new(self, text, icon, alignment, direction): | |
| label = Gtk.Label(label = text) | ||
| label.set_halign(alignment) | ||
| label.set_valign(Gtk.Align.CENTER) | ||
| label.set_margin_left(20) | ||
| label.set_margin_right(20) | ||
| label.set_margin_start(20) | ||
| label.set_margin_end(20) | ||
| label.set_margin_top(6) | ||
| label.set_margin_bottom(6) | ||
| hbox.pack_start(label, True, True, 0) | ||
|
|
@@ -205,8 +205,8 @@ def __more_row_new(self): | |
| row.set_tooltip_text(_("More…")) | ||
| arrow = Gtk.Image.new_from_icon_name('view-more-symbolic', | ||
| Gtk.IconSize.MENU) | ||
| arrow.set_margin_left(20) | ||
| arrow.set_margin_right(20) | ||
| arrow.set_margin_start(20) | ||
| arrow.set_margin_end(20) | ||
| arrow.set_margin_top(6) | ||
| arrow.set_margin_bottom(6) | ||
| arrow.set_halign(Gtk.Align.CENTER) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| * ibus - The Input Bus | ||
| * | ||
| * Copyright(c) 2018 Peng Huang <[email protected]> | ||
| * Copyright(c) 2018 Takao Fujwiara <[email protected]> | ||
| * Copyright(c) 2018-2019 Takao Fujwiara <[email protected]> | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
|
|
@@ -75,8 +75,8 @@ class BindingCommon { | |
| // workaround a bug in gdk vapi vala > 0.18 | ||
| // https://bugzilla.gnome.org/show_bug.cgi?id=677559 | ||
| #if VALA_0_18 | ||
| Gdk.Keymap.get_default().map_virtual_modifiers( | ||
| ref switch_modifiers); | ||
| Gdk.Keymap.get_for_display(Gdk.Display.get_default() | ||
| ).map_virtual_modifiers(ref switch_modifiers); | ||
| #else | ||
| if ((switch_modifiers & Gdk.ModifierType.SUPER_MASK) != 0) | ||
| switch_modifiers |= Gdk.ModifierType.MOD4_MASK; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| * ibus - The Input Bus | ||
| * | ||
| * Copyright(c) 2011-2015 Peng Huang <[email protected]> | ||
| * Copyright(c) 2015-2017 Takao Fujiwara <[email protected]> | ||
| * Copyright(c) 2015-2019 Takao Fujiwara <[email protected]> | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
|
|
@@ -215,9 +215,10 @@ class CandidateArea : Gtk.Box { | |
| candidate.show(); | ||
| m_candidates += candidate; | ||
|
|
||
| /* Use Gtk.Widget.set_margin_start() since gtk 3.12 */ | ||
| label.set_padding(8, 0); | ||
| candidate.set_padding(8, 0); | ||
| label.set_margin_start (8); | ||
| label.set_margin_end (8); | ||
| candidate.set_margin_start (8); | ||
| candidate.set_margin_end (8); | ||
|
|
||
| // Make a copy of i to workaround a bug in vala. | ||
| // https://bugzilla.gnome.org/show_bug.cgi?id=628336 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| * ibus - The Input Bus | ||
| * | ||
| * Copyright(c) 2011-2015 Peng Huang <[email protected]> | ||
| * Copyright(c) 2015-2018 Takao Fujiwara <[email protected]> | ||
| * Copyright(c) 2015-2019 Takao Fujiwara <[email protected]> | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
|
|
@@ -242,16 +242,16 @@ public class CandidatePanel : Gtk.Box{ | |
| m_preedit_label.set_size_request(20, -1); | ||
| m_preedit_label.set_halign(Gtk.Align.START); | ||
| m_preedit_label.set_valign(Gtk.Align.CENTER); | ||
| /* Use Gtk.Widget.set_margin_start() since gtk 3.12 */ | ||
| m_preedit_label.set_padding(8, 0); | ||
| m_preedit_label.set_margin_start(8); | ||
| m_preedit_label.set_margin_end(8); | ||
| m_preedit_label.set_no_show_all(true); | ||
|
|
||
| m_aux_label = new Gtk.Label(null); | ||
| m_aux_label.set_size_request(20, -1); | ||
| m_aux_label.set_halign(Gtk.Align.START); | ||
| m_aux_label.set_valign(Gtk.Align.CENTER); | ||
| /* Use Gtk.Widget.set_margin_start() since gtk 3.12 */ | ||
| m_aux_label.set_padding(8, 0); | ||
| m_aux_label.set_margin_start(8); | ||
| m_aux_label.set_margin_end(8); | ||
| m_aux_label.set_no_show_all(true); | ||
|
|
||
| m_candidate_area = new CandidateArea(m_vertical_panel_system); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| * ibus - The Input Bus | ||
| * | ||
| * Copyright(c) 2011-2016 Peng Huang <[email protected]> | ||
| * Copyright(c) 2015-2017 Takao Fujiwara <[email protected]> | ||
| * Copyright(c) 2015-2019 Takao Fujiwara <[email protected]> | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
|
|
@@ -125,9 +125,10 @@ class Switcher : Gtk.Window { | |
| Atk.Object obj = m_label.get_accessible(); | ||
| obj.set_role (Atk.Role.STATUSBAR); | ||
|
|
||
| /* Use Gtk.Widget.set_margin_start() and | ||
| * Gtk.Widget.set_margin_top() since gtk 3.12 */ | ||
| m_label.set_padding(3, 3); | ||
| m_label.set_margin_start(3); | ||
| m_label.set_margin_end(3); | ||
| m_label.set_margin_top(3); | ||
| m_label.set_margin_bottom(3); | ||
| vbox.pack_end(m_label, false, false, 0); | ||
|
|
||
| grab_focus(); | ||
|
|
||