port: using gir.

Change-Id: I828f3ec10df2a9d51e9d4dea880a3768ca529272
linuxdeepin · Dec 17, 2015 · 944dbe0 · 944dbe0
1 parent e91a2e5
commit 944dbe0
Show file tree

Hide file tree

Showing 60 changed files with 68 additions and 68 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 )