author | drw <drw> | 2005-01-04 15:27:01 (UTC) |
---|---|---|
committer | drw <drw> | 2005-01-04 15:27:01 (UTC) |
commit | 653ffebd614ef90bc5524fdf910776d4af0a48a7 (patch) (unidiff) | |
tree | ab9d9771466d2fc8e3f06b50731dcffa0925a503 /noncore/settings/packagemanager | |
parent | a63d6d1896bcb6f1ac3b041e3d46edf0ec9e8082 (diff) | |
download | opie-653ffebd614ef90bc5524fdf910776d4af0a48a7.zip opie-653ffebd614ef90bc5524fdf910776d4af0a48a7.tar.gz opie-653ffebd614ef90bc5524fdf910776d4af0a48a7.tar.bz2 |
Undo previous commit
Diffstat (limited to 'noncore/settings/packagemanager') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/packagemanager/oconfitem.h | 7 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 7 | ||||
-rw-r--r-- | noncore/settings/packagemanager/opie-packagemanager.control | 4 |
3 files changed, 5 insertions, 13 deletions
diff --git a/noncore/settings/packagemanager/oconfitem.h b/noncore/settings/packagemanager/oconfitem.h index 7b52ce4..9972c00 100644 --- a/noncore/settings/packagemanager/oconfitem.h +++ b/noncore/settings/packagemanager/oconfitem.h | |||
@@ -38,12 +38,7 @@ _;:, .> :=|. This program is free software; you can | |||
38 | class OConfItem | 38 | class OConfItem |
39 | { | 39 | { |
40 | public: | 40 | public: |
41 | enum Type { Source=0x01, | 41 | enum Type { Source, Destination, Option, Arch, NotDefined }; |
42 | GzSource=0x02, | ||
43 | Destination=0x04, | ||
44 | Option=0x08, | ||
45 | Arch=0x10, | ||
46 | NotDefined=0x20 }; | ||
47 | 42 | ||
48 | OConfItem( Type type = NotDefined, const QString &name = QString::null, | 43 | OConfItem( Type type = NotDefined, const QString &name = QString::null, |
49 | const QString &value = QString::null, const QString &features = QString::null, | 44 | const QString &value = QString::null, const QString &features = QString::null, |
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp index a885ef8..f2d7e39 100644 --- a/noncore/settings/packagemanager/oipkg.cpp +++ b/noncore/settings/packagemanager/oipkg.cpp | |||
@@ -114,8 +114,7 @@ OConfItemList *OIpkg::configItems() | |||
114 | OConfItemList *OIpkg::servers() | 114 | OConfItemList *OIpkg::servers() |
115 | { | 115 | { |
116 | // Retrieve only servers | 116 | // Retrieve only servers |
117 | return filterConfItems( (OConfItem::Type)((int)OConfItem::Source | | 117 | return filterConfItems( OConfItem::Source ); |
118 | (int)OConfItem::GzSource) ); | ||
119 | } | 118 | } |
120 | 119 | ||
121 | OConfItemList *OIpkg::destinations() | 120 | OConfItemList *OIpkg::destinations() |
@@ -544,7 +543,6 @@ void OIpkg::loadConfiguration() | |||
544 | { | 543 | { |
545 | if ( !line.startsWith( "#" ) || | 544 | if ( !line.startsWith( "#" ) || |
546 | line.startsWith( "#src" ) || | 545 | line.startsWith( "#src" ) || |
547 | line.startsWith( "#src/gz" ) || | ||
548 | line.startsWith( "#dest" ) || | 546 | line.startsWith( "#dest" ) || |
549 | line.startsWith( "#arch" ) || | 547 | line.startsWith( "#arch" ) || |
550 | line.startsWith( "#option" ) ) | 548 | line.startsWith( "#option" ) ) |
@@ -620,8 +618,7 @@ OConfItemList *OIpkg::filterConfItems( OConfItem::Type typefilter ) | |||
620 | for ( ; it.current(); ++it ) | 618 | for ( ; it.current(); ++it ) |
621 | { | 619 | { |
622 | OConfItem *item = it.current(); | 620 | OConfItem *item = it.current(); |
623 | if ( retrieveAll || | 621 | if ( retrieveAll || item->type() == typefilter ) |
624 | ( item->type() & typefilter ) ) | ||
625 | { | 622 | { |
626 | sl->append( item ); | 623 | sl->append( item ); |
627 | } | 624 | } |
diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control index 0153d40..da3ddfe 100644 --- a/noncore/settings/packagemanager/opie-packagemanager.control +++ b/noncore/settings/packagemanager/opie-packagemanager.control | |||
@@ -2,9 +2,9 @@ Package: opie-packagemanager | |||
2 | Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/packagemanager apps/Settings/packagemanager.desktop | 2 | Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/packagemanager apps/Settings/packagemanager.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg0 (>=0.99.120), ipkg-link | 5 | Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg (>=0.99.120) |
6 | Replaces: packagemanager | 6 | Replaces: packagemanager |
7 | Architecture: arm | 7 | Architecture: arm |
8 | Maintainer: Dan Williams (drw@handhelds.org) | 8 | Maintainer: Dan Williams (drw@handhelds.org) |
9 | Description: Opie package management client | 9 | Description: Opie package management client |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: 0.6.1$EXTRAVERSION |