[haiku-commits] r41639 - in haiku/branches/releases/r1alpha3: . build/jam headers/libs/freetype2 headers/libs/png headers/libs/tiff ...
- From: pulkomandy@xxxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 21 May 2011 20:37:38 +0200 (CEST)
Author: pulkomandy
Date: 2011-05-21 20:37:37 +0200 (Sat, 21 May 2011)
New Revision: 41639
Changeset: https://dev.haiku-os.org/changeset/41639
Added:
haiku/branches/releases/r1alpha3/headers/private/interface/DecoratorPrivate.h
Modified:
haiku/branches/releases/r1alpha3/
haiku/branches/releases/r1alpha3/build/jam/
haiku/branches/releases/r1alpha3/headers/libs/freetype2/
haiku/branches/releases/r1alpha3/headers/libs/png/png.h
haiku/branches/releases/r1alpha3/headers/libs/png/pngconf.h
haiku/branches/releases/r1alpha3/headers/libs/tiff/tiff.h
haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffio.h
haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffvers.h
haiku/branches/releases/r1alpha3/headers/private/interface/DecorInfo.h
haiku/branches/releases/r1alpha3/src/add-ons/kernel/bus_managers/acpi/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/
haiku/branches/releases/r1alpha3/src/add-ons/media/plugins/ffmpeg/
haiku/branches/releases/r1alpha3/src/build/libbe/storage/mime/
haiku/branches/releases/r1alpha3/src/kits/interface/DecorInfo.cpp
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h
haiku/branches/releases/r1alpha3/src/libs/freetype2/
haiku/branches/releases/r1alpha3/src/libs/png/
haiku/branches/releases/r1alpha3/src/libs/tiff/
haiku/branches/releases/r1alpha3/src/preferences/appearance/APRView.cpp
haiku/branches/releases/r1alpha3/src/preferences/appearance/APRView.h
haiku/branches/releases/r1alpha3/src/preferences/appearance/Jamfile
Log:
Merge 41637-8 from trunk.
Property changes on: haiku/branches/releases/r1alpha3
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals:40148-40195
/haiku/branches/developer/bonefish/weak-symbols:39365-39568
/haiku/trunk:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
+ /haiku/branches/developer/bonefish/signals:40148-40195
/haiku/branches/developer/bonefish/weak-symbols:39365-39568
/haiku/trunk:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
Property changes on: haiku/branches/releases/r1alpha3/build/jam
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals/build/jam:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/build/jam:39365-39568
/haiku/trunk/build/jam:41551,41558-41559,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
+ /haiku/branches/developer/bonefish/signals/build/jam:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/build/jam:39365-39568
/haiku/trunk/build/jam:41551,41558-41559,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/freetype2
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/freetype2:40148-40195
/haiku/trunk/headers/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freetype2/2.4.4/include:40532
/haiku/vendor/freetype2/current/include:37946-40531
+
/haiku/branches/developer/bonefish/signals/headers/libs/freetype2:40148-40195
/haiku/trunk/headers/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freetype2/2.4.4/include:40532
/haiku/vendor/freetype2/current/include:37946-40531
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/png/png.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/png/png.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/png.h:39365-39568
/haiku/trunk/headers/libs/png/png.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/libpng/1.4.4/png.h:39522
/haiku/vendor/libpng/current/png.h:35840-39521
+
/haiku/branches/developer/bonefish/signals/headers/libs/png/png.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/png.h:39365-39568
/haiku/trunk/headers/libs/png/png.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/libpng/1.4.4/png.h:39522
/haiku/vendor/libpng/current/png.h:35840-39521
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/png/pngconf.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/png/pngconf.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/pngconf.h:39365-39568
/haiku/trunk/headers/libs/png/pngconf.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/libpng/1.4.4/pngconf.h:39522
/haiku/vendor/libpng/current/pngconf.h:35840-39521
+
/haiku/branches/developer/bonefish/signals/headers/libs/png/pngconf.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/pngconf.h:39365-39568
/haiku/trunk/headers/libs/png/pngconf.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/libpng/1.4.4/pngconf.h:39522
/haiku/vendor/libpng/current/pngconf.h:35840-39521
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/tiff/tiff.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiff.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiff.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiff.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/libtiff/3.9.4/libtiff/tiff.h:38702
/haiku/vendor/libtiff/current/libtiff/tiff.h:38700-38701
+
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiff.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiff.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiff.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/libtiff/3.9.4/libtiff/tiff.h:38702
/haiku/vendor/libtiff/current/libtiff/tiff.h:38700-38701
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffio.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffio.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffio.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiffio.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/libtiff/3.9.4/libtiff/tiffio.h:38702
/haiku/vendor/libtiff/current/libtiff/tiffio.h:38700-38701
+
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffio.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffio.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiffio.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/libtiff/3.9.4/libtiff/tiffio.h:38702
/haiku/vendor/libtiff/current/libtiff/tiffio.h:38700-38701
Property changes on:
haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffvers.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffvers.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffvers.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiffvers.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/libtiff/3.9.4/libtiff/tiffvers.h:38702
/haiku/vendor/libtiff/current/libtiff/tiffvers.h:38700-38701
+
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffvers.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffvers.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiffvers.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/libtiff/3.9.4/libtiff/tiffvers.h:38702
/haiku/vendor/libtiff/current/libtiff/tiffvers.h:38700-38701
Modified: haiku/branches/releases/r1alpha3/headers/private/interface/DecorInfo.h
===================================================================
--- haiku/branches/releases/r1alpha3/headers/private/interface/DecorInfo.h
2011-05-21 18:12:25 UTC (rev 41638)
+++ haiku/branches/releases/r1alpha3/headers/private/interface/DecorInfo.h
2011-05-21 18:37:37 UTC (rev 41639)
@@ -4,19 +4,22 @@
* Author:
* Joseph "looncraz" Groover <looncraz@xxxxxxxxxxx>
*/
-
-
#ifndef DECOR_INFO_H
#define DECOR_INFO_H
#include <Entry.h>
-#include <Bitmap.h>
-#include <String.h>
#include <Locker.h>
#include <ObjectList.h>
+#include <String.h>
+class BWindow;
+
+
+namespace BPrivate {
+
+
// NOTE: DecorInfo itself is not thread-safe
class DecorInfo {
public:
@@ -78,7 +81,7 @@
};
-class DecorInfoUtility{
+class DecorInfoUtility {
public:
DecorInfoUtility(bool scanNow = true);
//
NOTE: When scanNow is passed false,
@@ -108,9 +111,9 @@
DecorInfo* CurrentDecorator();
DecorInfo* DefaultDecorator();
- bool
IsCurrentDecorator(DecorInfo*);
+ bool
IsCurrentDecorator(DecorInfo* decor);
- status_t
SetDecorator(DecorInfo*);
+ status_t SetDecorator(DecorInfo*
decor);
status_t SetDecorator(int32);
status_t Preview(DecorInfo*
decor, BWindow* window);
@@ -119,11 +122,17 @@
DecorInfo* _FindDecor(const
BString& path);
private:
- BObjectList<DecorInfo> fList;
- BLocker fLock;
- bool fHasScanned;
-
+ BObjectList<DecorInfo> fList;
+ BLocker fLock;
+ bool fHasScanned;
};
-#endif
+} // namespace BPrivate
+
+
+using BPrivate::DecorInfo;
+using BPrivate::DecorInfoUtility;
+
+
+#endif // DECOR_INFO_H
Copied:
haiku/branches/releases/r1alpha3/headers/private/interface/DecoratorPrivate.h
(from rev 41638, haiku/trunk/headers/private/interface/DecoratorPrivate.h)
===================================================================
---
haiku/branches/releases/r1alpha3/headers/private/interface/DecoratorPrivate.h
(rev 0)
+++
haiku/branches/releases/r1alpha3/headers/private/interface/DecoratorPrivate.h
2011-05-21 18:37:37 UTC (rev 41639)
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2011, Axel Dörfler, axeld@xxxxxxxxxxxxxxxxx
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef DECORATOR_PRIVATE_H
+#define DECORATOR_PRIVATE_H
+
+
+#include <SupportDefs.h>
+
+
+class BString;
+class BWindow;
+
+
+namespace BPrivate {
+
+
+bool get_decorator(BString& name);
+status_t set_decorator(const BString& name);
+status_t preview_decorator(const BString& name, BWindow* window);
+
+
+} // namespace BPrivate
+
+
+#endif // DECORATOR_PRIVATE_H
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/bus_managers/acpi
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/src/add-ons/kernel/bus_managers/acpi:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/bus_managers/acpi:39365-39568
/haiku/trunk/src/add-ons/kernel/bus_managers/acpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/acpica/current:33139-36866
+
/haiku/branches/developer/bonefish/signals/src/add-ons/kernel/bus_managers/acpi:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/bus_managers/acpi:39365-39568
/haiku/trunk/src/add-ons/kernel/bus_managers/acpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/acpica/current:33139-36866
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/an:41235
/haiku/vendor/freebsd/current/dev/an:34496-41234
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/an:41235
/haiku/vendor/freebsd/current/dev/an:34496-41234
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:39365-39568
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freebsd/HEAD/dev/ath/r204100:35677-35713
/haiku/vendor/freebsd/current/dev/ath:34314-35676
+
/haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:39365-39568
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freebsd/HEAD/dev/ath/r204100:35677-35713
/haiku/vendor/freebsd/current/dev/ath:34314-35676
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/bwi:41230-41235
/haiku/vendor/freebsd/current/dev/bwi:34314-41229
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/bwi:41230-41235
/haiku/vendor/freebsd/current/dev/bwi:34314-41229
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwi:41234-41235
/haiku/vendor/freebsd/current/dev/iwi:34314-41233
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwi:41234-41235
/haiku/vendor/freebsd/current/dev/iwi:34314-41233
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/wpi:41231-41235
/haiku/vendor/freebsd/current/dev/wpi:34314-41230
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/wpi:41231-41235
/haiku/vendor/freebsd/current/dev/wpi:34314-41230
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:39365-39568
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwn:41229-41235
/haiku/vendor/freebsd/current/dev/iwn:34314-41228
+
/haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:39365-39568
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwn:41229-41235
/haiku/vendor/freebsd/current/dev/iwn:34314-41228
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/malo:41233-41235
/haiku/vendor/freebsd/current/dev/malo:34496-41232
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/malo:41233-41235
/haiku/vendor/freebsd/current/dev/malo:34496-41232
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/mwl:41228-41235
/haiku/vendor/freebsd/current/dev/mwl:34314-41227
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/mwl:41228-41235
/haiku/vendor/freebsd/current/dev/mwl:34314-41227
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/ral:41232-41235
/haiku/vendor/freebsd/current/dev/ral:34496-41231
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/ral:41232-41235
/haiku/vendor/freebsd/current/dev/ral:34496-41231
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/wi:41227-41235
/haiku/vendor/freebsd/current/dev/wi:34496-41226
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/wi:41227-41235
/haiku/vendor/freebsd/current/dev/wi:34496-41226
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/media/plugins/ffmpeg
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/src/add-ons/media/plugins/ffmpeg:40148-40195
/haiku/trunk/src/add-ons/media/plugins/ffmpeg:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/ffmpeg/0.6.1:39559
/haiku/vendor/ffmpeg/current:39539-39558
+
/haiku/branches/developer/bonefish/signals/src/add-ons/media/plugins/ffmpeg:40148-40195
/haiku/trunk/src/add-ons/media/plugins/ffmpeg:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/ffmpeg/0.6.1:39559
/haiku/vendor/ffmpeg/current:39539-39558
Property changes on:
haiku/branches/releases/r1alpha3/src/build/libbe/storage/mime
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/src/build/libbe/storage/mime:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/build/libbe/storage/mime:39365-39568
/haiku/trunk/src/build/libbe/storage/mime:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/trunk/current/src/build/libbe/storage/mime:11-11768
+
/haiku/branches/developer/bonefish/signals/src/build/libbe/storage/mime:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/build/libbe/storage/mime:39365-39568
/haiku/trunk/src/build/libbe/storage/mime:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/trunk/current/src/build/libbe/storage/mime:11-11768
Modified: haiku/branches/releases/r1alpha3/src/kits/interface/DecorInfo.cpp
===================================================================
--- haiku/branches/releases/r1alpha3/src/kits/interface/DecorInfo.cpp
2011-05-21 18:12:25 UTC (rev 41638)
+++ haiku/branches/releases/r1alpha3/src/kits/interface/DecorInfo.cpp
2011-05-21 18:37:37 UTC (rev 41639)
@@ -17,7 +17,12 @@
#include <Path.h>
#include <Resources.h>
+#include <DecoratorPrivate.h>
+
+namespace BPrivate {
+
+
DecorInfo::DecorInfo()
:
fVersion(0),
@@ -338,16 +343,6 @@
// #pragma mark - DecorInfoUtility
-namespace BPrivate {
- // kits/interface/InterfaceDefs.cpp
- bool get_decorator(BString&);
- status_t set_decorator(const BString&);
- status_t preview_decorator(const BString&, BWindow*);
-};
-
-using namespace BPrivate;
-
-
DecorInfoUtility::DecorInfoUtility(bool scanNow)
:
fHasScanned(false)
@@ -589,3 +584,6 @@
return NULL;
}
+
+
+} // namespace BPrivate
Property changes on:
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/libs/compat/freebsd_wlan/net80211:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freebsd/RELEASE_8_2_0/net80211:41237
/haiku/vendor/freebsd/current/net80211:34316-41236
+
/haiku/trunk/src/libs/compat/freebsd_wlan/net80211:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freebsd/RELEASE_8_2_0/net80211:41237
/haiku/vendor/freebsd/current/net80211:34316-41236
Property changes on:
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.c:41237-41557
/haiku/vendor/freebsd/current/net80211/ieee80211_node.c:34316-41236
+
/haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.c:41237-41557
/haiku/vendor/freebsd/current/net80211/ieee80211_node.c:34316-41236
Property changes on:
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.h:41237-41557
/haiku/vendor/freebsd/current/net80211/ieee80211_node.h:34316-41236
+
/haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.h:41237-41557
/haiku/vendor/freebsd/current/net80211/ieee80211_node.h:34316-41236
Property changes on: haiku/branches/releases/r1alpha3/src/libs/freetype2
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals/src/libs/freetype2:40148-40195
/haiku/trunk/src/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/freetype2/2.4.3:39521-39522
/haiku/vendor/freetype2/2.4.4/src:40532
/haiku/vendor/freetype2/current:37946-39520
/haiku/vendor/freetype2/current/src:37946-40531
+ /haiku/branches/developer/bonefish/signals/src/libs/freetype2:40148-40195
/haiku/trunk/src/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/freetype2/2.4.3:39521-39522
/haiku/vendor/freetype2/2.4.4/src:40532
/haiku/vendor/freetype2/current:37946-39520
/haiku/vendor/freetype2/current/src:37946-40531
Property changes on: haiku/branches/releases/r1alpha3/src/libs/png
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals/src/libs/png:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/libs/png:39365-39568
/haiku/trunk/src/libs/png:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/libpng/1.4.4:39522
/haiku/vendor/libpng/current:35840-39521
+ /haiku/branches/developer/bonefish/signals/src/libs/png:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/libs/png:39365-39568
/haiku/trunk/src/libs/png:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/libpng/1.4.4:39522
/haiku/vendor/libpng/current:35840-39521
Property changes on: haiku/branches/releases/r1alpha3/src/libs/tiff
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals/src/libs/tiff:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/libs/tiff:39365-39568
/haiku/trunk/src/libs/tiff:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633
/haiku/vendor/libtiff/3.9.4/libtiff:38702
/haiku/vendor/libtiff/current/libtiff:38700-38701
+ /haiku/branches/developer/bonefish/signals/src/libs/tiff:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/libs/tiff:39365-39568
/haiku/trunk/src/libs/tiff:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638
/haiku/vendor/libtiff/3.9.4/libtiff:38702
/haiku/vendor/libtiff/current/libtiff:38700-38701
Modified:
haiku/branches/releases/r1alpha3/src/preferences/appearance/APRView.cpp
===================================================================
--- haiku/branches/releases/r1alpha3/src/preferences/appearance/APRView.cpp
2011-05-21 18:12:25 UTC (rev 41638)
+++ haiku/branches/releases/r1alpha3/src/preferences/appearance/APRView.cpp
2011-05-21 18:37:37 UTC (rev 41639)
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2009, Haiku. All rights reserved.
+ * Copyright 2002-2011, Haiku. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -7,8 +7,11 @@
* Rene Gollent (rene@xxxxxxxxxxx)
*/
+
#include "APRView.h"
+#include <stdio.h>
+
#include <Alert.h>
#include <Catalog.h>
#include <Directory.h>
@@ -20,11 +23,8 @@
#include <Path.h>
#include <SpaceLayoutItem.h>
-#include <private/interface/DecorInfo.h>
+#include <DecorInfo.h>
-#include <stdio.h>
-
-
#include "APRWindow.h"
#include "defs.h"
#include "ColorWell.h"
Modified: haiku/branches/releases/r1alpha3/src/preferences/appearance/APRView.h
===================================================================
--- haiku/branches/releases/r1alpha3/src/preferences/appearance/APRView.h
2011-05-21 18:12:25 UTC (rev 41638)
+++ haiku/branches/releases/r1alpha3/src/preferences/appearance/APRView.h
2011-05-21 18:37:37 UTC (rev 41639)
@@ -9,36 +9,38 @@
#ifndef APR_VIEW_H_
#define APR_VIEW_H_
-#include <View.h>
+
+#include <Button.h>
#include <ColorControl.h>
-#include <Message.h>
#include <ListItem.h>
#include <ListView.h>
-#include <Button.h>
-#include <ScrollView.h>
-#include <ScrollBar.h>
-#include <String.h>
#include <Menu.h>
+#include <MenuBar.h>
#include <MenuField.h>
-#include <MenuBar.h>
#include <MenuItem.h>
+#include <Message.h>
+#include <ScrollBar.h>
+#include <ScrollView.h>
+#include <String.h>
#include <StringView.h>
-#include <Invoker.h>
+#include <View.h>
+#include <DecorInfo.h>
+
#include "ColorSet.h"
+
class ColorWell;
-class DecorInfoUtility;
class APRWindow;
-class APRView : public BView
-{
+
+class APRView : public BView {
public:
APRView(const char *name, uint32 flags);
~APRView(void);
void AttachedToWindow(void);
void MessageReceived(BMessage *msg);
-
+
void LoadSettings(void);
bool IsDefaultable(void);
@@ -47,21 +49,21 @@
void SetCurrentColor(rgb_color color);
void UpdateControls();
void UpdateAllColors();
-
+
BColorControl *fPicker;
-
+
BListView *fAttrList;
-
+
color_which fWhich;
-
+
BScrollView *fScrollView;
-
+
ColorWell *fColorWell;
ColorSet fCurrentSet;
ColorSet fPrevSet;
ColorSet fDefaultSet;
-
+
BMenu *fDecorMenu;
DecorInfoUtility*fDecorUtil;
};
Modified: haiku/branches/releases/r1alpha3/src/preferences/appearance/Jamfile
===================================================================
--- haiku/branches/releases/r1alpha3/src/preferences/appearance/Jamfile
2011-05-21 18:12:25 UTC (rev 41638)
+++ haiku/branches/releases/r1alpha3/src/preferences/appearance/Jamfile
2011-05-21 18:37:37 UTC (rev 41639)
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src preferences appearance ;
-UsePrivateHeaders app [ FDirName servers app ] ;
+UsePrivateHeaders app interface [ FDirName servers app ] ;
UseFreeTypeHeaders ;
Preference Appearance :
@@ -11,17 +11,17 @@
ColorSet.cpp
ColorWell.cpp
ColorWhichItem.cpp
-
+
# These are currently disabled while everything else is being worked on
#CurView.cpp
#CursorWhichItem.cpp
#DecView.cpp
#SysCursorAPI.cpp
-
+
# These exist for post-R1, so they are disabled for now
#FontMenu.cpp
#MenuView.cpp
-
+
: be $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS)
: Appearance.rdef
;
Other related posts:
- » [haiku-commits] r41639 - in haiku/branches/releases/r1alpha3: . build/jam headers/libs/freetype2 headers/libs/png headers/libs/tiff ... - pulkomandy
