Rename ui/gtk to ui/gtk2

diff --git a/configure.ac b/configure.ac
index a577bdb..98aaefc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -473,9 +473,9 @@ ibus/_config.py
 ibus/Makefile
 ibus/interface/Makefile
 ui/Makefile
-ui/gtk/Makefile
-ui/gtk/ibus-ui-gtk
-ui/gtk/gtkpanel.xml.in
+ui/gtk2/Makefile
+ui/gtk2/ibus-ui-gtk
+ui/gtk2/gtkpanel.xml.in
 ui/gtk3/Makefile
 setup/Makefile
 setup/ibus-setup

diff --git a/ui/Makefile.am b/ui/Makefile.am
index e227019..bcf9abd 100644 (file)
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -22,7 +22,7 @@
 
 if ENABLE_PYTHON
 if ENABLE_GTK2
-GTK2_UI = gtk
+GTK2_UI = gtk2
 endif
 endif
 

diff --git a/ui/gtk/Makefile.am b/ui/gtk2/Makefile.am
similarity index 100%
rename from ui/gtk/Makefile.am
rename to ui/gtk2/Makefile.am

diff --git a/ui/gtk/candidatepanel.py b/ui/gtk2/candidatepanel.py
similarity index 100%
rename from ui/gtk/candidatepanel.py
rename to ui/gtk2/candidatepanel.py

diff --git a/ui/gtk/engineabout.py b/ui/gtk2/engineabout.py
similarity index 100%
rename from ui/gtk/engineabout.py
rename to ui/gtk2/engineabout.py

diff --git a/ui/gtk/gtkpanel.xml.in.in b/ui/gtk2/gtkpanel.xml.in.in
similarity index 100%
rename from ui/gtk/gtkpanel.xml.in.in
rename to ui/gtk2/gtkpanel.xml.in.in

diff --git a/ui/gtk/handle.py b/ui/gtk2/handle.py
similarity index 100%
rename from ui/gtk/handle.py
rename to ui/gtk2/handle.py

diff --git a/ui/gtk/i18n.py b/ui/gtk2/i18n.py
similarity index 100%
rename from ui/gtk/i18n.py
rename to ui/gtk2/i18n.py

diff --git a/ui/gtk/ibus-ui-gtk.in b/ui/gtk2/ibus-ui-gtk.in
similarity index 100%
rename from ui/gtk/ibus-ui-gtk.in
rename to ui/gtk2/ibus-ui-gtk.in

diff --git a/ui/gtk/icon.py b/ui/gtk2/icon.py
similarity index 100%
rename from ui/gtk/icon.py
rename to ui/gtk2/icon.py

diff --git a/ui/gtk/languagebar.py b/ui/gtk2/languagebar.py
similarity index 100%
rename from ui/gtk/languagebar.py
rename to ui/gtk2/languagebar.py

diff --git a/ui/gtk/main.py b/ui/gtk2/main.py
similarity index 100%
rename from ui/gtk/main.py
rename to ui/gtk2/main.py

diff --git a/ui/gtk/menu.py b/ui/gtk2/menu.py
similarity index 100%
rename from ui/gtk/menu.py
rename to ui/gtk2/menu.py

diff --git a/ui/gtk/notifications.py b/ui/gtk2/notifications.py
similarity index 100%
rename from ui/gtk/notifications.py
rename to ui/gtk2/notifications.py

diff --git a/ui/gtk/panel.py b/ui/gtk2/panel.py
similarity index 100%
rename from ui/gtk/panel.py
rename to ui/gtk2/panel.py

diff --git a/ui/gtk/propitem.py b/ui/gtk2/propitem.py
similarity index 100%
rename from ui/gtk/propitem.py
rename to ui/gtk2/propitem.py

diff --git a/ui/gtk/toolitem.py b/ui/gtk2/toolitem.py
similarity index 100%
rename from ui/gtk/toolitem.py
rename to ui/gtk2/toolitem.py