From 944dbe01ea3aff953f9b78e7f3aa7c45ca5f8b23 Mon Sep 17 00:00:00 2001 From: liliqiang Date: Thu, 17 Dec 2015 13:47:39 +0800 Subject: [PATCH] port: using gir. Change-Id: I828f3ec10df2a9d51e9d4dea880a3768ca529272 --- appearance/background/background.go | 2 +- appearance/background/list.go | 2 +- appearance/fonts/family.go | 4 ++-- appearance/handle_gsetting.go | 2 +- appearance/manager.go | 4 ++-- appinfo/config_file.go | 2 +- appinfo/rate.go | 2 +- audio/audio.go | 2 +- bin/dde-preload/main.go | 2 +- bin/dde-session-daemon/daemon.go | 4 ++-- bin/dde-session-daemon/module.go | 2 +- dock/desktop.go | 4 ++-- dock/docked_app_manager.go | 4 ++-- dock/entry.go | 2 +- dock/normal_apps.go | 2 +- dock/runtime_apps.go | 4 ++-- dock/settings.go | 2 +- dock/util.go | 2 +- inputdevices/handle_gsettings.go | 2 +- inputdevices/keyboard.go | 2 +- inputdevices/mouse.go | 2 +- inputdevices/touchpad.go | 2 +- inputdevices/utils.go | 2 +- inputdevices/wacom.go | 2 +- keybinding/handle_event.go | 2 +- keybinding/handle_gsetting.go | 2 +- keybinding/manager.go | 2 +- keybinding/shortcuts/custom.go | 2 +- keybinding/shortcuts/utils.go | 2 +- launcher/category/category.go | 2 +- launcher/category/category_manager.go | 2 +- launcher/category/deepin_query_id_transition.go | 2 +- launcher/category/x_category_query_id_transition.go | 2 +- launcher/interfaces/category.go | 2 +- launcher/interfaces/item.go | 2 +- launcher/item/desktop.go | 2 +- launcher/item/item.go | 2 +- launcher/item/item_manager.go | 2 +- launcher/item/item_manager_test.go | 4 ++-- launcher/item/item_test.go | 2 +- launcher/item/search/pinyin_adapter_test.go | 2 +- launcher/item/search/search_installed_item_test.go | 2 +- launcher/item/search/search_test.go | 2 +- launcher/launcher.go | 2 +- launcher/main.go | 2 +- launcher/setting.go | 2 +- launcher/utils/keyfile.go | 2 +- launcher/utils/utils.go | 2 +- mounts/disk_info.go | 2 +- mounts/manager.go | 2 +- mounts/manager_ifc.go | 4 ++-- mounts/wrap.go | 2 +- mpris/utils.go | 2 +- network/manager_proxy.go | 2 +- power/main.go | 2 +- power/upower.go | 2 +- screenedge/handle_settings.go | 2 +- screenedge/main.go | 2 +- soundeffect/manager.go | 2 +- timedate/manager.go | 2 +- 60 files changed, 68 insertions(+), 68 deletions(-) diff --git a/appearance/background/background.go b/appearance/background/background.go index 66f31bc66..b17d37cfc 100644 --- a/appearance/background/background.go +++ b/appearance/background/background.go @@ -6,7 +6,7 @@ import ( "path" "pkg.deepin.io/dde/api/thumbnails/images" - "pkg.deepin.io/lib/glib-2.0" + "gir/glib-2.0" "pkg.deepin.io/lib/graphic" dutils "pkg.deepin.io/lib/utils" ) diff --git a/appearance/background/list.go b/appearance/background/list.go index b6a0cae8d..2f217f3d5 100644 --- a/appearance/background/list.go +++ b/appearance/background/list.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "pkg.deepin.io/lib/glib-2.0" + "gir/glib-2.0" dutils "pkg.deepin.io/lib/utils" ) diff --git a/appearance/fonts/family.go b/appearance/fonts/family.go index a78646ef2..6b6b61dc7 100644 --- a/appearance/fonts/family.go +++ b/appearance/fonts/family.go @@ -9,8 +9,8 @@ import ( "strings" "sync" - "pkg.deepin.io/lib/gio-2.0" - "pkg.deepin.io/lib/glib-2.0" + "gir/gio-2.0" + "gir/glib-2.0" dutils "pkg.deepin.io/lib/utils" ) diff --git a/appearance/handle_gsetting.go b/appearance/handle_gsetting.go index 291235e1e..e24f73165 100644 --- a/appearance/handle_gsetting.go +++ b/appearance/handle_gsetting.go @@ -1,7 +1,7 @@ package appearance import ( - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" dutils "pkg.deepin.io/lib/utils" ) diff --git a/appearance/manager.go b/appearance/manager.go index d960f91b5..aad12573b 100644 --- a/appearance/manager.go +++ b/appearance/manager.go @@ -9,8 +9,8 @@ import ( "pkg.deepin.io/dde/daemon/appearance/dtheme" "pkg.deepin.io/dde/daemon/appearance/fonts" "pkg.deepin.io/dde/daemon/appearance/subthemes" - "pkg.deepin.io/lib/gio-2.0" - "pkg.deepin.io/lib/glib-2.0" + "gir/gio-2.0" + "gir/glib-2.0" dutils "pkg.deepin.io/lib/utils" ) diff --git a/appinfo/config_file.go b/appinfo/config_file.go index f82a6b073..349409ca8 100644 --- a/appinfo/config_file.go +++ b/appinfo/config_file.go @@ -7,7 +7,7 @@ import ( "os" "path" - "pkg.deepin.io/lib/glib-2.0" + "gir/glib-2.0" "pkg.deepin.io/lib/utils" ) diff --git a/appinfo/rate.go b/appinfo/rate.go index f2606f605..3ca375377 100644 --- a/appinfo/rate.go +++ b/appinfo/rate.go @@ -2,7 +2,7 @@ package appinfo import ( . "pkg.deepin.io/dde/daemon/launcher/utils" - "pkg.deepin.io/lib/glib-2.0" + "gir/glib-2.0" ) const ( diff --git a/audio/audio.go b/audio/audio.go index 0b26c8cd5..06098dcd2 100644 --- a/audio/audio.go +++ b/audio/audio.go @@ -5,7 +5,7 @@ import ( "pkg.deepin.io/dde/api/soundutils" . "pkg.deepin.io/dde/daemon/loader" "pkg.deepin.io/lib/dbus" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" "pkg.deepin.io/lib/log" "pkg.deepin.io/lib/pulse" ) diff --git a/bin/dde-preload/main.go b/bin/dde-preload/main.go index 8682859c4..9636a7d54 100644 --- a/bin/dde-preload/main.go +++ b/bin/dde-preload/main.go @@ -11,7 +11,7 @@ import ( "pkg.deepin.io/lib" "pkg.deepin.io/lib/dbus" . "pkg.deepin.io/lib/gettext" - "pkg.deepin.io/lib/glib-2.0" + "gir/glib-2.0" "pkg.deepin.io/lib/log" "pkg.deepin.io/lib/proxy" diff --git a/bin/dde-session-daemon/daemon.go b/bin/dde-session-daemon/daemon.go index d2d76cffc..29824d4b6 100644 --- a/bin/dde-session-daemon/daemon.go +++ b/bin/dde-session-daemon/daemon.go @@ -7,8 +7,8 @@ import ( "pkg.deepin.io/dde/daemon/loader" "pkg.deepin.io/lib" "pkg.deepin.io/lib/dbus" - "pkg.deepin.io/lib/gio-2.0" - "pkg.deepin.io/lib/glib-2.0" + "gir/gio-2.0" + "gir/glib-2.0" "pkg.deepin.io/lib/log" ) diff --git a/bin/dde-session-daemon/module.go b/bin/dde-session-daemon/module.go index dbcbc0fdf..56824d29d 100644 --- a/bin/dde-session-daemon/module.go +++ b/bin/dde-session-daemon/module.go @@ -41,7 +41,7 @@ import ( _ "pkg.deepin.io/dde/daemon/soundeffect" _ "pkg.deepin.io/dde/daemon/systeminfo" _ "pkg.deepin.io/dde/daemon/timedate" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) var ( diff --git a/dock/desktop.go b/dock/desktop.go index d031d905f..0f1d7ab4a 100644 --- a/dock/desktop.go +++ b/dock/desktop.go @@ -1,8 +1,8 @@ package dock import ( - "pkg.deepin.io/lib/gio-2.0" - "pkg.deepin.io/lib/glib-2.0" + "gir/gio-2.0" + "gir/glib-2.0" "regexp" ) diff --git a/dock/docked_app_manager.go b/dock/docked_app_manager.go index 63422d52d..96634365a 100644 --- a/dock/docked_app_manager.go +++ b/dock/docked_app_manager.go @@ -9,8 +9,8 @@ import ( "text/template" "pkg.deepin.io/lib/dbus" - "pkg.deepin.io/lib/gio-2.0" - "pkg.deepin.io/lib/glib-2.0" + "gir/gio-2.0" + "gir/glib-2.0" ) const ( diff --git a/dock/entry.go b/dock/entry.go index 0f7bfa08c..50c9b3200 100644 --- a/dock/entry.go +++ b/dock/entry.go @@ -6,7 +6,7 @@ import ( "sync" "pkg.deepin.io/lib/dbus" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) const ( diff --git a/dock/normal_apps.go b/dock/normal_apps.go index 053b3574f..ec2f0c315 100644 --- a/dock/normal_apps.go +++ b/dock/normal_apps.go @@ -6,7 +6,7 @@ import ( "strings" . "pkg.deepin.io/lib/gettext" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" "pkg.deepin.io/lib/utils" ) diff --git a/dock/runtime_apps.go b/dock/runtime_apps.go index 89ad2b1ae..f5e921bb6 100644 --- a/dock/runtime_apps.go +++ b/dock/runtime_apps.go @@ -20,8 +20,8 @@ import ( "github.com/BurntSushi/xgbutil/xwindow" "pkg.deepin.io/dde/daemon/appinfo" . "pkg.deepin.io/lib/gettext" - "pkg.deepin.io/lib/gio-2.0" - "pkg.deepin.io/lib/glib-2.0" + "gir/gio-2.0" + "gir/glib-2.0" ) type WindowInfo struct { diff --git a/dock/settings.go b/dock/settings.go index e5c9b88e5..e4e4b036f 100644 --- a/dock/settings.go +++ b/dock/settings.go @@ -6,7 +6,7 @@ import ( "github.com/BurntSushi/xgbutil/ewmh" "github.com/BurntSushi/xgbutil/xprop" "pkg.deepin.io/lib/dbus" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" "sync" ) diff --git a/dock/util.go b/dock/util.go index 0ffab7aa9..baa2344fa 100644 --- a/dock/util.go +++ b/dock/util.go @@ -9,7 +9,7 @@ import ( "strings" "pkg.deepin.io/dde/daemon/appinfo" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) func isEntryNameValid(name string) bool { diff --git a/inputdevices/handle_gsettings.go b/inputdevices/handle_gsettings.go index 24199dda8..616abf001 100644 --- a/inputdevices/handle_gsettings.go +++ b/inputdevices/handle_gsettings.go @@ -1,7 +1,7 @@ package inputdevices import ( - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) func (kbd *Keyboard) handleGSettings() { diff --git a/inputdevices/keyboard.go b/inputdevices/keyboard.go index 0393831a3..6c950db1a 100644 --- a/inputdevices/keyboard.go +++ b/inputdevices/keyboard.go @@ -9,7 +9,7 @@ import ( "path" "pkg.deepin.io/dde/api/dxinput" "pkg.deepin.io/lib/dbus/property" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" dutils "pkg.deepin.io/lib/utils" "regexp" "strings" diff --git a/inputdevices/mouse.go b/inputdevices/mouse.go index 88d09afb4..33795c18e 100644 --- a/inputdevices/mouse.go +++ b/inputdevices/mouse.go @@ -4,7 +4,7 @@ import ( "pkg.deepin.io/dde/api/dxinput" dxutils "pkg.deepin.io/dde/api/dxinput/utils" "pkg.deepin.io/lib/dbus/property" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) const ( diff --git a/inputdevices/touchpad.go b/inputdevices/touchpad.go index b769810b3..21ed9be09 100644 --- a/inputdevices/touchpad.go +++ b/inputdevices/touchpad.go @@ -8,7 +8,7 @@ import ( "pkg.deepin.io/dde/api/dxinput" dxutils "pkg.deepin.io/dde/api/dxinput/utils" "pkg.deepin.io/lib/dbus/property" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" dutils "pkg.deepin.io/lib/utils" "strconv" "strings" diff --git a/inputdevices/utils.go b/inputdevices/utils.go index f24e86703..e39b99cd1 100644 --- a/inputdevices/utils.go +++ b/inputdevices/utils.go @@ -3,7 +3,7 @@ package inputdevices import ( "fmt" "os/exec" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) const ( diff --git a/inputdevices/wacom.go b/inputdevices/wacom.go index 11c1a4dcc..22552f13b 100644 --- a/inputdevices/wacom.go +++ b/inputdevices/wacom.go @@ -4,7 +4,7 @@ import ( "pkg.deepin.io/dde/api/dxinput" dxutils "pkg.deepin.io/dde/api/dxinput/utils" "pkg.deepin.io/lib/dbus/property" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) const ( diff --git a/keybinding/handle_event.go b/keybinding/handle_event.go index bade3b6d3..d3d47567d 100644 --- a/keybinding/handle_event.go +++ b/keybinding/handle_event.go @@ -29,7 +29,7 @@ import ( "github.com/BurntSushi/xgbutil/keybind" "pkg.deepin.io/dde/daemon/keybinding/shortcuts" "pkg.deepin.io/lib/dbus" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) const ( diff --git a/keybinding/handle_gsetting.go b/keybinding/handle_gsetting.go index d2478aa6e..cb9f5336c 100644 --- a/keybinding/handle_gsetting.go +++ b/keybinding/handle_gsetting.go @@ -2,7 +2,7 @@ package keybinding import ( "pkg.deepin.io/dde/daemon/keybinding/shortcuts" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) func (m *Manager) listenGSettingChanged() { diff --git a/keybinding/manager.go b/keybinding/manager.go index 6b597a64d..c62a4c5d4 100644 --- a/keybinding/manager.go +++ b/keybinding/manager.go @@ -30,7 +30,7 @@ import ( "pkg.deepin.io/dde/daemon/keybinding/core" "pkg.deepin.io/dde/daemon/keybinding/shortcuts" "pkg.deepin.io/lib/dbus" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) const ( diff --git a/keybinding/shortcuts/custom.go b/keybinding/shortcuts/custom.go index 3c8606c70..acdf648bf 100644 --- a/keybinding/shortcuts/custom.go +++ b/keybinding/shortcuts/custom.go @@ -28,7 +28,7 @@ import ( "path" "sync" - "pkg.deepin.io/lib/glib-2.0" + "gir/glib-2.0" dutils "pkg.deepin.io/lib/utils" ) diff --git a/keybinding/shortcuts/utils.go b/keybinding/shortcuts/utils.go index 837a1fa54..5c59446c6 100644 --- a/keybinding/shortcuts/utils.go +++ b/keybinding/shortcuts/utils.go @@ -23,7 +23,7 @@ package shortcuts import ( "pkg.deepin.io/dde/daemon/keybinding/core" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" dutils "pkg.deepin.io/lib/utils" ) diff --git a/launcher/category/category.go b/launcher/category/category.go index 592a71469..5a4918f10 100644 --- a/launcher/category/category.go +++ b/launcher/category/category.go @@ -9,7 +9,7 @@ import ( . "pkg.deepin.io/dde/daemon/launcher/interfaces" "pkg.deepin.io/lib/gettext" - "pkg.deepin.io/lib/glib-2.0" + "gir/glib-2.0" ) // category id and name. diff --git a/launcher/category/category_manager.go b/launcher/category/category_manager.go index 5106d6ae2..0151067eb 100644 --- a/launcher/category/category_manager.go +++ b/launcher/category/category_manager.go @@ -3,7 +3,7 @@ package category import ( "errors" . "pkg.deepin.io/dde/daemon/launcher/interfaces" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) type QueryIDTransition interface { diff --git a/launcher/category/deepin_query_id_transition.go b/launcher/category/deepin_query_id_transition.go index 37b3cfdd7..3eef70285 100644 --- a/launcher/category/deepin_query_id_transition.go +++ b/launcher/category/deepin_query_id_transition.go @@ -5,7 +5,7 @@ import ( "errors" "path" . "pkg.deepin.io/dde/daemon/launcher/interfaces" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) type DeepinQueryIDTransition struct { diff --git a/launcher/category/x_category_query_id_transition.go b/launcher/category/x_category_query_id_transition.go index 41edbb3d2..d186f2a39 100644 --- a/launcher/category/x_category_query_id_transition.go +++ b/launcher/category/x_category_query_id_transition.go @@ -2,7 +2,7 @@ package category import ( . "pkg.deepin.io/dde/daemon/launcher/interfaces" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" "sort" "strings" ) diff --git a/launcher/interfaces/category.go b/launcher/interfaces/category.go index ad94f0441..5b6e7b96a 100644 --- a/launcher/interfaces/category.go +++ b/launcher/interfaces/category.go @@ -1,7 +1,7 @@ package interfaces import ( - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) // CategoryID is the type for category id. diff --git a/launcher/interfaces/item.go b/launcher/interfaces/item.go index 4da195d0c..136393657 100644 --- a/launcher/interfaces/item.go +++ b/launcher/interfaces/item.go @@ -1,7 +1,7 @@ package interfaces import ( - "pkg.deepin.io/lib/glib-2.0" + "gir/glib-2.0" "time" ) diff --git a/launcher/item/desktop.go b/launcher/item/desktop.go index 7e7426196..ce6f274cd 100644 --- a/launcher/item/desktop.go +++ b/launcher/item/desktop.go @@ -5,7 +5,7 @@ import ( p "path" . "pkg.deepin.io/dde/daemon/launcher/utils" - "pkg.deepin.io/lib/glib-2.0" + "gir/glib-2.0" "pkg.deepin.io/lib/utils" ) diff --git a/launcher/item/item.go b/launcher/item/item.go index f198721dd..d9bd8f57b 100644 --- a/launcher/item/item.go +++ b/launcher/item/item.go @@ -9,7 +9,7 @@ import ( "pkg.deepin.io/dde/daemon/appinfo" "pkg.deepin.io/dde/daemon/launcher/category" . "pkg.deepin.io/dde/daemon/launcher/interfaces" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" "pkg.deepin.io/lib/utils" ) diff --git a/launcher/item/item_manager.go b/launcher/item/item_manager.go index b635dcc72..c337b0a27 100644 --- a/launcher/item/item_manager.go +++ b/launcher/item/item_manager.go @@ -10,7 +10,7 @@ import ( "pkg.deepin.io/dde/daemon/appinfo" . "pkg.deepin.io/dde/daemon/launcher/interfaces" "pkg.deepin.io/dde/daemon/launcher/item/dstore" - "pkg.deepin.io/lib/glib-2.0" + "gir/glib-2.0" ) const ( diff --git a/launcher/item/item_manager_test.go b/launcher/item/item_manager_test.go index f00328ba9..83f4079e8 100644 --- a/launcher/item/item_manager_test.go +++ b/launcher/item/item_manager_test.go @@ -9,8 +9,8 @@ import ( "os" "path" . "pkg.deepin.io/dde/daemon/launcher/interfaces" - "pkg.deepin.io/lib/gio-2.0" - "pkg.deepin.io/lib/glib-2.0" + "gir/gio-2.0" + "gir/glib-2.0" "sync" "time" ) diff --git a/launcher/item/item_test.go b/launcher/item/item_test.go index c16805d41..a1067aa51 100644 --- a/launcher/item/item_test.go +++ b/launcher/item/item_test.go @@ -6,7 +6,7 @@ import ( "os" "path" . "pkg.deepin.io/dde/daemon/launcher/interfaces" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" "strings" "testing" ) diff --git a/launcher/item/search/pinyin_adapter_test.go b/launcher/item/search/pinyin_adapter_test.go index 82d0c3455..b0376c27f 100644 --- a/launcher/item/search/pinyin_adapter_test.go +++ b/launcher/item/search/pinyin_adapter_test.go @@ -4,7 +4,7 @@ import ( C "launchpad.net/gocheck" "os" "path" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) type PinYinTestSuite struct { diff --git a/launcher/item/search/search_installed_item_test.go b/launcher/item/search/search_installed_item_test.go index 68699f12a..2fcbb1672 100644 --- a/launcher/item/search/search_installed_item_test.go +++ b/launcher/item/search/search_installed_item_test.go @@ -6,7 +6,7 @@ import ( "path" "pkg.deepin.io/dde/daemon/launcher/interfaces" "pkg.deepin.io/dde/daemon/launcher/item" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" "sync" "time" ) diff --git a/launcher/item/search/search_test.go b/launcher/item/search/search_test.go index e074689c1..dde4612d6 100644 --- a/launcher/item/search/search_test.go +++ b/launcher/item/search/search_test.go @@ -9,7 +9,7 @@ import ( C "launchpad.net/gocheck" . "pkg.deepin.io/dde/daemon/launcher/interfaces" "pkg.deepin.io/dde/daemon/launcher/item" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) func TestSearch(t *testing.T) { diff --git a/launcher/launcher.go b/launcher/launcher.go index cd01e4be6..73d3988c8 100644 --- a/launcher/launcher.go +++ b/launcher/launcher.go @@ -20,7 +20,7 @@ import ( "pkg.deepin.io/dde/daemon/launcher/item/search" . "pkg.deepin.io/dde/daemon/launcher/utils" "pkg.deepin.io/lib/dbus" - "pkg.deepin.io/lib/glib-2.0" + "gir/glib-2.0" "pkg.deepin.io/lib/utils" ) diff --git a/launcher/main.go b/launcher/main.go index 23a708434..e96325d26 100644 --- a/launcher/main.go +++ b/launcher/main.go @@ -12,7 +12,7 @@ import ( "pkg.deepin.io/dde/daemon/launcher/item/search" . "pkg.deepin.io/dde/daemon/loader" "pkg.deepin.io/lib/gettext" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" . "pkg.deepin.io/lib/initializer" "pkg.deepin.io/lib/log" ) diff --git a/launcher/setting.go b/launcher/setting.go index e74d1ec3f..611cd1635 100644 --- a/launcher/setting.go +++ b/launcher/setting.go @@ -6,7 +6,7 @@ import ( . "pkg.deepin.io/dde/daemon/launcher/interfaces" . "pkg.deepin.io/dde/daemon/launcher/setting" "pkg.deepin.io/lib/dbus" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" "sync" ) diff --git a/launcher/utils/keyfile.go b/launcher/utils/keyfile.go index 5a6c02259..50be7302b 100644 --- a/launcher/utils/keyfile.go +++ b/launcher/utils/keyfile.go @@ -3,7 +3,7 @@ package utils import ( "io/ioutil" "os" - "pkg.deepin.io/lib/glib-2.0" + "gir/glib-2.0" ) // SaveKeyFile saves key file. diff --git a/launcher/utils/utils.go b/launcher/utils/utils.go index fbce84a9b..fa8c3e352 100644 --- a/launcher/utils/utils.go +++ b/launcher/utils/utils.go @@ -2,7 +2,7 @@ package utils import ( "os" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" "strings" ) diff --git a/mounts/disk_info.go b/mounts/disk_info.go index 5a12f3da6..3ec43b839 100644 --- a/mounts/disk_info.go +++ b/mounts/disk_info.go @@ -22,7 +22,7 @@ package mounts import ( - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" "regexp" "strings" ) diff --git a/mounts/manager.go b/mounts/manager.go index 810310b07..6b9ac410e 100644 --- a/mounts/manager.go +++ b/mounts/manager.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" "pkg.deepin.io/lib/log" dutils "pkg.deepin.io/lib/utils" ) diff --git a/mounts/manager_ifc.go b/mounts/manager_ifc.go index fdceb026c..efb30f376 100644 --- a/mounts/manager_ifc.go +++ b/mounts/manager_ifc.go @@ -24,8 +24,8 @@ package mounts import ( "fmt" "pkg.deepin.io/lib/dbus" - "pkg.deepin.io/lib/gio-2.0" - "pkg.deepin.io/lib/gobject-2.0" + "gir/gio-2.0" + "gir/gobject-2.0" ) // Eject disk. diff --git a/mounts/wrap.go b/mounts/wrap.go index 6451ffee5..60062bc2e 100644 --- a/mounts/wrap.go +++ b/mounts/wrap.go @@ -33,7 +33,7 @@ import ( "unsafe" "pkg.deepin.io/dde/api/soundutils" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) const ( diff --git a/mpris/utils.go b/mpris/utils.go index 59502d604..9a4d47619 100644 --- a/mpris/utils.go +++ b/mpris/utils.go @@ -3,7 +3,7 @@ package mpris import ( "fmt" "os/exec" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) const ( diff --git a/network/manager_proxy.go b/network/manager_proxy.go index 3bf84a7eb..8598502c2 100644 --- a/network/manager_proxy.go +++ b/network/manager_proxy.go @@ -23,7 +23,7 @@ package network import "strings" import "fmt" -import "pkg.deepin.io/lib/gio-2.0" +import "gir/gio-2.0" import "regexp" // example of /etc/environment diff --git a/power/main.go b/power/main.go index 4bc99cdf7..fe3512220 100644 --- a/power/main.go +++ b/power/main.go @@ -2,7 +2,7 @@ package power import "pkg.deepin.io/lib/log" import "pkg.deepin.io/lib/dbus/property" -import "pkg.deepin.io/lib/gio-2.0" +import "gir/gio-2.0" import ss "dbus/org/freedesktop/screensaver" import "pkg.deepin.io/dde/api/soundutils" diff --git a/power/upower.go b/power/upower.go index c99db103d..19f30d908 100644 --- a/power/upower.go +++ b/power/upower.go @@ -1,6 +1,6 @@ package power -import "pkg.deepin.io/lib/gio-2.0" +import "gir/gio-2.0" import "time" import . "pkg.deepin.io/lib/gettext" import "pkg.deepin.io/lib/dbus" diff --git a/screenedge/handle_settings.go b/screenedge/handle_settings.go index af775fddf..f50ee98a8 100644 --- a/screenedge/handle_settings.go +++ b/screenedge/handle_settings.go @@ -1,7 +1,7 @@ package screenedge import ( - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) func handleSettingsChanged() { diff --git a/screenedge/main.go b/screenedge/main.go index 3362cb4ed..b372b11d8 100644 --- a/screenedge/main.go +++ b/screenedge/main.go @@ -27,7 +27,7 @@ import ( "dbus/com/deepin/dde/launcher" "pkg.deepin.io/dde/daemon/loader" "pkg.deepin.io/lib/dbus" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" "pkg.deepin.io/lib/log" "sync" ) diff --git a/soundeffect/manager.go b/soundeffect/manager.go index 2086d2d33..b21b9117e 100644 --- a/soundeffect/manager.go +++ b/soundeffect/manager.go @@ -5,7 +5,7 @@ import ( "pkg.deepin.io/dde/api/soundutils" "pkg.deepin.io/lib/dbus" "pkg.deepin.io/lib/dbus/property" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) const ( diff --git a/timedate/manager.go b/timedate/manager.go index e0fcfb396..702e06c15 100644 --- a/timedate/manager.go +++ b/timedate/manager.go @@ -25,7 +25,7 @@ import ( "dbus/org/freedesktop/timedate1" "pkg.deepin.io/lib/dbus" "pkg.deepin.io/lib/dbus/property" - "pkg.deepin.io/lib/gio-2.0" + "gir/gio-2.0" ) const (